[maemo-commits] [maemo-commits] r18287 - in projects/haf/trunk/libmatchbox2: . debian matchbox

[From: subversion at stage.maemo.org]

Author: aendrodi
Date: 2009-05-07 16:48:37 +0300 (Thu, 07 May 2009)
New Revision: 18287

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/configure.ac
   projects/haf/trunk/libmatchbox2/debian/rules
   projects/haf/trunk/libmatchbox2/matchbox/mb-wm-config.h.in
Log:
	* matchbox/mb-wm-config.h.in:
	  Introducing MBWM_DEB_VERSION to tell you the users of the library
	  the Debian source package version which it was built from.
	* debian/rules
	* configure.ac


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-07 12:52:40 UTC (rev 18286)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-07 13:48:37 UTC (rev 18287)
@@ -1,3 +1,11 @@
+2009-05-07  Adam Endrodi  <adam.endrodi at blumsoft.eu>
+
+	* matchbox/mb-wm-config.h.in:
+	  Introducing MBWM_DEB_VERSION to tell you the users of the library
+	  the Debian source package version which it was built from.
+	* debian/rules
+	* configure.ac
+
 2009-05-07  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Patch from Laszlo Pere:

Modified: projects/haf/trunk/libmatchbox2/configure.ac
===================================================================
--- projects/haf/trunk/libmatchbox2/configure.ac	2009-05-07 12:52:40 UTC (rev 18286)
+++ projects/haf/trunk/libmatchbox2/configure.ac	2009-05-07 13:48:37 UTC (rev 18287)
@@ -151,6 +151,7 @@
 
 AC_SUBST(COMPOSITE_MANAGER_DEFINE)
 
+AC_SUBST(MBWM_DEB_VERSION, $DEB_VERSION)
 
 MBWM_WANT_DEBUG=0
 if test "x$want_debug" = "xyes"; then

Modified: projects/haf/trunk/libmatchbox2/debian/rules
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/rules	2009-05-07 12:52:40 UTC (rev 18286)
+++ projects/haf/trunk/libmatchbox2/debian/rules	2009-05-07 13:48:37 UTC (rev 18287)
@@ -2,7 +2,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-png-theme --enable-composite-managers=clutter --enable-glib-main-loop --enable-libmatchbox --disable-simple-manager --with-pango
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-png-theme --enable-composite-managers=clutter --enable-glib-main-loop --enable-libmatchbox --disable-simple-manager --with-pango DEB_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
 
 ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -DG_DEBUG_DISABLE

Modified: projects/haf/trunk/libmatchbox2/matchbox/mb-wm-config.h.in
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/mb-wm-config.h.in	2009-05-07 12:52:40 UTC (rev 18286)
+++ projects/haf/trunk/libmatchbox2/matchbox/mb-wm-config.h.in	2009-05-07 13:48:37 UTC (rev 18287)
@@ -34,4 +34,7 @@
 #define MBWM_WANT_DEBUG @MBWM_WANT_DEBUG@
 #endif
 
+/* The Debian source package version this binary is being build from. */
+#define MBWM_DEB_VERSION "@MBWM_DEB_VERSION@"
+
 #endif