r33313 - in /desktop/experimental/gtksourceview3/debian: changelog control control.in gir1.2-gtksource-3.0.install libgtksourceview-3.0-0.install libgtksourceview-3.0-dev.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sun Mar 18 14:25:10 UTC 2012 

Author: biebl
Date: Sun Mar 18 14:25:08 2012
New Revision: 33313

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

Modified:
    desktop/experimental/gtksourceview3/debian/changelog
    desktop/experimental/gtksourceview3/debian/control
    desktop/experimental/gtksourceview3/debian/control.in
    desktop/experimental/gtksourceview3/debian/gir1.2-gtksource-3.0.install
    desktop/experimental/gtksourceview3/debian/libgtksourceview-3.0-0.install
    desktop/experimental/gtksourceview3/debian/libgtksourceview-3.0-dev.install
    desktop/experimental/gtksourceview3/debian/rules

Modified: desktop/experimental/gtksourceview3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtksourceview3/debian/changelog?rev=33313&op=diff
==============================================================================
--- desktop/experimental/gtksourceview3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtksourceview3/debian/changelog [utf-8] Sun Mar 18 14:25:08 2012
@@ -1,3 +1,9 @@
+gtksourceview3 (3.3.4-2) UNRELEASED; urgency=low
+
+  * Convert to multiarch.
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 18 Mar 2012 15:24:23 +0100
+
 gtksourceview3 (3.3.4-1) experimental; urgency=low
 
   * New upstream development release.

Modified: desktop/experimental/gtksourceview3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtksourceview3/debian/control?rev=33313&op=diff
==============================================================================
--- desktop/experimental/gtksourceview3/debian/control [utf-8] (original)
+++ desktop/experimental/gtksourceview3/debian/control [utf-8] Sun Mar 18 14:25:08 2012
@@ -9,8 +9,8 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Biebl <biebl at debian.org>
 Build-Depends: autotools-dev,
-               cdbs (>= 0.4.90),
-               debhelper (>= 8),
+               cdbs (>= 0.4.93),
+               debhelper (>= 8.1.3),
                gnome-pkg-tools (>= 0.7),
                libgtk-3-dev (>= 3.0.0),
                libatk1.0-dev (>= 1.32),
@@ -29,6 +29,8 @@
 
 Package: libgtksourceview-3.0-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libgtksourceview-3.0-common (>= ${gnome:Version}),
@@ -43,6 +45,7 @@
 
 Package: libgtksourceview-3.0-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: common files for the GTK+ syntax highlighting widget
  GtkSourceView is a text widget that extends the standard GTK+ 3.x text widget

Modified: desktop/experimental/gtksourceview3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtksourceview3/debian/control.in?rev=33313&op=diff
==============================================================================
--- desktop/experimental/gtksourceview3/debian/control.in [utf-8] (original)
+++ desktop/experimental/gtksourceview3/debian/control.in [utf-8] Sun Mar 18 14:25:08 2012
@@ -4,8 +4,8 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: autotools-dev,
-               cdbs (>= 0.4.90),
-               debhelper (>= 8),
+               cdbs (>= 0.4.93),
+               debhelper (>= 8.1.3),
                gnome-pkg-tools (>= 0.7),
                libgtk-3-dev (>= 3.0.0),
                libatk1.0-dev (>= 1.32),
@@ -24,6 +24,8 @@
 
 Package: libgtksourceview-3.0-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libgtksourceview-3.0-common (>= ${gnome:Version}),
@@ -38,6 +40,7 @@
 
 Package: libgtksourceview-3.0-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: common files for the GTK+ syntax highlighting widget
  GtkSourceView is a text widget that extends the standard GTK+ 3.x text widget

Modified: desktop/experimental/gtksourceview3/debian/gir1.2-gtksource-3.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtksourceview3/debian/gir1.2-gtksource-3.0.install?rev=33313&op=diff
==============================================================================
--- desktop/experimental/gtksourceview3/debian/gir1.2-gtksource-3.0.install [utf-8] (original)
+++ desktop/experimental/gtksourceview3/debian/gir1.2-gtksource-3.0.install [utf-8] Sun Mar 18 14:25:08 2012
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0/
+usr/lib/*/girepository-1.0 usr/lib/

Modified: desktop/experimental/gtksourceview3/debian/libgtksourceview-3.0-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtksourceview3/debian/libgtksourceview-3.0-0.install?rev=33313&op=diff
==============================================================================
--- desktop/experimental/gtksourceview3/debian/libgtksourceview-3.0-0.install [utf-8] (original)
+++ desktop/experimental/gtksourceview3/debian/libgtksourceview-3.0-0.install [utf-8] Sun Mar 18 14:25:08 2012
@@ -1,1 +1,1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

Modified: desktop/experimental/gtksourceview3/debian/libgtksourceview-3.0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtksourceview3/debian/libgtksourceview-3.0-dev.install?rev=33313&op=diff
==============================================================================
--- desktop/experimental/gtksourceview3/debian/libgtksourceview-3.0-dev.install [utf-8] (original)
+++ desktop/experimental/gtksourceview3/debian/libgtksourceview-3.0-dev.install [utf-8] Sun Mar 18 14:25:08 2012
@@ -1,6 +1,6 @@
 usr/include
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
 usr/share/gir-1.0
 usr/share/glade

Modified: desktop/experimental/gtksourceview3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtksourceview3/debian/rules?rev=33313&op=diff
==============================================================================
--- desktop/experimental/gtksourceview3/debian/rules [utf-8] (original)
+++ desktop/experimental/gtksourceview3/debian/rules [utf-8] Sun Mar 18 14:25:08 2012
@@ -10,8 +10,9 @@
 
 GNOME_MODULE = gtksourceview
 
-DEB_CONFIGURE_EXTRA_FLAGS +=	--enable-static		\
-				--enable-glade-catalog
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-static \
+                             --enable-glade-catalog \
+                             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 DEB_DH_MAKESHLIBS_ARGS += -V -- -c4

More information about the pkg-gnome-commits mailing list