r20722 - in /desktop/unstable/devhelp/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Wed Jul 15 22:17:38 2009
New Revision: 20722

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20722
Log:
Don't hardcode libdevhelp-1's SONAME.

Modified:
    desktop/unstable/devhelp/debian/changelog
    desktop/unstable/devhelp/debian/rules

Modified: desktop/unstable/devhelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/changelog?rev=20722&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/changelog (original)
+++ desktop/unstable/devhelp/debian/changelog Wed Jul 15 22:17:38 2009
@@ -1,8 +1,12 @@
 devhelp (0.23-4) UNRELEASED; urgency=low
 
+  [ Emilio Pozuelo Monfort ]
   * Add headers to patches.
   * debian/patches/04_close_correct_tab.patch: Removed, doesn't work.
     Bug forwarded to BGO: #587987.
+
+  [ Loïc Minier ]
+  * Don't hardcode libdevhelp-1's SONAME.
 
  -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Tue, 07 Jul 2009 17:24:15 +0200
 

Modified: desktop/unstable/devhelp/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/rules?rev=20722&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/rules (original)
+++ desktop/unstable/devhelp/debian/rules Wed Jul 15 22:17:38 2009
@@ -8,7 +8,9 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libdevhelp-1-0 (>= 0.14)'
+libdevhelp-1-N := $(shell sed -rn 's/^Package:[[:space:]]*(libdevhelp-1-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+
+DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(libdevhelp-1-N) (>= 0.14)'
 
 X_TOOLS += misc/devhelp.vim \
 	misc/html2funcs.py \
@@ -24,11 +26,11 @@
 	dh_pysupport -p$(cdbs_curpkg) /usr/lib/gedit-2/plugins/devhelp
 
 # this creates a debian/shlibs.local forcing very strict interdependencies
-binary-post-install/libdevhelp-1-0::
-	chrpath -d `pwd`/debian/libdevhelp-1-0/usr/lib/libdevhelp-1.so.0.0.0
-	dh_makeshlibs -plibdevhelp-1-0 -n \
-		-V "libdevhelp-1-0 (= $(DEB_VERSION))"
-	mv debian/libdevhelp-1-0/DEBIAN/shlibs \
+binary-post-install/$(libdevhelp-1-N)::
+	chrpath -d `pwd`/debian/$(cdbs_curpkg)/usr/lib/libdevhelp-1.so.0.0.0
+	dh_makeshlibs -p$(cdbs_curpkg) -n \
+		-V "$(libdevhelp-1-N) (= $(DEB_VERSION))"
+	mv debian/$(cdbs_curpkg)/DEBIAN/shlibs \
 		debian/shlibs.local
 
 binary-post-install/devhelp::