[SCM] thin, simple and robust network communication layer on top of UDP branch, master, updated. debian/1.2.1-1-14-g47d262c

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit a67cecadf3024dfbd6ccffea1ec7f09e63fa9634
Author: Ansgar Burchardt <ansgar at 43-1.org>
Date:   Tue Feb 8 21:40:48 2011 +0100

    Adapt binary package names for new soname.

diff --git a/debian/control b/debian/control
index 932864d..3dc8213 100644
--- a/debian/control
+++ b/debian/control
@@ -10,9 +10,9 @@ Vcs-Git: git://git.debian.org/git/pkg-games/enet.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/enet.git
 Homepage: http://enet.bespin.org/
 
-Package: libenet0debian1
-Replaces: libenet (<< 1.0-3)
-Conflicts: libenet (<< 1.0-3)
+Package: libenet1a
+Replaces: libenet1
+Breaks: libenet1
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Architecture: any
 Description: thin network communication layer on top of UDP
@@ -26,8 +26,8 @@ Description: thin network communication layer on top of UDP
 
 Package: libenet-dev
 Section: libdevel
-Depends: ${misc:Depends}, libenet0debian1 (= ${binary:Version})
-Recommends: libenet-doc, libenet0debian1-dbg
+Depends: ${misc:Depends}, libenet1a (= ${binary:Version})
+Recommends: libenet-doc, libenet1a-dbg
 Replaces: libenet1-dev (<< 1.2)
 Architecture: any
 Description: thin network communication layer on top of UDP - headers
@@ -41,11 +41,11 @@ Description: thin network communication layer on top of UDP - headers
  .
  This package contains the development files.
 
-Package: libenet0debian1-dbg
+Package: libenet1a-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: ${misc:Depends}, libenet0debian1 (= ${binary:Version})
+Depends: ${misc:Depends}, libenet1a (= ${binary:Version})
 Description: thin network communication layer on top of UDP - debug symbols
  ENet's purpose is to provide a relatively thin, simple and robust network
  communication layer on top of UDP (User Datagram Protocol). The primary
diff --git a/debian/libenet-dev.install b/debian/libenet-dev.install
index a76a856..e0cc692 100644
--- a/debian/libenet-dev.install
+++ b/debian/libenet-dev.install
@@ -1,2 +1,3 @@
 usr/include/enet
+usr/lib/libenet.so
 usr/lib/pkgconfig
diff --git a/debian/libenet-dev.links b/debian/libenet-dev.links
deleted file mode 100644
index a307da4..0000000
--- a/debian/libenet-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libenet.so.0debian1.0 usr/lib/libenet.so
diff --git a/debian/libenet0debian1.install b/debian/libenet0debian1.install
deleted file mode 100644
index 4560c42..0000000
--- a/debian/libenet0debian1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-libenet.so* usr/lib
-
diff --git a/debian/libenet0debian1.links b/debian/libenet0debian1.links
deleted file mode 100644
index dd4a799..0000000
--- a/debian/libenet0debian1.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libenet.so.0debian1.0 usr/lib/libenet.so.0debian1
diff --git a/debian/libenet1a.install b/debian/libenet1a.install
new file mode 100644
index 0000000..f50b5f7
--- /dev/null
+++ b/debian/libenet1a.install
@@ -0,0 +1 @@
+usr/lib/libenet.so.*
diff --git a/debian/libenet1a.lintian-overrides b/debian/libenet1a.lintian-overrides
new file mode 100644
index 0000000..eca6cc0
--- /dev/null
+++ b/debian/libenet1a.lintian-overrides
@@ -0,0 +1,5 @@
+# Debian already used libenet.so.1 as an inofficial soname for libenet.
+# With naming the binary package differently, we at least prevent Debian
+# packages to think this is the old library version and hope nobody build their
+# own binaries linked with the old libenet.so.1.
+libenet1a: package-name-doesnt-match-sonames libenet1
diff --git a/debian/rules b/debian/rules
index 243a412..08e6a1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,9 +11,6 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	dh_auto_build
-	# create the shared lib
-	gcc -Wl,-soname,libenet.so.0debian1 -shared -o libenet.so.0debian1.0 *.o
-
 	doxygen
 
 override_dh_clean:
@@ -21,4 +18,4 @@ override_dh_clean:
 	dh_clean
 
 override_dh_strip:
-	dh_strip --dbg-package=libenet0debian1-dbg
+	dh_strip --dbg-package=libenet1a-dbg

-- 
thin, simple and robust network communication layer on top of UDP