r50033 - in /desktop/unstable/devhelp/debian: changelog control control.in devhelp-common.install devhelp.install libdevhelp-3-2.install libdevhelp-dev.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri Sep 2 21:10:17 UTC 2016 

Author: biebl
Date: Fri Sep  2 21:10:17 2016
New Revision: 50033

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50033
Log:
* Convert to multiarch.
* Move the gedit plugin from devhelp-common to devhelp as the path is now
  arch specific. Add the necessary Breaks/Replaces.

Modified:
    desktop/unstable/devhelp/debian/changelog
    desktop/unstable/devhelp/debian/control
    desktop/unstable/devhelp/debian/control.in
    desktop/unstable/devhelp/debian/devhelp-common.install
    desktop/unstable/devhelp/debian/devhelp.install
    desktop/unstable/devhelp/debian/libdevhelp-3-2.install
    desktop/unstable/devhelp/debian/libdevhelp-dev.install
    desktop/unstable/devhelp/debian/rules

Modified: desktop/unstable/devhelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/changelog?rev=50033&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/changelog	[utf-8] (original)
+++ desktop/unstable/devhelp/debian/changelog	[utf-8] Fri Sep  2 21:10:17 2016
@@ -3,6 +3,9 @@
   * New upstream release.
   * Install man page provided by upstream instead of our own, outdated own.
   * Convert from cdbs to dh.
+  * Convert to multiarch.
+  * Move the gedit plugin from devhelp-common to devhelp as the path is now
+    arch specific. Add the necessary Breaks/Replaces.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 02 Sep 2016 22:57:35 +0200
 

Modified: desktop/unstable/devhelp/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/control?rev=50033&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/control	[utf-8] (original)
+++ desktop/unstable/devhelp/debian/control	[utf-8] Fri Sep  2 21:10:17 2016
@@ -25,6 +25,7 @@
 Package: libdevhelp-3-2
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          devhelp-common (>= ${source:Version})
@@ -37,6 +38,7 @@
 Package: libdevhelp-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          libdevhelp-3-2 (= ${binary:Version}),
          libgtk-3-dev (>= 3.19.3),
@@ -66,6 +68,7 @@
 
 Package: devhelp-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${python3:Depends}
 Description: Common files for devhelp and its library
  Devhelp's primary goal is to be an API documentation browser for GNOME.

Modified: desktop/unstable/devhelp/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/control.in?rev=50033&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/control.in	[utf-8] (original)
+++ desktop/unstable/devhelp/debian/control.in	[utf-8] Fri Sep  2 21:10:17 2016
@@ -21,6 +21,7 @@
 Package: libdevhelp-3-2
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          devhelp-common (>= ${source:Version})
@@ -33,6 +34,7 @@
 Package: libdevhelp-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          libdevhelp-3-2 (= ${binary:Version}),
          libgtk-3-dev (>= 3.19.3),
@@ -50,6 +52,8 @@
 Recommends: libgtk-3-doc,
             libglib2.0-doc,
             libpango1.0-doc
+Breaks: devhelp-common (<< 3.21.91-1)
+Replaces: devhelp-common (<< 3.21.91-1)
 Description: GNOME developers help program
  Devhelp's primary goal is to be an API documentation browser for GNOME.
  It is able to scan for .devhelp files generated automatically for
@@ -62,6 +66,7 @@
 
 Package: devhelp-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${python3:Depends}
 Description: Common files for devhelp and its library
  Devhelp's primary goal is to be an API documentation browser for GNOME.

Modified: desktop/unstable/devhelp/debian/devhelp-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/devhelp-common.install?rev=50033&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/devhelp-common.install	[utf-8] (original)
+++ desktop/unstable/devhelp/debian/devhelp-common.install	[utf-8] Fri Sep  2 21:10:17 2016
@@ -1,5 +1,3 @@
-usr/lib/gedit/plugins/devhelp.plugin
-usr/lib/gedit/plugins/devhelp.py
 usr/share/devhelp
 usr/share/locale
 usr/share/icons/hicolor

Modified: desktop/unstable/devhelp/debian/devhelp.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/devhelp.install?rev=50033&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/devhelp.install	[utf-8] (original)
+++ desktop/unstable/devhelp/debian/devhelp.install	[utf-8] Fri Sep  2 21:10:17 2016
@@ -1,5 +1,7 @@
+usr/bin
+usr/lib/*/gedit/plugins/devhelp.plugin
+usr/lib/*/gedit/plugins/devhelp.py
 usr/share/appdata
 usr/share/applications
+usr/share/dbus-1/services
 usr/share/man
-usr/bin
-usr/share/dbus-1/services/

Modified: desktop/unstable/devhelp/debian/libdevhelp-3-2.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/libdevhelp-3-2.install?rev=50033&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/libdevhelp-3-2.install	[utf-8] (original)
+++ desktop/unstable/devhelp/debian/libdevhelp-3-2.install	[utf-8] Fri Sep  2 21:10:17 2016
@@ -1 +1 @@
-usr/lib/libdevhelp-3.so.*
+usr/lib/*/libdevhelp-3.so.*

Modified: desktop/unstable/devhelp/debian/libdevhelp-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/libdevhelp-dev.install?rev=50033&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/libdevhelp-dev.install	[utf-8] (original)
+++ desktop/unstable/devhelp/debian/libdevhelp-dev.install	[utf-8] Fri Sep  2 21:10:17 2016
@@ -1,3 +1,3 @@
-usr/lib/libdevhelp-3.so
-usr/lib/pkgconfig
+usr/lib/*/libdevhelp-3.so
+usr/lib/*/pkgconfig
 usr/include

Modified: desktop/unstable/devhelp/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/rules?rev=50033&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/rules	[utf-8] (original)
+++ desktop/unstable/devhelp/debian/rules	[utf-8] Fri Sep  2 21:10:17 2016
@@ -13,9 +13,6 @@
 override_dh_autoreconf:
 	NOCONFIGURE=true dh_autoreconf ./autogen.sh
 
-override_dh_auto_configure:
-	dh_auto_configure -- --libdir=\$${prefix}/lib
-
 override_dh_install:
 	dh_install --list-missing
 	install -d debian/devhelp/usr/share/doc/devhelp/tools/
@@ -30,4 +27,4 @@
 	dh_makeshlibs -V -- -c4
 
 override_dh_python3:
-	dh_python3 -pdevhelp-common /usr/lib/gedit/plugins
+	dh_python3 -pdevhelp /usr/lib/$(DEB_HOST_MULTIARCH)/gedit/plugins

More information about the pkg-gnome-commits mailing list