[Xfce4-commits] r26510 - in squeeze/branches/squeeze_0_2: . docs/reference/libsqueeze libsqueeze src

Stephan Arts stephan at xfce.org
Thu Dec 27 16:48:10 CET 2007 

Author: stephan
Date: 2007-12-27 15:48:10 +0000 (Thu, 27 Dec 2007)
New Revision: 26510

Added:
   squeeze/branches/squeeze_0_2/libsqueeze/libsqueeze-0.2.pc.in
Modified:
   squeeze/branches/squeeze_0_2/ChangeLog
   squeeze/branches/squeeze_0_2/NEWS
   squeeze/branches/squeeze_0_2/configure.in.in
   squeeze/branches/squeeze_0_2/docs/reference/libsqueeze/Makefile.am
   squeeze/branches/squeeze_0_2/libsqueeze/Makefile.am
   squeeze/branches/squeeze_0_2/libsqueeze/libsqueeze.h
   squeeze/branches/squeeze_0_2/src/Makefile.am
Log:
Add .pc file
fix some api-versioning stuff
fix install-headers
update changelog
update news



Modified: squeeze/branches/squeeze_0_2/ChangeLog
===================================================================
--- squeeze/branches/squeeze_0_2/ChangeLog	2007-12-27 13:11:55 UTC (rev 26509)
+++ squeeze/branches/squeeze_0_2/ChangeLog	2007-12-27 15:48:10 UTC (rev 26510)
@@ -1,3 +1,14 @@
+xxxx-xx-xx Squeeze 0.2.2
+
+	* configure.in.in,
+	  libsqueeze/libsqueeze.h: add SQUEEZE_API_SUBJECT_TO_CHANGE define to
+	  make sure developers recognise the fact the API can be changed in the
+	  future.
+	* libsqueeze/Makefile.am: Fix bug 3621 (build with --as-needed)
+	* libsqueeze/Makefile.am: Fix bug 3530 (install header files)
+	* po/pt_BR,
+	  po/ru.po: Added Brazilian-Portuguese and Russian translations
+
 2007-04-25 Squeeze 0.2.1
 
 	* po/eu.po: Added Basque translation

Modified: squeeze/branches/squeeze_0_2/NEWS
===================================================================
--- squeeze/branches/squeeze_0_2/NEWS	2007-12-27 13:11:55 UTC (rev 26509)
+++ squeeze/branches/squeeze_0_2/NEWS	2007-12-27 15:48:10 UTC (rev 26510)
@@ -1,3 +1,9 @@
+0.2.2
+=====
+
+- Added Brazilian Portuguese translation
+- Added Russian translation
+
 0.2.1
 =====
 

Modified: squeeze/branches/squeeze_0_2/configure.in.in
===================================================================
--- squeeze/branches/squeeze_0_2/configure.in.in	2007-12-27 13:11:55 UTC (rev 26509)
+++ squeeze/branches/squeeze_0_2/configure.in.in	2007-12-27 15:48:10 UTC (rev 26510)
@@ -37,8 +37,12 @@
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE
 
+LIBSQUEEZE_API_VERSION=squeeze_version_major.squeeze_version_minor
+
 SQUEEZE_VERINFO=squeeze_verinfo
+
 AC_SUBST(SQUEEZE_VERINFO)
+AC_SUBST(LIBSQUEEZE_API_VERSION)
 
 dnl check for UNIX variants
 AC_AIX
@@ -46,6 +50,7 @@
 AC_MINIX
 AM_CONDITIONAL([HAVE_CYGWIN], [test "`uname | grep \"CYGWIN\"`" != ""])
 
+
 GTK_DOC_CHECK([1.0])
 
 
@@ -62,6 +67,7 @@
 XDT_I18N([@LINGUAS@])
 
 
+
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.6.0])
@@ -73,6 +79,7 @@
 AC_DEFINE([EXO_API_SUBJECT_TO_CHANGE], [1], [Define we understand libexo is subject to api churn])
 dnl Some distro's have dbus < 1.0, need to define the following to make it compile. (Squeeze depends on the glib-bindings anyways)
 AC_DEFINE([DBUS_API_SUBJECT_TO_CHANGE], [1], [Define we understand dbus is subject to api churn])
+AC_DEFINE([LIBSQUEEZE_API_SUBJECT_TO_CHANGE], [1], [Define we understand libsqueeze is subject to api churn])
 
 
 dnl XDT_CHECK_OPTIONAL_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.4.0], [thunar-vfs],
@@ -129,6 +136,7 @@
 po/Makefile.in
 src/Makefile
 libsqueeze/Makefile
+libsqueeze/libsqueeze-0.2.pc
 icons/Makefile
 icons/16x16/Makefile
 icons/48x48/Makefile

Modified: squeeze/branches/squeeze_0_2/docs/reference/libsqueeze/Makefile.am
===================================================================
--- squeeze/branches/squeeze_0_2/docs/reference/libsqueeze/Makefile.am	2007-12-27 13:11:55 UTC (rev 26509)
+++ squeeze/branches/squeeze_0_2/docs/reference/libsqueeze/Makefile.am	2007-12-27 15:48:10 UTC (rev 26510)
@@ -54,7 +54,7 @@
 GTKDOC_LIBS =  								\
 	$(THUNAR_VFS_CFLAGS)						\
 	$(GLIB_LIBS)							\
-	$(top_builddir)/libsqueeze/libsqueeze-$(SQUEEZE_VERSION_API).la
+	$(top_builddir)/libsqueeze/libsqueeze-$(LIBSQUEEZE_API_VERSION).la
 
 include $(top_srcdir)/gtk-doc.make
 

Modified: squeeze/branches/squeeze_0_2/libsqueeze/Makefile.am
===================================================================
--- squeeze/branches/squeeze_0_2/libsqueeze/Makefile.am	2007-12-27 13:11:55 UTC (rev 26509)
+++ squeeze/branches/squeeze_0_2/libsqueeze/Makefile.am	2007-12-27 15:48:10 UTC (rev 26510)
@@ -1,6 +1,6 @@
-lib_LTLIBRARIES = libsqueeze-1.la
+lib_LTLIBRARIES = libsqueeze-0.2.la
 
-libsqueeze_1_la_SOURCES =  \
+libsqueeze_0_2_la_SOURCES =  \
 	internals.c internals.h \
 	libsqueeze.c libsqueeze.h \
 	libsqueeze-archive.h \
@@ -25,17 +25,37 @@
 	command-builder-compr.c command-builder-compr.h \
 	command-builder-gnu-tar.c command-builder-gnu-tar.h
 
-libsqueeze_1_la_CFLAGS = \
+libsqueeze_0_2_la_CFLAGS = \
 	$(GLIB_CFLAGS)  \
 	$(DBUS_CFLAGS)  \
 	$(THUNAR_VFS_CFLAGS)
 
-libsqueeze_1_la_LIBADD =
+libsqueeze_0_2_la_LIBADD = \
+	$(GLIB_LIBS)	\
+	$(DBUS_LIBS)	\
+	$(THUNAR_VFS_LIBS)
 
-libsqueeze_1_la_LDFLAGS = \
+libsqueeze_0_2_la_LDFLAGS = \
   -version-info $(SQUEEZE_VERINFO)
 
 libsqueeze_includedir= \
 	$(includedir)/libsqueeze
 
+libsqueezeinclude_HEADERS = \
+	libsqueeze-archive.h	\
+	libsqueeze-command.h	\
+	libsqueeze-module.h		\
+	libsqueeze-vfs-mime.h	\
+	libsqueeze-view.h		\
+	libsqueeze.h
+
+
+libsqueezeincludedir = $(includedir)/libsqueeze-0.2/libsqueeze
+
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libsqueeze-0.2.pc
+
+	
+
 INCLUDES = -I$(top_srcdir)

Added: squeeze/branches/squeeze_0_2/libsqueeze/libsqueeze-0.2.pc.in
===================================================================
--- squeeze/branches/squeeze_0_2/libsqueeze/libsqueeze-0.2.pc.in	                        (rev 0)
+++ squeeze/branches/squeeze_0_2/libsqueeze/libsqueeze-0.2.pc.in	2007-12-27 15:48:10 UTC (rev 26510)
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+libsqueeze_api_version=@LIBSQUEEZE_API_VERSION@
+
+Name: @PACKAGE_NAME@
+Description: Archiving library for Squeeze
+Requires: glib-2.0 thunar-vfs-1
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lsqueeze-${libsqueeze_api_version}
+Cflags: -I${includedir}/libsqueeze-${libsqueeze_api_version}

Modified: squeeze/branches/squeeze_0_2/libsqueeze/libsqueeze.h
===================================================================
--- squeeze/branches/squeeze_0_2/libsqueeze/libsqueeze.h	2007-12-27 13:11:55 UTC (rev 26509)
+++ squeeze/branches/squeeze_0_2/libsqueeze/libsqueeze.h	2007-12-27 15:48:10 UTC (rev 26510)
@@ -17,6 +17,10 @@
 #ifndef __LIBSQUEEZE_H__
 #define __LIBSQUEEZE_H__
 
+#ifndef LIBSQUEEZE_API_SUBJECT_TO_CHANGE
+#error "Please define LIBSQUEEZE_API_SUBJECT_TO_CHANGE to acknowledge that you understand that libsqueeze has not reached 1.0 and is subject to api churn."
+#endif
+
 #include <libsqueeze/libsqueeze-archive.h>
 #include <libsqueeze/libsqueeze-vfs-mime.h>
 #include <libsqueeze/libsqueeze-view.h>

Modified: squeeze/branches/squeeze_0_2/src/Makefile.am
===================================================================
--- squeeze/branches/squeeze_0_2/src/Makefile.am	2007-12-27 13:11:55 UTC (rev 26509)
+++ squeeze/branches/squeeze_0_2/src/Makefile.am	2007-12-27 15:48:10 UTC (rev 26510)
@@ -43,7 +43,7 @@
 	-DLOCALEDIR=\"$(localedir)\"
  
 squeeze_LDADD = \
-	$(top_builddir)/libsqueeze/libsqueeze-1.la \
+	$(top_builddir)/libsqueeze/libsqueeze-0.2.la \
 	@GTK_LIBS@ \
 	@GLIB_LIBS@ \
 	@DBUS_LIBS@ \

More information about the Xfce4-commits mailing list