Hello, I did an update of the patch for the 5.1.118-1~dfsg-2 version

do you mind if I do an NMU with the attached patch targetting experimental ?

- multiarch
- no more static and .la files
- modernize the rules file

Cheers

Frederic
From 83c45f71c2c876c5641e495c3da141236fc94485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <pi...@debian.org>
Date: Thu, 29 Jan 2015 13:27:10 +0100
Subject: [PATCH] multiarch and more

---
 debian/changelog                    | 10 ++++++++++
 debian/control                      |  4 ++++
 debian/copyright                    | 40 ++++++++++++++++++-------------------
 debian/libpgm-5.1-0.install         |  2 +-
 debian/libpgm-dev.install           |  6 ++----
 debian/patches/hurd-ftbfs-fix.patch |  1 +
 debian/rules                        | 22 ++++++--------------
 7 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3299cec..d2ebc61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libpgm (5.1.118-1~dfsg-3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * multiarch
+  * do not install the static library
+  * remove the .la file
+  * modernize the rules file
+
+ -- Picca Frédéric-Emmanuel <pi...@debian.org>  Thu, 29 Jan 2015 10:02:48 +0200
+
 libpgm (5.1.118-1~dfsg-2) unstable; urgency=medium
 
   * Correct libpgm-5.1.so broken symlink (closes: #775367).
diff --git a/debian/control b/debian/control
index bd7e2b9..bb34f23 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,8 @@ Homepage: http://code.google.com/p/openpgm/
 Package: libpgm-5.1-0
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: OpenPGM shared library
  OpenPGM is an open source implementation of the Pragmatic General Multicast
@@ -29,6 +31,7 @@ Package: libpgm-dbg
 Architecture: any
 Section: debug
 Priority: extra
+Multi-Arch: same
 Depends: libpgm-5.1-0 (= ${binary:Version}), ${misc:Depends}
 Description: OpenPGM debugging symbols
  OpenPGM is an open source implementation of the Pragmatic General Multicast
@@ -46,6 +49,7 @@ Description: OpenPGM debugging symbols
 Package: libpgm-dev
 Architecture: any
 Section: libdevel
+Multi-Arch: same
 Depends: libpgm-5.1-0 (= ${binary:Version}), ${misc:Depends}
 Conflicts: libnetpbm9-dev
 Description: OpenPGM development files
diff --git a/debian/copyright b/debian/copyright
index a77df65..6dcf6e9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: OpenPGM
 Upstream-Contact: Steven McCoy <steven.mc...@miru.hk>
 Source: http://code.google.com/p/openpgm/
@@ -11,25 +11,6 @@ Files: *
 Copyright: 2006-2011 Miru Limited.
 License: LGPL-2.1
 
-License: LGPL-2.1
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the full text of the GNU Lesser General Public
- License version 2.1 can be found in the file
- `/usr/share/common-licenses/LGPL-2.1'.
-
 Files: openpgm/pgm/md5.c*
 Copyright: 1995, 1996, 2001, 2003 Free Software Foundation, Inc.
 License: LGPL-2+
@@ -94,3 +75,22 @@ License: ISC
  PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
  ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  SOFTWARE.
+
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
diff --git a/debian/libpgm-5.1-0.install b/debian/libpgm-5.1-0.install
index d0dbfd1..3ddde58 100644
--- a/debian/libpgm-5.1-0.install
+++ b/debian/libpgm-5.1-0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libpgm-dev.install b/debian/libpgm-dev.install
index 353d3b2..43e3a99 100644
--- a/debian/libpgm-dev.install
+++ b/debian/libpgm-dev.install
@@ -1,5 +1,3 @@
 usr/include/pgm-*/pgm/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/lib/*.la
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/patches/hurd-ftbfs-fix.patch b/debian/patches/hurd-ftbfs-fix.patch
index 6bc8814..70ddf36 100644
--- a/debian/patches/hurd-ftbfs-fix.patch
+++ b/debian/patches/hurd-ftbfs-fix.patch
@@ -1,3 +1,4 @@
+Description: Hurd ftbfs fix
 --- a/openpgm/pgm/configure.ac
 +++ b/openpgm/pgm/configure.ac
 @@ -197,7 +197,11 @@ AC_MSG_CHECKING([for struct group_req.gr
diff --git a/debian/rules b/debian/rules
index 5bfbdc6..38677a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,13 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
-	dh $@ --sourcedirectory=openpgm/pgm --with autoreconf
+	dh $@ --sourcedirectory=openpgm/pgm --with autoreconf --dbg-package=libpgm-dbg
 
 override_dh_auto_configure:
-	cd openpgm/pgm && \
-		./configure --prefix=/usr
+	dh_auto_configure -- --disable-static
 
 override_dh_clean:
 	dh_clean
@@ -16,17 +17,6 @@ override_dh_clean:
 	rm -rf openpgm/pgm/autom4te.cache
 
 override_dh_install:
-	dh_install --fail-missing
-	find debian/libpgm-dev/usr/lib  -name "*.la" -exec \
-		sed -i -e "s,^dependency_libs=.*,dependency_libs=''," {} +
+	dh_install --fail-missing -Xlibpgm.la
 	dh_link -plibpgm-dev \
-		/usr/lib/libpgm-5.1.so.0 /usr/lib/libpgm-5.1.so
-
-override_dh_strip:
-	dh_strip --dbg-package=libpgm-dbg
-
-override_dh_auto_build:
-	cd openpgm/pgm && $(MAKE)
-
-.PHONY: override_dh_auto_configure override_dh_install \
-	override_dh_strip override_dh_auto_build
+		/usr/lib/$(DEB_HOST_MULTIARCH)/libpgm-5.1.so.0 /usr/lib/$(DEB_HOST_MULTIARCH)/libpgm-5.1.so
-- 
2.1.4

Reply via email to