[Pkg-gtkpod-devel] Bug#842474: libimobiledevice-dev is wrongly marked Multi-Arch: foreign

[Manuel A. Fernandez Montecelo]

Attaching final debdiff, I ended up not removing the previous
maintainer, as that would leave only a mailing list as contact, and it's
forbidden by policy 3.3.

-- 
Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>

-------------- next part --------------
diff -Nru libimobiledevice-1.2.0+dfsg/debian/changelog libimobiledevice-1.2.0+dfsg/debian/changelog
--- libimobiledevice-1.2.0+dfsg/debian/changelog	2017-01-03 01:32:36.000000000 +0100
+++ libimobiledevice-1.2.0+dfsg/debian/changelog	2017-11-02 22:55:29.000000000 +0100
@@ -1,3 +1,18 @@
+libimobiledevice (1.2.0+dfsg-3.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Switch to debhelper compat level 10
+    - autoreconf is invoked by default, do not build-depend on
+      dh-autoreconf and do not invoke dh with that argument
+    - Use automatic dbgsym packages, drop -dbg
+    - Remove DM-Upload-Allowed field in d/control
+
+  [ Helmut Grohne ]
+  * Remove wrong Multi-Arch: foreign from libimobiledevice-dev
+    (Closes: #842474)
+
+ -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Thu, 02 Nov 2017 22:55:29 +0100
+
 libimobiledevice (1.2.0+dfsg-3.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru libimobiledevice-1.2.0+dfsg/debian/compat libimobiledevice-1.2.0+dfsg/debian/compat
--- libimobiledevice-1.2.0+dfsg/debian/compat	2016-06-02 18:55:15.000000000 +0200
+++ libimobiledevice-1.2.0+dfsg/debian/compat	2017-11-02 22:55:29.000000000 +0100
@@ -1 +1 @@
-9
+10
diff -Nru libimobiledevice-1.2.0+dfsg/debian/control libimobiledevice-1.2.0+dfsg/debian/control
--- libimobiledevice-1.2.0+dfsg/debian/control	2016-06-02 18:55:15.000000000 +0200
+++ libimobiledevice-1.2.0+dfsg/debian/control	2017-11-02 22:55:29.000000000 +0100
@@ -4,7 +4,7 @@
 Maintainer: gtkpod Maintainers <pkg-gtkpod-devel at lists.alioth.debian.org>
 Uploaders: Julien Lavergne <julien.lavergne at gmail.com>
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10~),
                dh-python,
                libgnutls28-dev,
                libgcrypt20-dev,
@@ -18,12 +18,10 @@
                libtasn1-6-dev (>= 1.1),
                libreadline-dev,
                python-plist (>= 1.8-2~),
-               dh-autoreconf
 X-Python-Version: >= 2.3
 Homepage: http://libimobiledevice.org/
 Vcs-Git: git://git.debian.org/git/pkg-gtkpod/packages/libimobiledevice.git
 Vcs-Browser: http://git.debian.org/?p=pkg-gtkpod/packages/libimobiledevice.git
-DM-Upload-Allowed: yes
 
 Package: libimobiledevice6
 Architecture: any
@@ -42,7 +40,6 @@
 
 Package: libimobiledevice-dev
 Architecture: any
-Multi-Arch: foreign
 Section: libdevel
 Depends: libimobiledevice6 (= ${binary:Version}),
          ${misc:Depends},
@@ -59,25 +56,6 @@
  .
  This package contains the development files.
 
-Package: libimobiledevice6-dbg
-Architecture: any
-Multi-Arch: same
-Section: debug
-Priority: extra
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libimobiledevice6 (= ${binary:Version}),
-         ${misc:Depends}
-Conflicts: libimobiledevice3-dbg, libimobiledevice2-dbg,
-  libimobiledevice1-dbg, libimobiledevice0-dbg
-Replaces: libimobiledevice3-dbg, libimobiledevice2-dbg,
-  libimobiledevice1-dbg, libimobiledevice0-dbg
-Description: Library for communicating with iPhone and iPod Touch devices
- libimobiledevice is a library that talks the native Apple USB protocols that
- the iPhone and iPod Touch use. Unlike other projects, libimobiledevice does
- not depend on using any existing libraries from Apple.
- .
- This package contains the debugging symbols.
-
 Package: python-imobiledevice
 Section: python
 Architecture: any
diff -Nru libimobiledevice-1.2.0+dfsg/debian/rules libimobiledevice-1.2.0+dfsg/debian/rules
--- libimobiledevice-1.2.0+dfsg/debian/rules	2016-06-02 18:55:15.000000000 +0200
+++ libimobiledevice-1.2.0+dfsg/debian/rules	2017-11-02 22:55:29.000000000 +0100
@@ -10,10 +10,10 @@
 		--disable-silent-rules
 
 %:
-	dh $@ --with=python2,autoreconf
+	dh $@ --with=python2 --dbgsym-migration=libimobiledevice6-dbg
 
 override_dh_auto_configure:
-	dh_auto_configure -- 	$(configure_flags)
+	dh_auto_configure -- $(configure_flags)
 
 override_dh_install:
 	#Remove .la files.
@@ -27,9 +27,6 @@
 	rm -f $(CURDIR)/debian/tmp/usr/share/man/man1/*.1
 	dh_install --fail-missing
 
-override_dh_strip:
-	dh_strip --dbg-package=libimobiledevice6-dbg
-
 override_dh_python2:
 	# Only build for the current version of python, not all supported.
 	dh_python2 --no-guessing-versions