r45270 - in /trunk/libgtk2-mozembed-perl/debian: changelog control patches/use-the-right-xul rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sat Oct  3 18:31:05 2009
New Revision: 45270

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=45270
Log:
* Prepare for new xulrunner, thanks to Mike Hommey for the patch
  (closes: #548679).
* Minimize debian/rules with "--with" and "override_*", adjust build
  dependencies accordingly.

Modified:
    trunk/libgtk2-mozembed-perl/debian/changelog
    trunk/libgtk2-mozembed-perl/debian/control
    trunk/libgtk2-mozembed-perl/debian/patches/use-the-right-xul
    trunk/libgtk2-mozembed-perl/debian/rules

Modified: trunk/libgtk2-mozembed-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/debian/changelog?rev=45270&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/debian/changelog (original)
+++ trunk/libgtk2-mozembed-perl/debian/changelog Sat Oct  3 18:31:05 2009
@@ -10,6 +10,12 @@
 
   [ Ryan Niebur ]
   * Update ryan52's email address
+
+  [ gregor herrmann ]
+  * Prepare for new xulrunner, thanks to Mike Hommey for the patch
+    (closes: #548679).
+  * Minimize debian/rules with "--with" and "override_*", adjust build
+    dependencies accordingly.
 
  -- Ryan Niebur <ryan at debian.org>  Fri, 25 Sep 2009 00:25:00 -0700
 

Modified: trunk/libgtk2-mozembed-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/debian/control?rev=45270&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/debian/control (original)
+++ trunk/libgtk2-mozembed-perl/debian/control Sat Oct  3 18:31:05 2009
@@ -1,10 +1,10 @@
 Source: libgtk2-mozembed-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7), libextutils-depends-perl (>= 0.20),
+Build-Depends: debhelper (>= 7.2.11), libextutils-depends-perl (>= 0.20),
   libextutils-pkgconfig-perl (>= 1.03), libgtk2-perl (>= 1.081),
-  perl, xulrunner-dev, xvfb, xauth, xfonts-base,
-  libglib2.0-dev, libgtk2.0-dev, quilt
+  perl, xulrunner-dev (>= 1.9.1.3-2), xvfb, xauth, xfonts-base,
+  libglib2.0-dev, libgtk2.0-dev, quilt (>= 0.46-7)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Ryan Niebur <ryan at debian.org>
 Standards-Version: 3.8.1
@@ -16,6 +16,6 @@
 Architecture: any
 Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends},
   libextutils-depends-perl (>= 0.20), libgtk2-perl (>= 1.081),
-  libextutils-pkgconfig-perl (>= 1.03), xulrunner-1.9
+  libextutils-pkgconfig-perl (>= 1.03)
 Description: Perl interface to the Mozilla embedding widget
  Gtk2::MozEmbed allows a Perl developer to use the Mozilla embedding widget.

Modified: trunk/libgtk2-mozembed-perl/debian/patches/use-the-right-xul
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/debian/patches/use-the-right-xul?rev=45270&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/debian/patches/use-the-right-xul (original)
+++ trunk/libgtk2-mozembed-perl/debian/patches/use-the-right-xul Sat Oct  3 18:31:05 2009
@@ -162,8 +162,8 @@
 +
 +     /* copied from the gnome-python-extras package's patch */
 +     static const GREVersionRange greVersion = {
-+     "1.9b", PR_TRUE,
-+     "1.9.*", PR_TRUE
++     "1.9.1", PR_TRUE,
++     "1.9.2", PR_FALSE
 +     };
 +     char xpcomLocation[4096];
 +     nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);

Modified: trunk/libgtk2-mozembed-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/debian/rules?rev=45270&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/debian/rules (original)
+++ trunk/libgtk2-mozembed-perl/debian/rules Sat Oct  3 18:31:05 2009
@@ -1,27 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
+%:
+	dh --with quilt,xulrunner $@
 
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
-	dh --before dh_auto_test build
+override_dh_autotest:
 	xvfb-run dh_auto_test
-	dh --after dh_auto_test build
-	touch $@
-
-clean: unpatch
-	dh $@
-
-install: install-stamp
-install-stamp: build-stamp
-	dh install
-	touch $@
-
-binary-arch: install
-	dh $@
-
-binary-indep:
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep install clean build