[Pkg-mono-svn-commits] rev 4049 - in gluezilla/trunk/debian: . patches

[Jo Shields]

Author: directhex
Date: 2009-12-14 09:58:48 +0000 (Mon, 14 Dec 2009)
New Revision: 4049

Added:
   gluezilla/trunk/debian/patches/xulrunner_1.9.1_by_default.dpatch
Modified:
   gluezilla/trunk/debian/changelog
   gluezilla/trunk/debian/control
   gluezilla/trunk/debian/patches/00list
   gluezilla/trunk/debian/rules
Log:
  * Integrate previous NMU, including new 
    debian/patches/xulrunner_1.9.1_by_default.dpatch
  * New upstream release
  * debian/control:
    + No-change bump to Standards 3.8.3


Modified: gluezilla/trunk/debian/changelog
===================================================================
--- gluezilla/trunk/debian/changelog	2009-10-21 20:09:39 UTC (rev 4048)
+++ gluezilla/trunk/debian/changelog	2009-12-14 09:58:48 UTC (rev 4049)
@@ -1,3 +1,23 @@
+gluezilla (2.4.3-1) UNRELEASED; urgency=low
+
+  * Integrate previous NMU, including new 
+    debian/patches/xulrunner_1.9.1_by_default.dpatch
+  * New upstream release
+  * debian/control:
+    + No-change bump to Standards 3.8.3
+
+ -- Jo Shields <directhex at apebox.org>  Mon, 14 Dec 2009 09:16:01 +0000
+
+gluezilla (2.4.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload for transition to xulrunner 1.9.1.
+    (Closes: #548674)
+  * debian/rules: Use dh_xulrunner
+  * debian/control: Build-depend on a xulrunner-dev that provides dh_xulrunner.
+  * src/LocationProvider.cpp: Tighten the GREVersionRange.
+
+ -- Mike Hommey <glandium at debian.org>  Sat, 10 Oct 2009 11:46:04 +0200
+
 gluezilla (2.4.2-1) unstable; urgency=low
 
   * New upstream release

Modified: gluezilla/trunk/debian/control
===================================================================
--- gluezilla/trunk/debian/control	2009-10-21 20:09:39 UTC (rev 4048)
+++ gluezilla/trunk/debian/control	2009-12-14 09:58:48 UTC (rev 4049)
@@ -9,8 +9,8 @@
  libmono-dev,
  libnspr4-dev,
  libnss3-dev,
- xulrunner-dev (>= 1.9)
-Standards-Version: 3.8.2
+ xulrunner-dev (>= 1.9.1.3-2)
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/gluezilla/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mono/gluezilla/trunk/
 

Modified: gluezilla/trunk/debian/patches/00list
===================================================================
--- gluezilla/trunk/debian/patches/00list	2009-10-21 20:09:39 UTC (rev 4048)
+++ gluezilla/trunk/debian/patches/00list	2009-12-14 09:58:48 UTC (rev 4049)
@@ -0,0 +1 @@
+xulrunner_1.9.1_by_default.dpatch

Added: gluezilla/trunk/debian/patches/xulrunner_1.9.1_by_default.dpatch
===================================================================
--- gluezilla/trunk/debian/patches/xulrunner_1.9.1_by_default.dpatch	                        (rev 0)
+++ gluezilla/trunk/debian/patches/xulrunner_1.9.1_by_default.dpatch	2009-12-14 09:58:48 UTC (rev 4049)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## xulrunner_1.9.1_by_default.dpatch by Jo Shields <directhex at apebox.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Tweak GREVersionRange to use Xulrunner 1.9.1
+
+ at DPATCH@
+diff -urNad gluezilla-2.4.2/src/LocationProvider.cpp gluezilla-2.4.2-1.1/src/LocationProvider.cpp
+--- gluezilla-2.4.2/src/LocationProvider.cpp	2009-06-08 18:44:03.000000000 +0100
++++ gluezilla-2.4.2-1.1/src/LocationProvider.cpp	2009-12-14 09:13:15.000000000 +0000
+@@ -195,9 +195,9 @@
+ #if XUL_VERSION == 2
+ 	"1.8", PR_TRUE,
+ #else
+-	"1.9", PR_TRUE,
++	"1.9.1", PR_TRUE,
+ #endif
+-	"9.9", PR_TRUE
++	"1.9.2", PR_FALSE
+ 	};
+ 
+ 	GRE_GetGREPathWithProperties(&version, 1,

Modified: gluezilla/trunk/debian/rules
===================================================================
--- gluezilla/trunk/debian/rules	2009-10-21 20:09:39 UTC (rev 4048)
+++ gluezilla/trunk/debian/rules	2009-12-14 09:58:48 UTC (rev 4049)
@@ -44,7 +44,7 @@
 	dh $@
 
 binary-arch: install
-	dh $@
+	dh --with xulrunner $@
 
 %:
 	dh $@