[SCM] Google Gadgets packaging branch, master, updated. debian/0.11.2-5-8-g7763cb9

Pino Toscano pino at alioth.debian.org
Tue May 22 11:34:41 UTC 2012


Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/google-gadgets.git;a=commitdiff;h=7763cb9

The following commit has been merged in the master branch:
commit 7763cb937782911daffb1ef1906d2c2fd1521adc
Author: Pino Toscano <pino at debian.org>
Date:   Tue May 22 13:34:30 2012 +0200

    add "Multi-Arch: same" to library packages
---
 debian/changelog |    3 ++-
 debian/control   |    3 +++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd6e831..663d3a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,8 @@ google-gadgets (0.11.2-6) UNRELEASED; urgency=low
     - bump the debhelper build dependency to >= 9.
     - bump compat to 9.
     - adapt the library paths in .install files to multiarch locations.
-  * Add "Pre-Depends: ${misc:Pre-Depends}" to library packages.
+  * Add "Pre-Depends: ${misc:Pre-Depends}" and "Multi-Arch: same"
+    to library packages.
   * Avoid shlibs creation for google-gadgets-webkit, and update lintian
     overrides accordingly.
 
diff --git a/debian/control b/debian/control
index ce8e70e..1e119ac 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Homepage: http://code.google.com/p/google-gadgets-for-linux/
 Package: libggadget-1.0-0b
 Section: libs
 Architecture: any
+Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libggadget-1.0-0, libggadget-1.0-0a, libggadget-1.0-0-api
@@ -52,6 +53,7 @@ Description: Google Gadgets main development files
 Package: libggadget-gtk-1.0-0b
 Section: libs
 Architecture: any
+Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libggadget-gtk-1.0-0, libggadget-gtk-1.0-0a, libggadget-gtk-1.0-0-api
@@ -84,6 +86,7 @@ Description: Google Gadgets GTK+ development files
 Package: libggadget-qt-1.0-0b
 Section: libs
 Architecture: any
+Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libggadget-qt-1.0-0, libggadget-qt-1.0-0a, libggadget-qt-1.0-0-api

-- 
Google Gadgets packaging



More information about the pkg-kde-commits mailing list