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

[Pino Toscano]

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

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

    revert to shlibs creation for google-gadgets-webkit
    
    too much work for basically no gain
---
 debian/changelog                               |    2 --
 debian/google-gadgets-webkit.lintian-overrides |    5 +++--
 debian/rules                                   |    3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bffaee1..11ffd14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,6 @@ google-gadgets (0.11.2-6) UNRELEASED; urgency=low
     - adapt the library paths in .install files to multiarch locations.
   * Add "Pre-Depends: ${misc:Pre-Depends}" and "Multi-Arch: same"
     to library packages; add Pre-Depends also to google-gadgets-webkit
-  * Avoid shlibs creation for google-gadgets-webkit, and update lintian
-    overrides accordingly.
 
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Mar 2012 21:17:37 +0100
 
diff --git a/debian/google-gadgets-webkit.lintian-overrides b/debian/google-gadgets-webkit.lintian-overrides
index 5652bfd..7af8ee8 100644
--- a/debian/google-gadgets-webkit.lintian-overrides
+++ b/debian/google-gadgets-webkit.lintian-overrides
@@ -1,3 +1,4 @@
 google-gadgets-webkit: package-name-doesnt-match-sonames libggadget-webkitjs-1.0-0
-# internal library, only used by plugins in this very same package
-google-gadgets-webkit: no-shlibs-control-file usr/lib/*/libggadget-webkitjs-1.0.so.0.0.0
+google-gadgets-webkit: unused-shlib-entry-in-control-file gtkwebkit-browser element
+google-gadgets-webkit: unused-shlib-entry-in-control-file webkit-script runtime
+google-gadgets-webkit: no-symbols-control-file usr/lib/*/libggadget-webkitjs-1.0.so.0.0.0
diff --git a/debian/rules b/debian/rules
index 5e80ece..357936d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,7 @@ override_dh_install:
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V -Ngoogle-gadgets-common -Ngoogle-gadgets-gtk \
-		-Ngoogle-gadgets-qt -Ngoogle-gadgets-gst \
-		-Ngoogle-gadgets-webkit
+		-Ngoogle-gadgets-qt -Ngoogle-gadgets-gst
 
 get-orig-source:
 	# rename to what debian wants, repack to tgz rather than tbz2

-- 
Google Gadgets packaging