Package: libosinfo
Version: 0.2.12-2
Severity: normal
Tags: patch pending

Dear maintainer,

I've prepared an NMU for libosinfo (versioned as 0.2.12-2.1). The diff
is attached to this message.

My git repository is hosted at 
https://anonscm.debian.org/cgit/users/bigon/libosinfo.git/

Regards.
diff -Nru libosinfo-0.2.12/debian/changelog libosinfo-0.2.12/debian/changelog
--- libosinfo-0.2.12/debian/changelog   2015-10-14 11:43:32.000000000 +0200
+++ libosinfo-0.2.12/debian/changelog   2016-05-22 14:33:59.000000000 +0200
@@ -1,3 +1,18 @@
+libosinfo (0.2.12-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control: Update the Homepage URL (Closes: #824988)
+  * debian/control: Update the Vcs-* URL's to please lintian
+  * debian/control: Bump Standards-Version to 3.9.8 (no further changes)
+  * debian/rules: Use the gir sequence instead of overriding dh_makeshlibs
+  * Drop libosinfo-1.0-0-dbg package and rely on -dbgsym ones
+  * Remove debian/libosinfo-bin.osinfo.udev in the clean target
+  * Bump debhelper compatibility to 9 and multiarchify the library packages.
+    Thanks to Matthias Klose <[email protected]> (Closes: #812921)
+  * debian/libosinfo-bin.install: Install the manpages
+
+ -- Laurent Bigonville <[email protected]>  Sun, 22 May 2016 14:33:56 +0200
+
 libosinfo (0.2.12-2) unstable; urgency=medium
 
   * Upload to unstable (Closes: #801684)
diff -Nru libosinfo-0.2.12/debian/compat libosinfo-0.2.12/debian/compat
--- libosinfo-0.2.12/debian/compat      2013-10-16 13:17:32.000000000 +0200
+++ libosinfo-0.2.12/debian/compat      2016-05-22 14:32:32.000000000 +0200
@@ -1 +1 @@
-8
+9
diff -Nru libosinfo-0.2.12/debian/control libosinfo-0.2.12/debian/control
--- libosinfo-0.2.12/debian/control     2015-10-14 11:39:35.000000000 +0200
+++ libosinfo-0.2.12/debian/control     2016-05-22 14:32:53.000000000 +0200
@@ -7,7 +7,7 @@
  autotools-dev,
  libtool-bin,
  check,
- debhelper (>= 8.0.0),
+ debhelper (>= 9.20160114~),
  gobject-introspection,
  gnome-common,
  gtk-doc-tools,
@@ -19,13 +19,15 @@
  libxml2-utils,
  libxslt-dev,
  valac (>= 0.20)
-Standards-Version: 3.9.5
-Homepage: https://fedorahosted.org/libosinfo/
-Vcs-Git: git://git.debian.org/git/pkg-libvirt/libosinfo.git
-Vcs-Browser: http://git.debian.org/?p=pkg-libvirt/libosinfo.git
+Standards-Version: 3.9.8
+Homepage: https://libosinfo.org/
+Vcs-Git: https://anonscm.debian.org/git/pkg-libvirt/libosinfo.git
+Vcs-Browser: https://anonscm.debian.org/?p=pkg-libvirt/libosinfo.git
 
 Package: libosinfo-1.0-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, pciutils, usbutils
 Description: Library for managing information about operating systems and 
hypervisors
  libosinfo is a GObject based library API for managing information about
@@ -54,22 +56,9 @@
  .
  This package contains the runtime files.
 
-Package: libosinfo-1.0-0-dbg
-Architecture: any
-Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libosinfo-1.0-0 (=${binary:Version})
-Description: libosinfo debugging information
- libosinfo is a GObject based library API for managing information about
- operating systems, hypervisors and the (virtual) hardware devices they
- can support. It includes a database containing device metadata and
- provides APIs to match/identify optimal devices for deploying an
- operating system on a hypervisor.
- .
- This package contains the debugging symbols.
-
 Package: libosinfo-1.0-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends}, libosinfo-1.0-0 (=${binary:Version}),
  gir1.2-libosinfo-1.0 (=${binary:Version})
@@ -84,6 +73,7 @@
 
 Package: gir1.2-libosinfo-1.0
 Architecture: any
+Multi-Arch: same
 Section: introspection
 Depends: ${gir:Depends},
          ${shlibs:Depends},
diff -Nru libosinfo-0.2.12/debian/gir1.2-libosinfo-1.0.install 
libosinfo-0.2.12/debian/gir1.2-libosinfo-1.0.install
--- libosinfo-0.2.12/debian/gir1.2-libosinfo-1.0.install        2013-10-16 
13:17:32.000000000 +0200
+++ libosinfo-0.2.12/debian/gir1.2-libosinfo-1.0.install        2016-05-22 
14:32:32.000000000 +0200
@@ -1 +1 @@
-usr/lib/girepository-1.0
+usr/lib/*/girepository-1.0
diff -Nru libosinfo-0.2.12/debian/libosinfo-1.0-0.install 
libosinfo-0.2.12/debian/libosinfo-1.0-0.install
--- libosinfo-0.2.12/debian/libosinfo-1.0-0.install     2013-10-16 
13:17:32.000000000 +0200
+++ libosinfo-0.2.12/debian/libosinfo-1.0-0.install     2016-05-22 
14:32:32.000000000 +0200
@@ -1,2 +1,2 @@
-/usr/lib/libosinfo-*.so.*
+/usr/lib/*/libosinfo-*.so.*
 /usr/share/libosinfo
diff -Nru libosinfo-0.2.12/debian/libosinfo-1.0-dev.install 
libosinfo-0.2.12/debian/libosinfo-1.0-dev.install
--- libosinfo-0.2.12/debian/libosinfo-1.0-dev.install   2013-10-16 
13:17:32.000000000 +0200
+++ libosinfo-0.2.12/debian/libosinfo-1.0-dev.install   2016-05-22 
14:32:32.000000000 +0200
@@ -1,5 +1,5 @@
 /usr/include/libosinfo-1.0/
-/usr/lib/pkgconfig/libosinfo-1.0.pc
-/usr/lib/libosinfo-1.0.so
+/usr/lib/*/pkgconfig/libosinfo-1.0.pc
+/usr/lib/*/libosinfo-1.0.so
 /usr/share/gir-1.0/Libosinfo-1.0.gir
 /usr/share/vala/vapi/libosinfo-1.0.vapi
diff -Nru libosinfo-0.2.12/debian/libosinfo-bin.install 
libosinfo-0.2.12/debian/libosinfo-bin.install
--- libosinfo-0.2.12/debian/libosinfo-bin.install       2013-10-16 
13:17:32.000000000 +0200
+++ libosinfo-0.2.12/debian/libosinfo-bin.install       2016-05-22 
14:32:32.000000000 +0200
@@ -1 +1,2 @@
 /usr/bin/
+usr/share/man/man1/
diff -Nru libosinfo-0.2.12/debian/rules libosinfo-0.2.12/debian/rules
--- libosinfo-0.2.12/debian/rules       2015-10-14 11:35:36.000000000 +0200
+++ libosinfo-0.2.12/debian/rules       2016-05-22 14:32:53.000000000 +0200
@@ -19,7 +19,7 @@
 include /usr/share/dpkg/default.mk
 
 %:
-       dh $@
+       dh $@ --with gir
 
 override_dh_auto_configure:
        ./autogen.sh
@@ -36,12 +36,9 @@
        dh_installudev -plibosinfo-bin --name osinfo --priority 95
 
 override_dh_strip:
-       dh_strip -plibosinfo-1.0-0 --dbg-package=libosinfo-1.0-0-dbg
-       dh_strip -plibosinfo-bin --dbg-package=libosinfo-1.0-0-dbg
-
-override_dh_makeshlibs:
-       dh_makeshlibs
-       dh_girepository
+       dh_strip -plibosinfo-1.0-0 --dbgsym-migration='libosinfo-1.0-0-dbg (<< 
0.2.12-2.1~)'
+       dh_strip -plibosinfo-bin --dbgsym-migration='libosinfo-1.0-0-dbg (<< 
0.2.12-2.1~)'
 
 override_dh_auto_clean:
+       rm -f debian/libosinfo-bin.osinfo.udev
        [ ! -f Makefile ] || dh_auto_clean

Reply via email to