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

Pino Toscano pino at alioth.debian.org
Tue May 22 11:01:52 UTC 2012 

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

The following commit has been merged in the master branch:
commit fb47bb35f013d344e0fc42d976cfd8b11b0939ce
Author: Pino Toscano <pino at debian.org>
Date:   Tue May 22 12:58:33 2012 +0200

    bump to debhelper compatibility to 9
    
    - bump the debhelper build dependency to >= 9.
    - bump compat to 9.
    - adapt the library paths in .install files to multiarch locations.
---
 debian/changelog                      |    4 ++++
 debian/compat                         |    2 +-
 debian/control                        |    2 +-
 debian/google-gadgets-common.install  |   16 ++++++++--------
 debian/google-gadgets-gst.install     |    2 +-
 debian/google-gadgets-gtk.install     |    2 +-
 debian/google-gadgets-qt.install      |    2 +-
 debian/google-gadgets-webkit.install  |    6 +++---
 debian/libggadget-1.0-0b.install      |   10 +++++-----
 debian/libggadget-1.0-dev.install     |   32 ++++++++++++++++----------------
 debian/libggadget-gtk-1.0-0b.install  |    2 +-
 debian/libggadget-gtk-1.0-dev.install |    6 +++---
 debian/libggadget-qt-1.0-0b.install   |    2 +-
 debian/libggadget-qt-1.0-dev.install  |    6 +++---
 14 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index babaf5a..7ab8f1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ google-gadgets (0.11.2-6) UNRELEASED; urgency=low
     individual headers; patch glib_includes.diff. (Closes: #665541)
   * Bump Standards-Version to 3.9.3, no changes required.
   * Fix building with GCC 4.7; patch gcc-4.7.diff. (Closes: #667187)
+  * Bump to debhelper compatibility to 9:
+    - bump the debhelper build dependency to >= 9.
+    - bump compat to 9.
+    - adapt the library paths in .install files to multiarch locations.
 
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Mar 2012 21:17:37 +0100
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 880f068..4a38cab 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Debian Krap Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>, Modestas Vainius <modax at debian.org>, Fathi Boudra <fabo at debian.org>, Pino Toscano <pino at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), automake, autoconf, dh-autoreconf,
+Build-Depends: debhelper (>= 9), automake, autoconf, dh-autoreconf,
  libtool, zip, libsoup2.4-dev (>= 2.26.0),
  libdbus-1-dev, libeditline-dev, libgtk2.0-dev,
  libgstreamer-plugins-base0.10-dev, libltdl-dev, libqt4-dev, libqtwebkit-dev,
diff --git a/debian/google-gadgets-common.install b/debian/google-gadgets-common.install
index 104a437..e43a0bd 100644
--- a/debian/google-gadgets-common.install
+++ b/debian/google-gadgets-common.install
@@ -1,11 +1,11 @@
-usr/lib/google-gadgets/modules/analytics*.so
-usr/lib/google-gadgets/modules/soup*.so
-usr/lib/google-gadgets/modules/dbus*.so
-usr/lib/google-gadgets/modules/default*.so
-usr/lib/google-gadgets/modules/google-gadget-manager*.so
-usr/lib/google-gadgets/modules/html*.so
-usr/lib/google-gadgets/modules/libxml2*.so
-usr/lib/google-gadgets/modules/linux*.so
+usr/lib/*/google-gadgets/modules/analytics*.so
+usr/lib/*/google-gadgets/modules/soup*.so
+usr/lib/*/google-gadgets/modules/dbus*.so
+usr/lib/*/google-gadgets/modules/default*.so
+usr/lib/*/google-gadgets/modules/google-gadget-manager*.so
+usr/lib/*/google-gadgets/modules/html*.so
+usr/lib/*/google-gadgets/modules/libxml2*.so
+usr/lib/*/google-gadgets/modules/linux*.so
 usr/share/google-gadgets/*.gg
 usr/share/icons/hicolor/128x128/apps/google-gadgets.png
 usr/share/icons/hicolor/128x128/mimetypes/application-x-google-gadget.png
diff --git a/debian/google-gadgets-gst.install b/debian/google-gadgets-gst.install
index 00d833f..40fc5bd 100644
--- a/debian/google-gadgets-gst.install
+++ b/debian/google-gadgets-gst.install
@@ -1 +1 @@
-usr/lib/google-gadgets/modules/gst*.so
+usr/lib/*/google-gadgets/modules/gst*.so
diff --git a/debian/google-gadgets-gtk.install b/debian/google-gadgets-gtk.install
index 32005c8..e844573 100644
--- a/debian/google-gadgets-gtk.install
+++ b/debian/google-gadgets-gtk.install
@@ -1,5 +1,5 @@
 debian/ggl-gtk.xpm usr/share/pixmaps
 usr/bin/ggl-gtk usr/bin
-usr/lib/google-gadgets/modules/gtk-*.so
+usr/lib/*/google-gadgets/modules/gtk-*.so
 usr/share/applications/ggl-designer.desktop
 usr/share/applications/ggl-gtk.desktop
diff --git a/debian/google-gadgets-qt.install b/debian/google-gadgets-qt.install
index ec8a2b2..0be9a41 100644
--- a/debian/google-gadgets-qt.install
+++ b/debian/google-gadgets-qt.install
@@ -1,4 +1,4 @@
 debian/ggl-qt.xpm usr/share/pixmaps
 usr/bin/ggl-qt
-usr/lib/google-gadgets/modules/qt*.so
+usr/lib/*/google-gadgets/modules/qt*.so
 usr/share/applications/ggl-qt.desktop
diff --git a/debian/google-gadgets-webkit.install b/debian/google-gadgets-webkit.install
index da35076..e4d0ed8 100644
--- a/debian/google-gadgets-webkit.install
+++ b/debian/google-gadgets-webkit.install
@@ -1,3 +1,3 @@
-usr/lib/libggadget-webkitjs-1.0.so.0*
-usr/lib/google-gadgets/modules/gtkwebkit-browser-element.so
-usr/lib/google-gadgets/modules/webkit-script-runtime.so
+usr/lib/*/libggadget-webkitjs-1.0.so.0*
+usr/lib/*/google-gadgets/modules/gtkwebkit-browser-element.so
+usr/lib/*/google-gadgets/modules/webkit-script-runtime.so
diff --git a/debian/libggadget-1.0-0b.install b/debian/libggadget-1.0-0b.install
index 9e434c2..44cb385 100644
--- a/debian/libggadget-1.0-0b.install
+++ b/debian/libggadget-1.0-0b.install
@@ -1,5 +1,5 @@
-usr/lib/libggadget-dbus-1.0.so.0*
-usr/lib/libggadget-js-1.0.so.0*
-usr/lib/libggadget-npapi-1.0.so.0*
-usr/lib/libggadget-xdg-1.0.so.0*
-usr/lib/libggadget-1.0.so.0*
+usr/lib/*/libggadget-dbus-1.0.so.0*
+usr/lib/*/libggadget-js-1.0.so.0*
+usr/lib/*/libggadget-npapi-1.0.so.0*
+usr/lib/*/libggadget-xdg-1.0.so.0*
+usr/lib/*/libggadget-1.0.so.0*
diff --git a/debian/libggadget-1.0-dev.install b/debian/libggadget-1.0-dev.install
index 5df9e5b..984a8cf 100644
--- a/debian/libggadget-1.0-dev.install
+++ b/debian/libggadget-1.0-dev.install
@@ -3,19 +3,19 @@ usr/include/google-gadgets/ggadget/dbus
 usr/include/google-gadgets/ggadget/js
 usr/include/google-gadgets/ggadget/npapi
 usr/include/google-gadgets/ggadget/xdg
-usr/lib/google-gadgets/include/ggadget/sysdeps.h
-usr/lib/libggadget-1.0.a
-usr/lib/libggadget-1.0.so
-usr/lib/libggadget-dbus-1.0.a
-usr/lib/libggadget-dbus-1.0.so
-usr/lib/libggadget-js-1.0.a
-usr/lib/libggadget-js-1.0.so
-usr/lib/libggadget-npapi-1.0.a
-usr/lib/libggadget-npapi-1.0.so
-usr/lib/libggadget-xdg-1.0.a
-usr/lib/libggadget-xdg-1.0.so
-usr/lib/pkgconfig/libggadget-1.0.pc
-usr/lib/pkgconfig/libggadget-dbus-1.0.pc
-usr/lib/pkgconfig/libggadget-js-1.0.pc
-usr/lib/pkgconfig/libggadget-npapi-1.0.pc
-usr/lib/pkgconfig/libggadget-xdg-1.0.pc
+usr/lib/*/google-gadgets/include/ggadget/sysdeps.h
+usr/lib/*/libggadget-1.0.a
+usr/lib/*/libggadget-1.0.so
+usr/lib/*/libggadget-dbus-1.0.a
+usr/lib/*/libggadget-dbus-1.0.so
+usr/lib/*/libggadget-js-1.0.a
+usr/lib/*/libggadget-js-1.0.so
+usr/lib/*/libggadget-npapi-1.0.a
+usr/lib/*/libggadget-npapi-1.0.so
+usr/lib/*/libggadget-xdg-1.0.a
+usr/lib/*/libggadget-xdg-1.0.so
+usr/lib/*/pkgconfig/libggadget-1.0.pc
+usr/lib/*/pkgconfig/libggadget-dbus-1.0.pc
+usr/lib/*/pkgconfig/libggadget-js-1.0.pc
+usr/lib/*/pkgconfig/libggadget-npapi-1.0.pc
+usr/lib/*/pkgconfig/libggadget-xdg-1.0.pc
diff --git a/debian/libggadget-gtk-1.0-0b.install b/debian/libggadget-gtk-1.0-0b.install
index 71556e4..e224fb4 100644
--- a/debian/libggadget-gtk-1.0-0b.install
+++ b/debian/libggadget-gtk-1.0-0b.install
@@ -1 +1 @@
-usr/lib/libggadget-gtk-1.0.so.0*
+usr/lib/*/libggadget-gtk-1.0.so.0*
diff --git a/debian/libggadget-gtk-1.0-dev.install b/debian/libggadget-gtk-1.0-dev.install
index 23ad33a..1a376e9 100644
--- a/debian/libggadget-gtk-1.0-dev.install
+++ b/debian/libggadget-gtk-1.0-dev.install
@@ -1,4 +1,4 @@
 usr/include/google-gadgets/ggadget/gtk
-usr/lib/libggadget-gtk-1.0.a
-usr/lib/libggadget-gtk-1.0.so
-usr/lib/pkgconfig/libggadget-gtk-1.0.pc
+usr/lib/*/libggadget-gtk-1.0.a
+usr/lib/*/libggadget-gtk-1.0.so
+usr/lib/*/pkgconfig/libggadget-gtk-1.0.pc
diff --git a/debian/libggadget-qt-1.0-0b.install b/debian/libggadget-qt-1.0-0b.install
index a8ea946..f95a655 100644
--- a/debian/libggadget-qt-1.0-0b.install
+++ b/debian/libggadget-qt-1.0-0b.install
@@ -1 +1 @@
-usr/lib/libggadget-qt-1.0.so.0*
+usr/lib/*/libggadget-qt-1.0.so.0*
diff --git a/debian/libggadget-qt-1.0-dev.install b/debian/libggadget-qt-1.0-dev.install
index 051a771..07c59c0 100644
--- a/debian/libggadget-qt-1.0-dev.install
+++ b/debian/libggadget-qt-1.0-dev.install
@@ -1,4 +1,4 @@
 usr/include/google-gadgets/ggadget/qt
-usr/lib/libggadget-qt-1.0.a
-usr/lib/libggadget-qt-1.0.so
-usr/lib/pkgconfig/libggadget-qt-1.0.pc
+usr/lib/*/libggadget-qt-1.0.a
+usr/lib/*/libggadget-qt-1.0.so
+usr/lib/*/pkgconfig/libggadget-qt-1.0.pc

-- 
Google Gadgets packaging

More information about the pkg-kde-commits mailing list