r49110 - in /desktop/unstable/eog/debian: changelog control.in eog-dev.install eog.install rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jun 22 19:39:30 2016
New Revision: 49110

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49110
Log:
Convert to multiarch. Mark eog-dev as Architecture: any as the package now
ships files in architecture specific paths. Add versioned Breaks against
eog-plugins which needs to be updated to use multiarch paths as well.

Modified:
    desktop/unstable/eog/debian/changelog
    desktop/unstable/eog/debian/control.in
    desktop/unstable/eog/debian/eog-dev.install
    desktop/unstable/eog/debian/eog.install
    desktop/unstable/eog/debian/rules

Modified: desktop/unstable/eog/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eog/debian/changelog?rev=49110&op=diff
==============================================================================
--- desktop/unstable/eog/debian/changelog	[utf-8] (original)
+++ desktop/unstable/eog/debian/changelog	[utf-8] Wed Jun 22 19:39:30 2016
@@ -3,6 +3,9 @@
   * New upstream release.
   * Convert from cdbs to dh.
   * Bump debhelper compatibility level to 9.
+  * Convert to multiarch. Mark eog-dev as Architecture: any as the package now
+    ships files in architecture specific paths. Add versioned Breaks against
+    eog-plugins which needs to be updated to use multiarch paths as well.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 22 Jun 2016 20:44:23 +0200
 

Modified: desktop/unstable/eog/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eog/debian/control.in?rev=49110&op=diff
==============================================================================
--- desktop/unstable/eog/debian/control.in	[utf-8] (original)
+++ desktop/unstable/eog/debian/control.in	[utf-8] Wed Jun 22 19:39:30 2016
@@ -43,6 +43,7 @@
 Recommends: librsvg2-common,
             yelp
 Suggests: eog-plugins
+Breaks: eog-plugins (<< 3.16.4-2~)
 Description: Eye of GNOME graphics viewer program
  eog or the Eye of GNOME is a simple graphics viewer for the GNOME
  desktop which uses the gdk-pixbuf library.  It can deal with large
@@ -50,7 +51,7 @@
  simplicity and standards compliance.
 
 Package: eog-dev
-Architecture: all
+Architecture: any
 Depends: eog (>= ${source:Version}),
          libgtk-3-dev,
          ${misc:Depends}

Modified: desktop/unstable/eog/debian/eog-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eog/debian/eog-dev.install?rev=49110&op=diff
==============================================================================
--- desktop/unstable/eog/debian/eog-dev.install	[utf-8] (original)
+++ desktop/unstable/eog/debian/eog-dev.install	[utf-8] Wed Jun 22 19:39:30 2016
@@ -1,4 +1,4 @@
-usr/lib/pkgconfig
+usr/lib/*/pkgconfig
 usr/include
 usr/share/eog/gir-1.0
 usr/share/gtk-doc

Modified: desktop/unstable/eog/debian/eog.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eog/debian/eog.install?rev=49110&op=diff
==============================================================================
--- desktop/unstable/eog/debian/eog.install	[utf-8] (original)
+++ desktop/unstable/eog/debian/eog.install	[utf-8] Wed Jun 22 19:39:30 2016
@@ -7,7 +7,7 @@
 usr/share/icons
 usr/share/locale
 usr/share/applications
-usr/lib/eog/*.so
-usr/lib/eog/plugins/*plugin
-usr/lib/eog/plugins/*.so
-usr/lib/eog/girepository-1.0
+usr/lib/*/eog/*.so
+usr/lib/*/eog/plugins/*plugin
+usr/lib/*/eog/plugins/*.so
+usr/lib/*/eog/girepository-1.0

Modified: desktop/unstable/eog/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eog/debian/rules?rev=49110&op=diff
==============================================================================
--- desktop/unstable/eog/debian/rules	[utf-8] (original)
+++ desktop/unstable/eog/debian/rules	[utf-8] Wed Jun 22 19:39:30 2016
@@ -8,7 +8,7 @@
 	dh $@ --with gir,gnome
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-gtk-doc --libdir=/usr/lib
+	dh_auto_configure -- --enable-gtk-doc
 
 override_dh_install:
 	dh_install --list-missing
@@ -16,5 +16,4 @@
 	rm -rf `pwd`/debian/eog/usr/share/eog/gir-1.0/
 
 override_dh_girepository:
-	dh_girepository -ldebian/tmp/usr/share/eog/gir-1.0/ /usr/lib/eog/girepository-1.0/
-
+	dh_girepository -ldebian/tmp/usr/share/eog/gir-1.0/ /usr/lib/$(DEB_HOST_MULTIARCH)/eog/girepository-1.0/