* debian/patches/04-ltversioning.patch

  - Bump soname of libnm-util due to an ABI break between 0.6.6 and 0.7.
    (Closes: #503682)
* Update control, install and symbols file for the new libnm-util library
  name.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2538 ceb527fc-18e6-0310-9fe2-813c157c29e7

6 files changed, 91 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 7b87c8e9..14de33e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 network-manager (0.7.0-1) UNRELEASED; urgency=low
 
+  [ Sjoerd Simons ]
   * New upstream release
   * debian/libnm-util0.symbols: Updated
   * debian/libnm-glib0.symbols: Updated
@@ -7,7 +8,14 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low
     - Added. Fix gsm support for Ericsson F3507g Mobile Broadband cards
   * debian/control: Recommend ppp
 
- -- Sjoerd Simons <sjoerd@debian.org>  Wed, 03 Dec 2008 23:50:41 +0000
+  [ Michael Biebl ]
+  * debian/patches/04-ltversioning.patch
+    - Bump soname of libnm-util due to an ABI break between 0.6.6 and 0.7.
+      (Closes: #503682)
+  * Update control, install and symbols file for the new libnm-util library
+    name.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 06 Dec 2008 00:43:22 +0100
 
 network-manager (0.7.0~svn4191-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 3d599a50..a2a0759f 100644
--- a/debian/control
+++ b/debian/control
@@ -96,7 +96,7 @@ Description: network management framework (GLib interface)
  This package provides the shared library that applications can use for
  creating VPN connections via NetworkManager.
 
-Package: libnm-util0
+Package: libnm-util1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -114,7 +114,7 @@ Description: network management framework (shared library)
 Package: libnm-util-dev
 Section: libdevel
 Architecture: any
-Depends: libnm-util0 (= ${binary:Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60)
+Depends: libnm-util1 (= ${binary:Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60)
 Description: network management framework (development files)
  NetworkManager attempts to keep an active network connection available at all
  times. It is intended only for the desktop use-case, and is not intended for
diff --git a/debian/libnm-util0.install b/debian/libnm-util1.install
index 051d4901..051d4901 100644
--- a/debian/libnm-util0.install
+++ b/debian/libnm-util1.install
diff --git a/debian/libnm-util0.symbols b/debian/libnm-util1.symbols
index 03adfdd9..94922a5e 100644
--- a/debian/libnm-util0.symbols
+++ b/debian/libnm-util1.symbols
@@ -1,4 +1,4 @@
-libnm-util.so.0 libnm-util0 #MINVER#
+libnm-util.so.1 libnm-util1 #MINVER#
  nm_connection_add_setting@Base 0.7.0
  nm_connection_clear_secrets@Base 0.7.0
  nm_connection_compare@Base 0.7.0
diff --git a/debian/patches/04-ltversioning.patch b/debian/patches/04-ltversioning.patch
new file mode 100644
index 00000000..e88f8750
--- /dev/null
+++ b/debian/patches/04-ltversioning.patch
@@ -0,0 +1,78 @@
+Index: network-manager-0.7.0/libnm-glib/Makefile.am
+===================================================================
+--- network-manager-0.7.0.orig/libnm-glib/Makefile.am	2008-12-06 00:35:11.000000000 +0100
++++ network-manager-0.7.0/libnm-glib/Makefile.am	2008-12-06 00:35:23.000000000 +0100
+@@ -91,7 +91,8 @@
+ 	$(GCONF_LIBS)					\
+ 	$(GNOME_KEYRING_LIBS)
+ 
+-libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver
++libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver \
++	-version-info "1:0:1"
+ 
+ noinst_PROGRAMS = libnm-glib-test
+ 
+@@ -103,7 +104,8 @@
+ libnm_glib_vpn_la_SOURCES = nm-vpn-plugin.c nm-vpn-plugin-ui-interface.c
+ libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
+ libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
+-libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver
++libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver \
++	-version-info "0:0:0"
+ 
+ 
+ nm-client-bindings.h: $(top_srcdir)/introspection/nm-manager-client.xml
+Index: network-manager-0.7.0/libnm-glib/Makefile.in
+===================================================================
+--- network-manager-0.7.0.orig/libnm-glib/Makefile.in	2008-12-06 00:35:14.000000000 +0100
++++ network-manager-0.7.0/libnm-glib/Makefile.in	2008-12-06 00:36:06.000000000 +0100
+@@ -405,14 +405,18 @@
+ 	$(GCONF_LIBS)					\
+ 	$(GNOME_KEYRING_LIBS)
+ 
+-libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver
++libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver \
++	-version-info "1:0:1"
++
+ libnm_glib_test_SOURCES = libnm-glib-test.c
+ libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
+ libnm_glib_test_LDADD = libnm_glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
+ libnm_glib_vpn_la_SOURCES = nm-vpn-plugin.c nm-vpn-plugin-ui-interface.c
+ libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
+ libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
+-libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver
++libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver \
++	-version-info "0:0:0"
++
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libnm_glib.pc libnm_glib_vpn.pc
+ DISTCLEANFILES = libnm_glib.pc libnm_glib.pc
+Index: network-manager-0.7.0/libnm-util/Makefile.am
+===================================================================
+--- network-manager-0.7.0.orig/libnm-util/Makefile.am	2008-12-06 00:34:59.000000000 +0100
++++ network-manager-0.7.0/libnm-util/Makefile.am	2008-12-06 00:35:23.000000000 +0100
+@@ -52,7 +52,8 @@
+ 
+ libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS)
+ 
+-libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver
++libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver \
++	-version-info "1:0:0"
+ 
+ if WITH_GNUTLS
+ libnm_util_la_SOURCES += crypto_gnutls.c
+Index: network-manager-0.7.0/libnm-util/Makefile.in
+===================================================================
+--- network-manager-0.7.0.orig/libnm-util/Makefile.in	2008-12-06 00:35:02.000000000 +0100
++++ network-manager-0.7.0/libnm-util/Makefile.in	2008-12-06 00:35:39.000000000 +0100
+@@ -367,7 +367,9 @@
+ 	$(libnm_util_include_HEADERS) $(am__append_1) $(am__append_4)
+ libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS) \
+ 	$(am__append_3) $(am__append_6)
+-libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver
++libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver \
++	-version-info "1:0:0"
++
+ libnm_util_includedir = $(includedir)/NetworkManager
+ test_crypto_SOURCES = test-crypto.c crypto.c $(am__append_7) \
+ 	$(am__append_10)
diff --git a/debian/patches/series b/debian/patches/series
index 11aea666..13051060 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 02-dbus_access_network_manager.patch
 03-F3507g.patch -p0
+04-ltversioning.patch