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.000000000 +0400 +++ b/libnatpmp-20110808/debian/changelog 2011-09-04 21:08:14.000000000 +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.000000000 +0400 +++ b/libnatpmp-20110808/debian/control 2011-09-04 19:58:58.000000000 +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.000000000 +0300 +++ b/libnatpmp-20110808/debian/libnatpmp-bin.install 2011-09-04 17:16:44.000000000 +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.000000000 +0300 +++ b/libnatpmp-20110808/debian/libnatpmp-bin.manpages 2011-09-04 16:41:21.000000000 +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.000000000 +0300 +++ b/libnatpmp-20110808/debian/libnatpmp-dev.install 2011-09-04 17:10:49.000000000 +0400 @@ -0,0 +1,3 @@ +usr/include +usr/lib/libnatpmp*.so +usr/lib/libnatpmp*.a diff -urN a/libnatpmp-20110808/debian/libnatpmp1.install b/libnatpmp-20110808/debian/libnatpmp1.install --- a/libnatpmp-20110808/debian/libnatpmp1.install 1970-01-01 03:00:00.000000000 +0300 +++ b/libnatpmp-20110808/debian/libnatpmp1.install 2011-09-04 17:08:59.000000000 +0400 @@ -0,0 +1 @@ +usr/lib/libnatpmp*.so.* diff -urN a/libnatpmp-20110808/debian/libnatpmp1.shlibs b/libnatpmp-20110808/debian/libnatpmp1.shlibs --- a/libnatpmp-20110808/debian/libnatpmp1.shlibs 2011-09-04 21:04:32.000000000 +0400 +++ b/libnatpmp-20110808/debian/libnatpmp1.shlibs 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -libnatpmp 1 libnatpmp1 diff -urN a/libnatpmp-20110808/debian/manpages b/libnatpmp-20110808/debian/manpages --- a/libnatpmp-20110808/debian/manpages 2011-09-04 21:04:32.000000000 +0400 +++ b/libnatpmp-20110808/debian/manpages 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -debian/man/natpmpc.1 diff -urN a/libnatpmp-20110808/debian/rules b/libnatpmp-20110808/debian/rules --- a/libnatpmp-20110808/debian/rules 2011-09-04 21:04:32.000000000 +0400 +++ b/libnatpmp-20110808/debian/rules 2011-09-04 18:27:53.000000000 +0400 @@ -28,22 +28,17 @@ dh_testdir dh_testroot dh_prep - $(MAKE) install PREFIX=$(CURDIR)/debian/libnatpmp1 - # Move the development files in its corresponding separate package folder. - mkdir -p $(CURDIR)/debian/libnatpmp-dev/usr - mv $(CURDIR)/debian/libnatpmp1/usr/include $(CURDIR)/debian/libnatpmp-dev/usr - mkdir -p $(CURDIR)/debian/libnatpmp-dev/usr/lib - mv $(CURDIR)/debian/libnatpmp1/usr/lib/libnatpmp.so $(CURDIR)/debian/libnatpmp-dev/usr/lib - mv $(CURDIR)/debian/libnatpmp1/usr/lib/libnatpmp.a $(CURDIR)/debian/libnatpmp-dev/usr/lib + $(MAKE) install PREFIX=$(CURDIR)/debian/tmp binary-indep: build install binary-arch: build install dh_testdir dh_testroot - dh_installchangelogs Changelog.txt - dh_installdocs + dh_installdocs --link-doc=libnatpmp1 + dh_installchangelogs dh_installman + dh_install dh_strip dh_compress dh_makeshlibs
