r28681 - in /desktop/unstable/atk1.0/debian: changelog control control.in gir1.2-atk-1.0.install libatk1.0-0.install libatk1.0-dev.install libatk1.0-udeb.install rules

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Mon Jun 27 14:14:10 UTC 2011


Author: bigon
Date: Mon Jun 27 14:14:09 2011
New Revision: 28681

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28681
Log:
Transition to multiarch policy (Closes: #631691)

Modified:
    desktop/unstable/atk1.0/debian/changelog
    desktop/unstable/atk1.0/debian/control
    desktop/unstable/atk1.0/debian/control.in
    desktop/unstable/atk1.0/debian/gir1.2-atk-1.0.install
    desktop/unstable/atk1.0/debian/libatk1.0-0.install
    desktop/unstable/atk1.0/debian/libatk1.0-dev.install
    desktop/unstable/atk1.0/debian/libatk1.0-udeb.install
    desktop/unstable/atk1.0/debian/rules

Modified: desktop/unstable/atk1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/atk1.0/debian/changelog?rev=28681&op=diff
==============================================================================
--- desktop/unstable/atk1.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/atk1.0/debian/changelog [utf-8] Mon Jun 27 14:14:09 2011
@@ -1,3 +1,9 @@
+atk1.0 (2.0.1-2) UNRELEASED; urgency=low
+
+  * Transition to multiarch policy (Closes: #631691)
+
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 27 Jun 2011 15:54:03 +0200
+
 atk1.0 (2.0.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/unstable/atk1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/atk1.0/debian/control?rev=28681&op=diff
==============================================================================
--- desktop/unstable/atk1.0/debian/control [utf-8] (original)
+++ desktop/unstable/atk1.0/debian/control [utf-8] Mon Jun 27 14:14:09 2011
@@ -10,11 +10,11 @@
 Uploaders: David Weinehall <tao at debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Mario Lang <mlang at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/atk1.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/atk1.0
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.3~),
                pkg-config,
                libglib2.0-dev (>= 2.0.0),
                gnome-pkg-tools (>= 0.10),
-               cdbs (>= 0.4.90),
+               cdbs (>= 0.4.93~),
                gtk-doc-tools (>= 1.13),
                docbook-xml,
                autotools-dev,
@@ -30,6 +30,8 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libatk1.0-data (= ${source:Version})
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: ATK accessibility toolkit
  ATK is a toolkit providing accessibility interfaces for applications or
  other toolkits. By implementing these interfaces, those other toolkits or
@@ -58,6 +60,7 @@
 Section: misc
 Architecture: all
 Depends: ${misc:Depends}
+Multi-Arch: foreign
 Description: Common files for the ATK accessibility toolkit
  ATK is a toolkit providing accessibility interfaces for applications or
  other toolkits. By implementing these interfaces, those other toolkits or
@@ -95,6 +98,7 @@
 Depends: ${misc:Depends},
          libatk1.0-0 (= ${binary:Version})
 Replaces: libatk1.0-0 (<< 1.11.4-3)
+Multi-Arch: same
 Description: ATK libraries and debugging symbols
  ATK is a toolkit providing accessibility interfaces for applications or
  other toolkits. By implementing these interfaces, those other toolkits or

Modified: desktop/unstable/atk1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/atk1.0/debian/control.in?rev=28681&op=diff
==============================================================================
--- desktop/unstable/atk1.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/atk1.0/debian/control.in [utf-8] Mon Jun 27 14:14:09 2011
@@ -5,11 +5,11 @@
 Uploaders: @GNOME_TEAM@
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/atk1.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/atk1.0
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.3~),
                pkg-config,
                libglib2.0-dev (>= 2.0.0),
                gnome-pkg-tools (>= 0.10),
-               cdbs (>= 0.4.90),
+               cdbs (>= 0.4.93~),
                gtk-doc-tools (>= 1.13),
                docbook-xml,
                autotools-dev,
@@ -25,6 +25,8 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libatk1.0-data (= ${source:Version})
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: ATK accessibility toolkit
  ATK is a toolkit providing accessibility interfaces for applications or
  other toolkits. By implementing these interfaces, those other toolkits or
@@ -53,6 +55,7 @@
 Section: misc
 Architecture: all
 Depends: ${misc:Depends}
+Multi-Arch: foreign
 Description: Common files for the ATK accessibility toolkit
  ATK is a toolkit providing accessibility interfaces for applications or
  other toolkits. By implementing these interfaces, those other toolkits or
@@ -90,6 +93,7 @@
 Depends: ${misc:Depends},
          libatk1.0-0 (= ${binary:Version})
 Replaces: libatk1.0-0 (<< 1.11.4-3)
+Multi-Arch: same
 Description: ATK libraries and debugging symbols
  ATK is a toolkit providing accessibility interfaces for applications or
  other toolkits. By implementing these interfaces, those other toolkits or

Modified: desktop/unstable/atk1.0/debian/gir1.2-atk-1.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/atk1.0/debian/gir1.2-atk-1.0.install?rev=28681&op=diff
==============================================================================
--- desktop/unstable/atk1.0/debian/gir1.2-atk-1.0.install [utf-8] (original)
+++ desktop/unstable/atk1.0/debian/gir1.2-atk-1.0.install [utf-8] Mon Jun 27 14:14:09 2011
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0/
+usr/lib/*/girepository-1.0/ usr/lib

Modified: desktop/unstable/atk1.0/debian/libatk1.0-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/atk1.0/debian/libatk1.0-0.install?rev=28681&op=diff
==============================================================================
--- desktop/unstable/atk1.0/debian/libatk1.0-0.install [utf-8] (original)
+++ desktop/unstable/atk1.0/debian/libatk1.0-0.install [utf-8] Mon Jun 27 14:14:09 2011
@@ -1,1 +1,1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

Modified: desktop/unstable/atk1.0/debian/libatk1.0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/atk1.0/debian/libatk1.0-dev.install?rev=28681&op=diff
==============================================================================
--- desktop/unstable/atk1.0/debian/libatk1.0-dev.install [utf-8] (original)
+++ desktop/unstable/atk1.0/debian/libatk1.0-dev.install [utf-8] Mon Jun 27 14:14:09 2011
@@ -1,6 +1,6 @@
-usr/lib/*.la
-usr/lib/*.a
-usr/lib/*.so
-usr/lib/pkgconfig/
+usr/lib/*/*.la
+usr/lib/*/*.a
+usr/lib/*/*.so
+usr/lib/*/pkgconfig/
 usr/include
 usr/share/gir-1.0

Modified: desktop/unstable/atk1.0/debian/libatk1.0-udeb.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/atk1.0/debian/libatk1.0-udeb.install?rev=28681&op=diff
==============================================================================
--- desktop/unstable/atk1.0/debian/libatk1.0-udeb.install [utf-8] (original)
+++ desktop/unstable/atk1.0/debian/libatk1.0-udeb.install [utf-8] Mon Jun 27 14:14:09 2011
@@ -1,1 +1,1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.* usr/lib

Modified: desktop/unstable/atk1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/atk1.0/debian/rules?rev=28681&op=diff
==============================================================================
--- desktop/unstable/atk1.0/debian/rules [utf-8] (original)
+++ desktop/unstable/atk1.0/debian/rules [utf-8] Mon Jun 27 14:14:09 2011
@@ -11,6 +11,6 @@
 LDFLAGS += -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
 
 # build static stuff:
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --enable-static --enable-introspection
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --enable-static --enable-introspection --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 DEB_DH_MAKESHLIBS_ARGS_libatk1.0-0 += --add-udeb="libatk1.0-udeb" -V -- -c4




More information about the pkg-gnome-commits mailing list