r15688 - in /desktop/unstable/glade-3/debian: changelog control control.in rules

[manphiz-guest at users.alioth.debian.org]

Author: manphiz-guest
Date: Fri Apr 18 13:50:58 2008
New Revision: 15688

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15688
Log:
backport several changes from experimental branch:
+ Remove versioned dependency on scrollkeeper to make package providing
scrollkeeper can be used as alternative.  (Closes: #469699)
+ Use sed to get shared library name from debian/control to make further
soversion update easier.

Modified:
    desktop/unstable/glade-3/debian/changelog
    desktop/unstable/glade-3/debian/control
    desktop/unstable/glade-3/debian/control.in
    desktop/unstable/glade-3/debian/rules

Modified: desktop/unstable/glade-3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade-3/debian/changelog?rev=15688&op=diff
==============================================================================
--- desktop/unstable/glade-3/debian/changelog (original)
+++ desktop/unstable/glade-3/debian/changelog Fri Apr 18 13:50:58 2008
@@ -1,3 +1,13 @@
+glade-3 (3.4.4-2) UNRELEASED; urgency=low
+
+  * backport several changes from experimental branch:
+    + Remove versioned dependency on scrollkeeper to make package providing
+      scrollkeeper can be used as alternative.  (Closes: #469699)
+    + Use sed to get shared library name from debian/control to make further
+      soversion update easier.
+
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Fri, 18 Apr 2008 21:33:38 +0800
+
 glade-3 (3.4.4-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/unstable/glade-3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade-3/debian/control?rev=15688&op=diff
==============================================================================
--- desktop/unstable/glade-3/debian/control (original)
+++ desktop/unstable/glade-3/debian/control Fri Apr 18 13:50:58 2008
@@ -7,7 +7,7 @@
                debhelper (>= 5),
                gettext (>= 0.10.40),
                libgnomeui-dev,
-               scrollkeeper (>= 0.1.4),
+               scrollkeeper,
                libxml2-dev (>= 2.4.0),
                libbonoboui2-dev,
                autotools-dev,

Modified: desktop/unstable/glade-3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade-3/debian/control.in?rev=15688&op=diff
==============================================================================
--- desktop/unstable/glade-3/debian/control.in (original)
+++ desktop/unstable/glade-3/debian/control.in Fri Apr 18 13:50:58 2008
@@ -7,7 +7,7 @@
                debhelper (>= 5),
                gettext (>= 0.10.40),
                libgnomeui-dev,
-               scrollkeeper (>= 0.1.4),
+               scrollkeeper,
                libxml2-dev (>= 2.4.0),
                libbonoboui2-dev,
                autotools-dev,

Modified: desktop/unstable/glade-3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade-3/debian/rules?rev=15688&op=diff
==============================================================================
--- desktop/unstable/glade-3/debian/rules (original)
+++ desktop/unstable/glade-3/debian/rules Fri Apr 18 13:50:58 2008
@@ -12,6 +12,8 @@
 
 GNOME_MODULE := glade3
 
+SHARED_PKG := $(shell sed -rn 's/Package:[[:space:]]*(libgladeui-[0-9\.]+-[0-9][0-9a-z]*)[[:space:]]*$$/\1/p' debian/control)
+
 DEB_CONFIGURE_EXTRA_FLAGS += \
 			--enable-gtk-doc \
 			--disable-scrollkeeper
@@ -21,20 +23,20 @@
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 # ensures that libgladeui's shlibs are in place when calling dh_shlibdeps
-binary-glade:: binary-libgladeui-1-7
-binary-glade-gnome:: binary-libgladeui-1-7
+binary-glade:: binary-$(SHARED_PKG)
+binary-glade-gnome:: binary-$(SHARED_PKG)
 
 # link with the freshly build libgladeui during dh_shlibdeps, and use freshly
 # generated shlib information
-DEB_SHLIBDEPS_LIBRARY_glade += libgladeui-1-7
-DEB_SHLIBDEPS_INCLUDE_glade += debian/libgladeui-1-7/usr/lib/
-DEB_SHLIBDEPS_LIBRARY_glade-common += libgladeui-1-7
-DEB_SHLIBDEPS_INCLUDE_glade-common += debian/libgladeui-1-7/usr/lib/
+DEB_SHLIBDEPS_LIBRARY_glade += $(SHARED_PKG)
+DEB_SHLIBDEPS_INCLUDE_glade += debian/$(SHARED_PKG)/usr/lib/
+DEB_SHLIBDEPS_LIBRARY_glade-common += $(SHARED_PKG)
+DEB_SHLIBDEPS_INCLUDE_glade-common += debian/$(SHARED_PKG)/usr/lib/
 
 # move stuff that will go in glade-gnome
-binary-post-install/libgladeui-1-7::
-	for file in $$(find debian/libgladeui-1-7/usr/share/glade3/pixmaps/ -name \*gnome\* -or -name \*bonobo\*); do \
-		target_dir=$$(dirname debian/glade-gnome/$${file#debian/libgladeui-1-7/}); \
+binary-post-install/$(SHARED_PKG)::
+	for file in $$(find debian/$(SHARED_PKG)/usr/share/glade3/pixmaps/ -name \*gnome\* -or -name \*bonobo\*); do \
+		target_dir=$$(dirname debian/glade-gnome/$${file#debian/$(SHARED_PKG)/}); \
 		mkdir -p $${target_dir}; \
 		mv $${file} $${target_dir}; \
 	done