r26071 - in /desktop/experimental/libsoup2.4/debian: changelog control control.in rules

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Thu Dec 23 02:44:19 UTC 2010 

Author: pochu
Date: Thu Dec 23 02:44:18 2010
New Revision: 26071

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26071
Log:
* New upstream development release.
  + debian/control.in:
    - Build-depend/Depend on glib-networking.
    - Stop build depending on libgnutls, we use glib-networking now.
  + debian/rules:
    - Make the shlibs always depend on the latest upstream version.
      We have symbols file anyway, and manually bumping the shver is
      error prone.

Modified:
    desktop/experimental/libsoup2.4/debian/changelog
    desktop/experimental/libsoup2.4/debian/control
    desktop/experimental/libsoup2.4/debian/control.in
    desktop/experimental/libsoup2.4/debian/rules

Modified: desktop/experimental/libsoup2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libsoup2.4/debian/changelog?rev=26071&op=diff
==============================================================================
--- desktop/experimental/libsoup2.4/debian/changelog [utf-8] (original)
+++ desktop/experimental/libsoup2.4/debian/changelog [utf-8] Thu Dec 23 02:44:18 2010
@@ -1,7 +1,15 @@
-libsoup2.4 (2.32.2-2) UNRELEASED; urgency=low
+libsoup2.4 (2.33.4-1) UNRELEASED; urgency=low
 
   * debian/control.in:
     - Remove gir-repository-dev build dependency, no longer needed.
+  * New upstream development release.
+    + debian/control.in:
+      - Build-depend/Depend on glib-networking.
+      - Stop build depending on libgnutls, we use glib-networking now.
+    + debian/rules:
+      - Make the shlibs always depend on the latest upstream version.
+        We have symbols file anyway, and manually bumping the shver is
+        error prone.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 15 Dec 2010 00:54:33 +0100
 

Modified: desktop/experimental/libsoup2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libsoup2.4/debian/control?rev=26071&op=diff
==============================================================================
--- desktop/experimental/libsoup2.4/debian/control [utf-8] (original)
+++ desktop/experimental/libsoup2.4/debian/control [utf-8] Thu Dec 23 02:44:18 2010
@@ -13,9 +13,9 @@
                cdbs,
                gnome-pkg-tools,
                libgconf2-dev,
-               libglib2.0-dev (>= 2.21.3),
+               libglib2.0-dev (>= 2.27.5),
+               glib-networking,
                libgnome-keyring-dev,
-               libgnutls-dev (>= 2.1.7),
                libproxy-dev,
                libsqlite3-dev,
                libxml2-dev,
@@ -25,7 +25,6 @@
                gobject-introspection (>= 0.9.12-4~),
                gir1.2-glib-2.0
 Build-Depends-Indep: libglib2.0-doc
-Build-Conflicts: libgnutls11-dev
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/libsoup2.4
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/libsoup2.4
 Standards-Version: 3.8.4
@@ -36,9 +35,7 @@
 Depends: ${misc:Depends},
          libsoup2.4-1 (= ${binary:Version}),
          libglib2.0-dev (>= 2.21.3),
-         libxml2-dev,
-         libgnutls-dev (>= 2.1.7)
-Conflicts: libgnutls11-dev
+         libxml2-dev
 Suggests: libsoup2.4-doc
 Replaces: gir-repository-dev (<< 0.6.5-7)
 Description: an HTTP library implementation in C -- Development files
@@ -67,7 +64,8 @@
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         glib-networking
 Description: an HTTP library implementation in C -- Shared library
  It was originally part of a SOAP (Simple Object Access Protocol)
  implementation called Soup, but the SOAP and non-SOAP parts have now been

Modified: desktop/experimental/libsoup2.4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libsoup2.4/debian/control.in?rev=26071&op=diff
==============================================================================
--- desktop/experimental/libsoup2.4/debian/control.in [utf-8] (original)
+++ desktop/experimental/libsoup2.4/debian/control.in [utf-8] Thu Dec 23 02:44:18 2010
@@ -8,9 +8,9 @@
                cdbs,
                gnome-pkg-tools,
                libgconf2-dev,
-               libglib2.0-dev (>= 2.21.3),
+               libglib2.0-dev (>= 2.27.5),
+               glib-networking (>= 2.27.5),
                libgnome-keyring-dev,
-               libgnutls-dev (>= 2.1.7),
                libproxy-dev,
                libsqlite3-dev,
                libxml2-dev,
@@ -20,7 +20,6 @@
                gobject-introspection (>= 0.9.12-4~),
                gir1.2-glib-2.0
 Build-Depends-Indep: libglib2.0-doc
-Build-Conflicts: libgnutls11-dev
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/libsoup2.4
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/libsoup2.4
 Standards-Version: 3.8.4
@@ -31,9 +30,7 @@
 Depends: ${misc:Depends},
          libsoup2.4-1 (= ${binary:Version}),
          libglib2.0-dev (>= 2.21.3),
-         libxml2-dev,
-         libgnutls-dev (>= 2.1.7)
-Conflicts: libgnutls11-dev
+         libxml2-dev
 Suggests: libsoup2.4-doc
 Replaces: gir-repository-dev (<< 0.6.5-7)
 Description: an HTTP library implementation in C -- Development files
@@ -62,7 +59,8 @@
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         glib-networking (>= 2.27.5)
 Description: an HTTP library implementation in C -- Shared library
  It was originally part of a SOAP (Simple Object Access Protocol)
  implementation called Soup, but the SOAP and non-SOAP parts have now been

Modified: desktop/experimental/libsoup2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libsoup2.4/debian/rules?rev=26071&op=diff
==============================================================================
--- desktop/experimental/libsoup2.4/debian/rules [utf-8] (original)
+++ desktop/experimental/libsoup2.4/debian/rules [utf-8] Thu Dec 23 02:44:18 2010
@@ -1,21 +1,15 @@
 #!/usr/bin/make -f
-
-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.32.2
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GNOME_MODULE := libsoup
 
-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_DH_MAKESHLIBS_ARGS_ALL += -V -- -c4
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
 DEB_MAKE_CHECK_TARGET = check

More information about the pkg-gnome-commits mailing list