[SCM] Google Gadgets packaging branch, master, updated. debian/0.11.2-3-14-gc4ea436

[Pino Toscano]

The following commit has been merged in the master branch:
commit 2922d22ad3d31c1dbf23ec95fe30e14192978e15
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jul 25 21:34:58 2011 +0200

    drop the XUL-based modules (#631037)
    
    ... as they do not compile anymore with xulrunner >= 2.0
    - do not use the xulrunner dh addon.
    - remove the google-gadgets-xul binary.
    - drop the xulrunner-dev and chrpath build-dependencies.
---
 debian/changelog                  |    5 +++++
 debian/control                    |   20 ++------------------
 debian/google-gadgets-xul.install |    3 ---
 debian/rules                      |    6 ++----
 4 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d44f926..049da30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,11 @@ google-gadgets (0.11.2-4) UNRELEASED; urgency=low
   * Use wildcard architectures:
     - !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 -> linux-any
   * Switch to my @debian.org address, I'm a DD now.
+  * Drop the XUL-based modules, which do not compile anymore with
+    xulrunner >= 2.0: (Closes: #631037)
+    - do not use the xulrunner dh addon.
+    - remove the google-gadgets-xul binary.
+    - drop the xulrunner-dev and chrpath build-dependencies.
 
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Mon, 21 Feb 2011 14:04:53 +0100
 
diff --git a/debian/control b/debian/control
index 5e8bf46..54de699 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,13 @@ 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,
- libtool, chrpath, zip, libsoup2.4-dev (>= 2.26.0),
+ libtool, zip, libsoup2.4-dev (>= 2.26.0),
  libdbus-1-dev, libeditline-dev, libgtk2.0-dev,
  libgstreamer-plugins-base0.10-dev, libltdl3-dev, libqt4-dev, libqtwebkit-dev,
  librsvg2-dev,
  libstartup-notification0-dev, libxml2-dev,
  network-manager-dev [linux-any],
- xulrunner-dev (>= 1.9.1.6), zlib1g-dev
+ zlib1g-dev
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-kde/krap/google-gadgets.git
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/krap/google-gadgets.git
@@ -128,7 +128,6 @@ Section: gnome
 Architecture: any
 Depends: google-gadgets-common (= ${binary:Version}),
  google-gadgets-gst (= ${binary:Version}),
- google-gadgets-xul (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Description: GTK+ Version of Google Gadgets
  Google Gadgets for Linux provides a platform for running desktop gadgets under
@@ -144,7 +143,6 @@ Section: kde
 Architecture: any
 Depends: google-gadgets-common (= ${binary:Version}),
  google-gadgets-gst (= ${binary:Version}),
- google-gadgets-xul (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Description: Qt4 version of Google Gadgets
  Google Gadgets for Linux provides a platform for running desktop gadgets under
@@ -168,17 +166,3 @@ Description: GStreamer Module for Google Gadgets
  under the Apache License.
  .
  This package includes the GStreamer modules.
-
-Package: google-gadgets-xul
-Section: misc
-Architecture: any
-Depends: google-gadgets-common (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
-Description: XULRunner module for Google Gadgets
- Google Gadgets for Linux provides a platform for running desktop gadgets under
- Linux, catering to the unique needs of Linux users. It is compatible with the
- gadgets written for Google Desktop for Windows as well as the Universal
- Gadgets on iGoogle. Following Linux norms, this project is open-sourced,
- under the Apache License.
- .
- This package includes the XULRunner Modules.
diff --git a/debian/google-gadgets-xul.install b/debian/google-gadgets-xul.install
deleted file mode 100644
index 9d201d7..0000000
--- a/debian/google-gadgets-xul.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/google-gadgets/gtkmoz-browser-child
-usr/lib/google-gadgets/modules/gtkmoz*.so
-usr/lib/google-gadgets/modules/smjs*.so
diff --git a/debian/rules b/debian/rules
index 521f234..357936d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with autoreconf,xulrunner
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -13,13 +13,11 @@ override_dh_auto_configure:
 		--enable-ltdl-install=no
 
 override_dh_install:
-	chrpath -d debian/tmp/usr/lib/google-gadgets/gtkmoz-browser-child
-	chrpath -d debian/tmp/usr/lib/google-gadgets/modules/smjs-script-runtime.so
 	dh_install --list-missing -X.la
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V -Ngoogle-gadgets-common -Ngoogle-gadgets-gtk \
-		-Ngoogle-gadgets-qt -Ngoogle-gadgets-gst -Ngoogle-gadgets-xul
+		-Ngoogle-gadgets-qt -Ngoogle-gadgets-gst
 
 get-orig-source:
 	# rename to what debian wants, repack to tgz rather than tbz2

-- 
Google Gadgets packaging