Bug#639084: NMU: Closes #639084: libnatpmp1: unversioned files in shlib package
On 09/07/2011 03:18 PM, Stanislav Maslovski wrote: Hello Thomas, Just in case, here goes the updated patch. Cheers, Stanislav Hi Stanislav, Thanks a lot for your patch. I have applied it to the Git and uploaded it to alioth since I believe it's quite clean now. I've been quite busy over the last days, organizing this: http://www.openstack-china.org/en/event.html which is why I didn't reply yet to your email. Unfortunately, my SID virtual machine which I normally use to build and upload just broke after I upgraded it. I am guessing it's a recent issue on the archive (is there currently a serious issue with SID?). Anyway, I'll have to reinstall it from scratch since it even crashes on boot, which I have little time to do today (I've got an appointment with some of the guests before they come back to USA). I will upload as soon as I have a bit of time to test the correct way, which should I hope before the end of the week. Thomas -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#639084: NMU: Closes #639084: libnatpmp1: unversioned files in shlib package
On 09/07/2011 03:18 PM, Stanislav Maslovski wrote: Hello Thomas, Just in case, here goes the updated patch. Cheers, Stanislav FYI, I just uploaded the patched version. Thanks again for your contribution, it's much appreciated, especially that I didn't have time to fix things over the last days. Note that I have tested a backport on my Squeeze laptop, and it worked well (natpmpc could detect my external IP and open ports). Thomas -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#639084: NMU: Closes #639084: libnatpmp1: unversioned files in shlib package
Hello Thomas,
Just in case, here goes the updated patch.
Cheers,
Stanislav
On Mon, Sep 05, 2011 at 01:37:23PM +0800, Thomas Goirand wrote:
On 09/05/2011 01:34 PM, Thomas Goirand wrote:
-Replaces: libnatpmp0 (= 20110808-2)
+Replaces: libnatpmp0, libnatpmp1 ( ${binary:Version})
I think what I did was right, because after version 20110808-2, we don't
have the upgrade issue.
Woops, wrote something silly. What we need IMO is:
Package: natpmp-utils
[...]
-Replaces: libnatpmp0 (= 20110808-2)
+Replaces: libnatpmp0, libnatpmp1 (= 20110808-2)
Thomas
diff --git a/debian/changelog b/debian/changelog
index 173c879..de814ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,26 @@
libnatpmp (20110808-3) unstable; urgency=low
+ [ Thomas Goirand ]
* Moves the natpmpc inside a new natpmp-utils package (Closes: #639084).
* Removes Debian specific natpmpc.1, since upstream integrated it in his
- upstream tarball.
+upstream tarball.
+
+ [ Stanislav Maslovski ]
+ * debian/control:
+- no need to build-depend/depend on python: python module is not built
+- corrected libnatpmp1 dependencies
+- corrected libnatpmp-dev dependencies
+- natpmp-utils replaces older libnatpmp binaries
+- linatpmp1 suggests natpmp-utils
+ * debian/rules:
+- do not move files by hand, use dh_install
+- install docs and changelogs only once
+ * new files:
+- natpmp-utils.install, natpmp-utils.manpages,
+ libnatpmp-dev.install, libnatpmp1.install
+ * removed files:
+- libnatpmp1.shibls (not needed; autogenerated by dh_makeshlibs),
+ manpages
-- Thomas Goirand z...@debian.org Wed, 24 Aug 2011 12:02:12 +0800
diff --git a/debian/control b/debian/control
index fcd66c2..7b847eb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libnatpmp
Section: net
Priority: optional
Maintainer: Thomas Goirand z...@debian.org
-Build-Depends: debhelper (= 7), python
+Build-Depends: debhelper (= 7)
Standards-Version: 3.9.2
Vcs-Browser: http://git.debian.org/?p=users/zigo/libnatpmp.git
Vcs-Git: http://git.debian.org/git/users/zigo/libnatpmp.git
@@ -10,10 +10,8 @@ Homepage: http://miniupnp.free.fr/
Package: libnatpmp1
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, python
-Breaks: libnatpmp0
-Replaces: libnatpmp0
-Suggests: minissdpd
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Suggests: natpmp-utils, minissdpd
Description: portable and fully compliant implementation of NAT-PMP
NAT-PMP is the direct concurrent to the UPnP IGD specification. It is
providing a way to do NAT traversal. It is part of the Bonjour protocol
@@ -32,8 +30,7 @@ Description: portable and fully compliant implementation of NAT-PMP
Package: libnatpmp-dev
Architecture: any
Section: libdevel
-Depends: ${misc:Depends}, ${shlibs:Depends}, libnatpmp1 (= ${binary:Version}), python
-Replaces: libnatpmp0
+Depends: ${misc:Depends}, libnatpmp1 (= ${binary:Version})
Description: portable and fully compliant implementation of NAT-PMP (dev files)
NAT-PMP is the direct concurrent to the UPnP IGD specification. It is
providing a way to do NAT traversal. It is part of the Bonjour protocol
@@ -47,12 +44,12 @@ Description: portable and fully compliant implementation of NAT-PMP (dev files)
blocking sockets and all calls of the API are asynchronous. It is therefore
very easy to integrate the NAT-PMP code to any event driven code.
.
- This package contains development files needed to build using libnatpmp
+ This package contains development files needed to build using libnatpmp.
Package: natpmp-utils
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: libnatpmp0 (= 20110808-2)
+Replaces: libnatpmp0, libnatpmp1 (= 20110808-2)
Description: portable and fully compliant implementation of NAT-PMP (userland tool)
NAT-PMP is the direct concurrent to the UPnP IGD specification. It is
providing a way to do NAT traversal. It is part of the Bonjour protocol
diff --git a/debian/libnatpmp-dev.install b/debian/libnatpmp-dev.install
new file mode 100644
index 000..a204739
--- /dev/null
+++ b/debian/libnatpmp-dev.install
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/libnatpmp*.so
+usr/lib/libnatpmp*.a
diff --git a/debian/libnatpmp1.install b/debian/libnatpmp1.install
new file mode 100644
index 000..2e3efc4
--- /dev/null
+++ b/debian/libnatpmp1.install
@@ -0,0 +1 @@
+usr/lib/libnatpmp*.so.*
diff --git a/debian/libnatpmp1.shlibs b/debian/libnatpmp1.shlibs
deleted file mode 100644
index 94757ab..000
--- a/debian/libnatpmp1.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libnatpmp 1 libnatpmp1
diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644
index 25a3d1e..000
--- a/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-natpmpc.1
diff --git a/debian/natpmp-utils.install b/debian/natpmp-utils.install
new file mode 100644
index 000..e772481
--- /dev/null
+++ b/debian/natpmp-utils.install
@@ -0,0 +1 @@
+usr/bin
diff --git
Bug#639084: NMU: Closes #639084: libnatpmp1: unversioned files in shlib package
On Mon, Sep 05, 2011 at 01:34:38PM +0800, Thomas Goirand wrote:
On 09/05/2011 06:16 AM, Stanislav Maslovski wrote:
On Mon, Sep 05, 2011 at 03:25:19AM +0800, Thomas Goirand wrote:
thanks a lot for your work, but could you provide a git format-patch
type of patch against what's in the Git instead? That'd be really helpful.
Here goes a patch against your current git, please check. I applied my
changes on top of yours (with adaptations where necessary). Check my
changes regarding Breaks:/Replaces: in debian/control. I think the new
libnatpmp1 package does not need to specify any Breaks: or Replaces:
If in doubt, ask in debian-mentors.
Hi,
Since libnatpmp1 is an update to libnatpmp0, I believe we need to
declare it, otherwise libnatpmp0 wont be replaced.
First of all, libnatpmp1 is not an upgrade to libnatpmp0, as its
soname is different. When packaged correctly, libraries with different
sonames should be able to coexist on the same system.
Imagine a situation with someone who in the past installed libnatpmp0
and the corresponding dev package and built some local software
against it. Then, even if you have the control over all the packages
from the Debian repositories that depend on libnatpmp, you will not be
able to prevent breakage of that software if you force an uninstall of
libnatpmp0 in favour of libnatpmp1.
The wrong thing with your packaging was that you shipped unversioned
files within the shared library package, therefore, installation of
libnatpmp1 was impossible without Breaks:/Replaces: wrt libnatpmp0.
The corrected libnatpmp1 package has no such problem, so that it may
be even installed alongside libnatpmp0.
I tried upgrading, and unfortunately, I needed to apt-get install
libnatpmp1, otherwise apt would say libnatpmp0 will be kept back,
so I guess that what I did was wrong.
This should not happen with the corrected package.
Never the less, something has to be done about it, if we don't want
people to keep the obsolete libnatpmp0 on their system.
Well, as I explained above, you really must not force uninstallation
of a shared library in this way.
You've set libnatpmp-dev to depend on libc6-dev | libc-dev, I don't
think that's needed since this is a build-essential anyway.
Yes, you are right, this dependency is not necessary.
Also, you did this:
-Replaces: libnatpmp0 (= 20110808-2)
+Replaces: libnatpmp0, libnatpmp1 ( ${binary:Version})
I think what I did was right, because after version 20110808-2, we don't
have the upgrade issue.
Here you are also right, it was a thinko on my side, sorry.
Also, why are you doing this?
- dh_installchangelogs Changelog.txt
+ dh_installchangelogs
I think it's cool to package upstream's Changelog.txt ... Or is it that
your patch is missing a debian/*.docs file?
No, as you may check, the upstream changelog is installed with this
change. It is not needed to mention Changelog.txt explicitly as
debhelper finds it anyway.
--
Stanislav
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#639084: NMU: Closes #639084: libnatpmp1: unversioned files in shlib package
On Mon, Sep 05, 2011 at 01:37:23PM +0800, Thomas Goirand wrote: Woops, wrote something silly. What we need IMO is: Package: natpmp-utils [...] -Replaces: libnatpmp0 (= 20110808-2) +Replaces: libnatpmp0, libnatpmp1 (= 20110808-2) Correct. -- Stanislav -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#639084: NMU: Closes #639084: libnatpmp1: unversioned files in shlib package
Hello, Please consider this NMU (uploaded to mentors.debian.net, see the forwarded message below). Changes: libnatpmp (20110808-2.1) unstable; urgency=low * Non-maintainer upload (Closes: #639084). * debian/control: - no need to build-depend/depend on python: python module is not built - corrected libnatpmp1 dependencies - corrected libnatpmp-dev dependencies - added libnatpmp-bin package - linatpmp1 suggests libnatpmp-bin * debian/rules: - do not move files by hand, use dh_install - install docs and changelogs only once * new files: - libnatpmp-bin.install, libnatpmp-bin.manpages, libnatpmp-dev.install, libnatpmp1.install * removed files: - libnatpmp1.shibls (not needed; autogenerated by dh_makeshlibs), manpages - Forwarded message from mentors.debian.net supp...@mentors.debian.net - Date: Sun, 4 Sep 2011 12:30:58 -0400 (EDT) From: mentors.debian.net supp...@mentors.debian.net Subject: libnatpmp uploaded to mentors.debian.net Hi. Your upload of the package 'libnatpmp' to mentors.debian.net was successful. Others can now see it. The URL of your package is: http://mentors.debian.net/package/libnatpmp The respective dsc file can be found at: http://mentors.debian.net/debian/pool/main/libn/libnatpmp/libnatpmp_20110808-2.1.dsc If you do not yet have a sponsor for your package you may want to go to http://mentors.debian.net/package/rfs/libnatpmp and set the Seeking a sponsor option to highlight your package on the welcome page. You can also send an RFS (request for sponsorship) to the debian-mentors mailing list. Your package page will give your suggestions on how to send that mail. Good luck in finding a sponsor! Thanks, -- mentors.debian.net - End forwarded message - -- Stanislav -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#639084: NMU: Closes #639084: libnatpmp1: unversioned files in shlib package
Hi again, Just in case, here goes the diff with all changes to the package. -- Stanislav -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#639084: NMU: Closes #639084: libnatpmp1: unversioned files in shlib package
Oops, pressed wrong key. Now attached.
On Sun, Sep 04, 2011 at 10:18:11PM +0400, Stanislav Maslovski wrote:
Hi again,
Just in case, here goes the diff with all changes to the package.
--
Stanislav
diff -urN a/libnatpmp-20110808/debian/changelog b/libnatpmp-20110808/debian/changelog
--- a/libnatpmp-20110808/debian/changelog 2011-09-04 21:04:32.0 +0400
+++ b/libnatpmp-20110808/debian/changelog 2011-09-04 21:08:14.0 +0400
@@ -1,3 +1,24 @@
+libnatpmp (20110808-2.1) unstable; urgency=low
+
+ * Non-maintainer upload (Closes: #639084).
+ * debian/control:
+- no need to build-depend/depend on python: python module is not built
+- corrected libnatpmp1 dependencies
+- corrected libnatpmp-dev dependencies
+- added libnatpmp-bin package
+- linatpmp1 suggests libnatpmp-bin
+ * debian/rules:
+- do not move files by hand, use dh_install
+- install docs and changelogs only once
+ * new files:
+- libnatpmp-bin.install, libnatpmp-bin.manpages,
+ libnatpmp-dev.install, libnatpmp1.install
+ * removed files:
+- libnatpmp1.shibls (not needed; autogenerated by dh_makeshlibs),
+ manpages
+
+ -- Stanislav Maslovski stanislav.maslov...@gmail.com Sun, 04 Sep 2011 17:21:43 +0400
+
libnatpmp (20110808-2) unstable; urgency=low
* Removes the Provides: libnatpmp0 (Closes: #638828).
diff -urN a/libnatpmp-20110808/debian/control b/libnatpmp-20110808/debian/control
--- a/libnatpmp-20110808/debian/control 2011-09-04 21:04:32.0 +0400
+++ b/libnatpmp-20110808/debian/control 2011-09-04 19:58:58.0 +0400
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Maintainer: Thomas Goirand z...@debian.org
-Build-Depends: debhelper (= 7), python
+Build-Depends: debhelper (= 7)
Standards-Version: 3.9.2
Vcs-Browser: http://git.debian.org/?p=users/zigo/libnatpmp.git
Vcs-Git: http://git.debian.org/git/users/zigo/libnatpmp.git
@@ -10,10 +10,10 @@
Package: libnatpmp1
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, python
+Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: libnatpmp0
Replaces: libnatpmp0
-Suggests: minissdpd
+Suggests: libnatpmp-bin, minissdpd
Description: portable and fully compliant implementation of NAT-PMP
NAT-PMP is the direct concurrent to the UPnP IGD specification. It is
providing a way to do NAT traversal. It is part of the Bonjour protocol
@@ -32,8 +32,7 @@
Package: libnatpmp-dev
Architecture: any
Section: libdevel
-Depends: ${misc:Depends}, ${shlibs:Depends}, libnatpmp1 (= ${binary:Version}), python
-Replaces: libnatpmp0
+Depends: ${misc:Depends}, libnatpmp1 (= ${binary:Version}), libc6-dev | libc-dev
Description: portable and fully compliant implementation of NAT-PMP (dev files)
NAT-PMP is the direct concurrent to the UPnP IGD specification. It is
providing a way to do NAT traversal. It is part of the Bonjour protocol
@@ -47,4 +46,22 @@
blocking sockets and all calls of the API are asynchronous. It is therefore
very easy to integrate the NAT-PMP code to any event driven code.
.
- This package contains development files needed to build using libnatpmp
+ This package contains development files needed to build using libnatpmp.
+
+Package: libnatpmp-bin
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: portable and fully compliant implementation of NAT-PMP (utils)
+ NAT-PMP is the direct concurrent to the UPnP IGD specification. It is
+ providing a way to do NAT traversal. It is part of the Bonjour protocol
+ specifications. At the moment it is mainly supported by Apple software and
+ hardware. For a way to add NAT-PMP capabilities to your *BSD, Linux or
+ (Open)Solaris Router, you should have a look at MiniUPnPd which is
+ supporting NAT-PMP in addition to UPnP since December 2007 !
+ .
+ libnatpmp is an attempt to make a portable and fully compliant
+ implementation of the protocol NAT-PMP for the client side. It is based on non
+ blocking sockets and all calls of the API are asynchronous. It is therefore
+ very easy to integrate the NAT-PMP code to any event driven code.
+ .
+ This package contains natpmpc utility supplied with libnatpmp.
diff -urN a/libnatpmp-20110808/debian/libnatpmp-bin.install b/libnatpmp-20110808/debian/libnatpmp-bin.install
--- a/libnatpmp-20110808/debian/libnatpmp-bin.install 1970-01-01 03:00:00.0 +0300
+++ b/libnatpmp-20110808/debian/libnatpmp-bin.install 2011-09-04 17:16:44.0 +0400
@@ -0,0 +1 @@
+usr/bin
diff -urN a/libnatpmp-20110808/debian/libnatpmp-bin.manpages b/libnatpmp-20110808/debian/libnatpmp-bin.manpages
--- a/libnatpmp-20110808/debian/libnatpmp-bin.manpages 1970-01-01 03:00:00.0 +0300
+++ b/libnatpmp-20110808/debian/libnatpmp-bin.manpages 2011-09-04 16:41:21.0 +0400
@@ -0,0 +1 @@
+debian/man/natpmpc.1
diff -urN a/libnatpmp-20110808/debian/libnatpmp-dev.install b/libnatpmp-20110808/debian/libnatpmp-dev.install
--- a/libnatpmp-20110808/debian/libnatpmp-dev.install 1970-01-01 03:00:00.0 +0300
Bug#639084: NMU: Closes #639084: libnatpmp1: unversioned files in shlib package
On 09/05/2011 02:21 AM, Stanislav Maslovski wrote: Oops, pressed wrong key. Now attached. On Sun, Sep 04, 2011 at 10:18:11PM +0400, Stanislav Maslovski wrote: Hi again, Just in case, here goes the diff with all changes to the package. Hi Stanislav, thanks a lot for your work, but could you provide a git format-patch type of patch against what's in the Git instead? That'd be really helpful. FYI: Vcs-Browser: http://git.debian.org/?p=users/zigo/libnatpmp.git Vcs-Git: http://git.debian.org/git/users/zigo/libnatpmp.git Note that at the above URL, there's already the beginning of a new binary package that fixes #639084, which I did few days after it was reported (but that I had no time to test). If I remember well, it also has the removal of the manpage folder, since it was upstreamed after I sent it to the author (which is a good friend of mine). If you wish, I can also move the git repo. to colab-maint, so we can work together on the packaging. Cheers, Thomas -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#639084: NMU: Closes #639084: libnatpmp1: unversioned files in shlib package
Hi Thomas, On Mon, Sep 05, 2011 at 03:25:19AM +0800, Thomas Goirand wrote: On 09/05/2011 02:21 AM, Stanislav Maslovski wrote: Oops, pressed wrong key. Now attached. On Sun, Sep 04, 2011 at 10:18:11PM +0400, Stanislav Maslovski wrote: Hi again, Just in case, here goes the diff with all changes to the package. Hi Stanislav, thanks a lot for your work, but could you provide a git format-patch type of patch against what's in the Git instead? That'd be really helpful. Okay, I will look into it now. FYI: Vcs-Browser: http://git.debian.org/?p=users/zigo/libnatpmp.git Vcs-Git: http://git.debian.org/git/users/zigo/libnatpmp.git Note that at the above URL, there's already the beginning of a new binary package that fixes #639084, which I did few days after it was reported (but that I had no time to test). If I remember well, it also has the removal of the manpage folder, since it was upstreamed after I sent it to the author (which is a good friend of mine). If you wish, I can also move the git repo. to colab-maint, so we can work together on the packaging. This is ok with me, but I will have to get an account there first. -- Stanislav -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#639084: NMU: Closes #639084: libnatpmp1: unversioned files in shlib package
On Mon, Sep 05, 2011 at 03:25:19AM +0800, Thomas Goirand wrote:
thanks a lot for your work, but could you provide a git format-patch
type of patch against what's in the Git instead? That'd be really helpful.
Here goes a patch against your current git, please check. I applied my
changes on top of yours (with adaptations where necessary). Check my
changes regarding Breaks:/Replaces: in debian/control. I think the new
libnatpmp1 package does not need to specify any Breaks: or Replaces:
If in doubt, ask in debian-mentors.
--
Stanislav
diff --git a/debian/changelog b/debian/changelog
index 173c879..de814ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,26 @@
libnatpmp (20110808-3) unstable; urgency=low
+ [ Thomas Goirand ]
* Moves the natpmpc inside a new natpmp-utils package (Closes: #639084).
* Removes Debian specific natpmpc.1, since upstream integrated it in his
- upstream tarball.
+upstream tarball.
+
+ [ Stanislav Maslovski ]
+ * debian/control:
+- no need to build-depend/depend on python: python module is not built
+- corrected libnatpmp1 dependencies
+- corrected libnatpmp-dev dependencies
+- natpmp-utils replaces older libnatpmp binaries
+- linatpmp1 suggests natpmp-utils
+ * debian/rules:
+- do not move files by hand, use dh_install
+- install docs and changelogs only once
+ * new files:
+- natpmp-utils.install, natpmp-utils.manpages,
+ libnatpmp-dev.install, libnatpmp1.install
+ * removed files:
+- libnatpmp1.shibls (not needed; autogenerated by dh_makeshlibs),
+ manpages
-- Thomas Goirand z...@debian.org Wed, 24 Aug 2011 12:02:12 +0800
diff --git a/debian/control b/debian/control
index fcd66c2..a65ed48 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libnatpmp
Section: net
Priority: optional
Maintainer: Thomas Goirand z...@debian.org
-Build-Depends: debhelper (= 7), python
+Build-Depends: debhelper (= 7)
Standards-Version: 3.9.2
Vcs-Browser: http://git.debian.org/?p=users/zigo/libnatpmp.git
Vcs-Git: http://git.debian.org/git/users/zigo/libnatpmp.git
@@ -10,10 +10,8 @@ Homepage: http://miniupnp.free.fr/
Package: libnatpmp1
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, python
-Breaks: libnatpmp0
-Replaces: libnatpmp0
-Suggests: minissdpd
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Suggests: natpmp-utils, minissdpd
Description: portable and fully compliant implementation of NAT-PMP
NAT-PMP is the direct concurrent to the UPnP IGD specification. It is
providing a way to do NAT traversal. It is part of the Bonjour protocol
@@ -32,8 +30,7 @@ Description: portable and fully compliant implementation of NAT-PMP
Package: libnatpmp-dev
Architecture: any
Section: libdevel
-Depends: ${misc:Depends}, ${shlibs:Depends}, libnatpmp1 (= ${binary:Version}), python
-Replaces: libnatpmp0
+Depends: ${misc:Depends}, libnatpmp1 (= ${binary:Version}), libc6-dev | libc-dev
Description: portable and fully compliant implementation of NAT-PMP (dev files)
NAT-PMP is the direct concurrent to the UPnP IGD specification. It is
providing a way to do NAT traversal. It is part of the Bonjour protocol
@@ -47,12 +44,12 @@ Description: portable and fully compliant implementation of NAT-PMP (dev files)
blocking sockets and all calls of the API are asynchronous. It is therefore
very easy to integrate the NAT-PMP code to any event driven code.
.
- This package contains development files needed to build using libnatpmp
+ This package contains development files needed to build using libnatpmp.
Package: natpmp-utils
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: libnatpmp0 (= 20110808-2)
+Replaces: libnatpmp0, libnatpmp1 ( ${binary:Version})
Description: portable and fully compliant implementation of NAT-PMP (userland tool)
NAT-PMP is the direct concurrent to the UPnP IGD specification. It is
providing a way to do NAT traversal. It is part of the Bonjour protocol
diff --git a/debian/libnatpmp-dev.install b/debian/libnatpmp-dev.install
new file mode 100644
index 000..a204739
--- /dev/null
+++ b/debian/libnatpmp-dev.install
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/libnatpmp*.so
+usr/lib/libnatpmp*.a
diff --git a/debian/libnatpmp1.install b/debian/libnatpmp1.install
new file mode 100644
index 000..2e3efc4
--- /dev/null
+++ b/debian/libnatpmp1.install
@@ -0,0 +1 @@
+usr/lib/libnatpmp*.so.*
diff --git a/debian/libnatpmp1.shlibs b/debian/libnatpmp1.shlibs
deleted file mode 100644
index 94757ab..000
--- a/debian/libnatpmp1.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libnatpmp 1 libnatpmp1
diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644
index 25a3d1e..000
--- a/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-natpmpc.1
diff --git a/debian/natpmp-utils.install b/debian/natpmp-utils.install
new file mode 100644
index 000..e772481
--- /dev/null
+++ b/debian/natpmp-utils.install
@@ -0,0 +1 @@
+usr/bin
diff --git
Bug#639084: NMU: Closes #639084: libnatpmp1: unversioned files in shlib package
On 09/05/2011 06:16 AM, Stanislav Maslovski wrote:
On Mon, Sep 05, 2011 at 03:25:19AM +0800, Thomas Goirand wrote:
thanks a lot for your work, but could you provide a git format-patch
type of patch against what's in the Git instead? That'd be really helpful.
Here goes a patch against your current git, please check. I applied my
changes on top of yours (with adaptations where necessary). Check my
changes regarding Breaks:/Replaces: in debian/control. I think the new
libnatpmp1 package does not need to specify any Breaks: or Replaces:
If in doubt, ask in debian-mentors.
Hi,
Since libnatpmp1 is an update to libnatpmp0, I believe we need to
declare it, otherwise libnatpmp0 wont be replaced. I tried upgrading,
and unfortunately, I needed to apt-get install libnatpmp1, otherwise
apt would say libnatpmp0 will be kept back, so I guess that what I did
was wrong. Never the less, something has to be done about it, if we
don't want people to keep the obsolete libnatpmp0 on their system.
You've set libnatpmp-dev to depend on libc6-dev | libc-dev, I don't
think that's needed since this is a build-essential anyway.
Also, you did this:
-Replaces: libnatpmp0 (= 20110808-2)
+Replaces: libnatpmp0, libnatpmp1 ( ${binary:Version})
I think what I did was right, because after version 20110808-2, we don't
have the upgrade issue.
Also, why are you doing this?
- dh_installchangelogs Changelog.txt
+ dh_installchangelogs
I think it's cool to package upstream's Changelog.txt ... Or is it that
your patch is missing a debian/*.docs file?
Thomas
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#639084: NMU: Closes #639084: libnatpmp1: unversioned files in shlib package
On 09/05/2011 01:34 PM, Thomas Goirand wrote:
-Replaces: libnatpmp0 (= 20110808-2)
+Replaces: libnatpmp0, libnatpmp1 ( ${binary:Version})
I think what I did was right, because after version 20110808-2, we don't
have the upgrade issue.
Woops, wrote something silly. What we need IMO is:
Package: natpmp-utils
[...]
-Replaces: libnatpmp0 (= 20110808-2)
+Replaces: libnatpmp0, libnatpmp1 (= 20110808-2)
Thomas
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
