r44649 - in /desktop/unstable/gnome-dictionary/debian: changelog control control.in gir1.2-gdict-1.0.install libgdict-1.0-8.install libgdict-1.0-dev.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sun May 24 19:21:24 UTC 2015 

Author: biebl
Date: Sun May 24 19:21:24 2015
New Revision: 44649

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44649
Log:
Convert to multiarch.

Modified:
    desktop/unstable/gnome-dictionary/debian/changelog
    desktop/unstable/gnome-dictionary/debian/control
    desktop/unstable/gnome-dictionary/debian/control.in
    desktop/unstable/gnome-dictionary/debian/gir1.2-gdict-1.0.install
    desktop/unstable/gnome-dictionary/debian/libgdict-1.0-8.install
    desktop/unstable/gnome-dictionary/debian/libgdict-1.0-dev.install
    desktop/unstable/gnome-dictionary/debian/rules

Modified: desktop/unstable/gnome-dictionary/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/changelog?rev=44649&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/changelog	[utf-8] Sun May 24 19:21:24 2015
@@ -7,6 +7,7 @@
   * Update debian/gnome-dictionary.install, the UI resources are now builtin
     and loadeded via GResource.
   * Enable GObject introspection support.
+  * Convert to multiarch.
 
  -- Michael Biebl <biebl at debian.org>  Sun, 24 May 2015 20:43:17 +0200
 

Modified: desktop/unstable/gnome-dictionary/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/control?rev=44649&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/control	[utf-8] Sun May 24 19:21:24 2015
@@ -7,8 +7,8 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93),
+               debhelper (>= 9),
                gnome-pkg-tools (>= 0.10),
                autotools-dev,
                intltool (>= 0.40.0),
@@ -26,8 +26,10 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-dictionary
 
 Package: libgdict-1.0-8
+Section: libs
 Architecture: any
-Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgdict-common
@@ -36,8 +38,9 @@
  utility, and other applications providing similar functionality.
 
 Package: libgdict-common
+Section: libs
 Architecture: all
-Section: libs
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: GNOME Dictionary base library - common files
  This package contains the translation files and dictionary source
@@ -47,6 +50,7 @@
 Package: libgdict-1.0-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          libgdict-1.0-8 (= ${binary:Version}),
          gir1.2-gdict-1.0 (= ${binary:Version}),
@@ -60,6 +64,7 @@
 Package: gir1.2-gdict-1.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${misc:Depends},
          ${shlibs:Depends}

Modified: desktop/unstable/gnome-dictionary/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/control.in?rev=44649&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/control.in	[utf-8] Sun May 24 19:21:24 2015
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
-               debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93),
+               debhelper (>= 9),
                gnome-pkg-tools (>= 0.10),
                autotools-dev,
                intltool (>= 0.40.0),
@@ -22,8 +22,10 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-dictionary
 
 Package: libgdict-1.0-8
+Section: libs
 Architecture: any
-Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgdict-common
@@ -32,8 +34,9 @@
  utility, and other applications providing similar functionality.
 
 Package: libgdict-common
+Section: libs
 Architecture: all
-Section: libs
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: GNOME Dictionary base library - common files
  This package contains the translation files and dictionary source
@@ -43,6 +46,7 @@
 Package: libgdict-1.0-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          libgdict-1.0-8 (= ${binary:Version}),
          gir1.2-gdict-1.0 (= ${binary:Version}),
@@ -56,6 +60,7 @@
 Package: gir1.2-gdict-1.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${misc:Depends},
          ${shlibs:Depends}

Modified: desktop/unstable/gnome-dictionary/debian/gir1.2-gdict-1.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/gir1.2-gdict-1.0.install?rev=44649&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/gir1.2-gdict-1.0.install	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/gir1.2-gdict-1.0.install	[utf-8] Sun May 24 19:21:24 2015
@@ -1 +1 @@
-usr/lib/girepository-1.0/
+usr/lib/*/girepository-1.0/

Modified: desktop/unstable/gnome-dictionary/debian/libgdict-1.0-8.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/libgdict-1.0-8.install?rev=44649&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/libgdict-1.0-8.install	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/libgdict-1.0-8.install	[utf-8] Sun May 24 19:21:24 2015
@@ -1 +1 @@
-usr/lib/libgdict*.so.*
+usr/lib/*/libgdict*.so.*

Modified: desktop/unstable/gnome-dictionary/debian/libgdict-1.0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/libgdict-1.0-dev.install?rev=44649&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/libgdict-1.0-dev.install	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/libgdict-1.0-dev.install	[utf-8] Sun May 24 19:21:24 2015
@@ -1,5 +1,5 @@
 usr/include
-usr/lib/*.so
-usr/lib/pkgconfig
+usr/lib/*/*.so
+usr/lib/*/pkgconfig
 usr/share/gtk-doc
 usr/share/gir-1.0

Modified: desktop/unstable/gnome-dictionary/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-dictionary/debian/rules?rev=44649&op=diff
==============================================================================
--- desktop/unstable/gnome-dictionary/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-dictionary/debian/rules	[utf-8] Sun May 24 19:21:24 2015
@@ -7,7 +7,8 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-ipv6 \
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+                             --enable-ipv6 \
                              --enable-gtk-doc
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed

More information about the pkg-gnome-commits mailing list