r23262 - in /desktop/unstable/libsoup2.4/debian: changelog rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Fri Mar 12 19:17:57 2010
New Revision: 23262

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23262
Log:
  - Fix SOVERSION calculation.
  - Don't pass additional flags to dh_shlibdeps for the -dev packages.
    That's just wrong, but luckily they weren't depending on
    ${shlibs:Depends} so it had no effect.

Modified:
    desktop/unstable/libsoup2.4/debian/changelog
    desktop/unstable/libsoup2.4/debian/rules

Modified: desktop/unstable/libsoup2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/changelog?rev=23262&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/changelog [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/changelog [utf-8] Fri Mar 12 19:17:57 2010
@@ -1,6 +1,10 @@
 libsoup2.4 (2.29.91-2) UNRELEASED; urgency=low
 
   * debian/rules:
+    - Fix SOVERSION calculation.
+    - Don't pass additional flags to dh_shlibdeps for the -dev packages.
+      That's just wrong, but luckily they weren't depending on
+      ${shlibs:Depends} so it had no effect.
     - Enable the test suite during the build, but don't make it fatal yet.
   * debian/control.in:
     - Build dep on shared-mime-info, needed for one test to pass.

Modified: desktop/unstable/libsoup2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/rules?rev=23262&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/rules [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/rules [utf-8] Fri Mar 12 19:17:57 2010
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
-ifeq ($(wildcard configure.in),configure.in)
-SOUP_CURRENT := $(shell grep '^SOUP_CURRENT=' configure.in | sed -e 's/SOUP_CURRENT=//g')
-SOUP_AGE := $(shell grep '^SOUP_AGE=' configure.in | sed -e 's/SOUP_AGE=//g')
-SOUP_SOVERSION := $(shell expr $(SOUP_CURRENT) - $(SOUP_AGE))
-endif
+libsoup2.4-N := $(shell sed -nr 's/^Package:[[:space:]]*(libsoup2.4-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+libsoup-gnome2.4-N := $(shell sed -nr 's/^Package:[[:space:]]*(libsoup-gnome2.4-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 
 SHVER := 2.29.90
 
@@ -17,10 +14,8 @@
 
 GNOME_MODULE := libsoup
 
-DEB_SHLIBDEPS_INCLUDE_libsoup2.4-dev += debian/libsoup2.4-${SOUP_SOVERSION}/usr/lib
-DEB_SHLIBDEPS_INCLUDE_libsoup-gnome2.4-dev += debian/libsoup-gnome2.4-${SOUP_SOVERSION}/usr/lib
-DEB_DH_MAKESHLIBS_ARGS_libsoup2.4-1 += -V'libsoup2.4-${SOUP_SOVERSION} (>= $(SHVER))' -- -c4
-DEB_DH_MAKESHLIBS_ARGS_libsoup-gnome2.4-1 += -V'libsoup-gnome2.4-${SOUP_SOVERSION} (>= $(SHVER))' -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libsoup2.4-1 += -V'$(libsoup2.4-N) (>= $(SHVER))' -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libsoup-gnome2.4-1 += -V'$(libsoup-gnome2.4-N) (>= $(SHVER))' -- -c4
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
 DEB_MAKE_CHECK_TARGET = check || true