r15706 - in /desktop/experimental/epiphany-browser/debian: changelog control control.in rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Apr 20 11:47:11 2008
New Revision: 15706

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15706
Log:
Build against xulrunner 1.9:
+ Use the libxul-embedding version.
+ Build-depend on xulrunner-dev 1.9~b5-2.
+ Set explicit dependencies on xulrunner-1.9, thanks to that crap 
not using shlibs anymore.
+ Conflict against epiphany-extensions << 2.22.1-3.

Modified:
    desktop/experimental/epiphany-browser/debian/changelog
    desktop/experimental/epiphany-browser/debian/control
    desktop/experimental/epiphany-browser/debian/control.in
    desktop/experimental/epiphany-browser/debian/rules

Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=15706&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog (original)
+++ desktop/experimental/epiphany-browser/debian/changelog Sun Apr 20 11:47:11 2008
@@ -1,3 +1,14 @@
+epiphany-browser (2.22.1.1-2) experimental; urgency=low
+
+  * Build against xulrunner 1.9:
+    + Use the libxul-embedding version.
+    + Build-depend on xulrunner-dev 1.9~b5-2.
+    + Set explicit dependencies on xulrunner-1.9, thanks to that crap 
+      not using shlibs anymore.
+    + Conflict against epiphany-extensions << 2.22.1-3.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 20 Apr 2008 13:46:21 +0200
+
 epiphany-browser (2.22.1.1-1) unstable; urgency=low
 
   [ Sam Morris ]

Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=15706&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control (original)
+++ desktop/experimental/epiphany-browser/debian/control Sun Apr 20 11:47:11 2008
@@ -20,7 +20,7 @@
                scrollkeeper,
                gnome-pkg-tools (>= 0.10),
                libxml-parser-perl,
-               libxul-dev (>= 1.8.1),
+               xulrunner-dev (>= 1.9~b5-2),
                iso-codes (>= 0.35),
                python-dev (>= 2.3),
                python-gtk2-dev (>= 2.7.1),
@@ -56,9 +56,10 @@
          gnome-icon-theme (>= 2.9.90),
          dbus,
          iso-codes,
-         xulrunner-gnome-support,
+         xulrunner-1.9,
+         xulrunner-1.9-gnome-support,
          ${misc:Depends}
-Conflicts: epiphany-browser (<< 2.20)
+Conflicts: epiphany-browser (<< 2.20), epiphany-extensions (<< 2.22.1-3)
 Recommends: yelp, epiphany-extensions
 Suggests: mozplugger
 Provides: www-browser, gnome-www-browser

Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=15706&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in (original)
+++ desktop/experimental/epiphany-browser/debian/control.in Sun Apr 20 11:47:11 2008
@@ -20,7 +20,7 @@
                scrollkeeper,
                gnome-pkg-tools (>= 0.10),
                libxml-parser-perl,
-               libxul-dev (>= 1.8.1),
+               xulrunner-dev (>= 1.9~b5-2),
                iso-codes (>= 0.35),
                python-dev (>= 2.3),
                python-gtk2-dev (>= 2.7.1),
@@ -56,9 +56,10 @@
          gnome-icon-theme (>= 2.9.90),
          dbus,
          iso-codes,
-         xulrunner-gnome-support,
+         xulrunner-1.9,
+         xulrunner-1.9-gnome-support,
          ${misc:Depends}
-Conflicts: epiphany-browser (<< 2.20)
+Conflicts: epiphany-browser (<< 2.20), epiphany-extensions (<< 2.22.1-3)
 Recommends: yelp, epiphany-extensions
 Suggests: mozplugger
 Provides: www-browser, gnome-www-browser

Modified: desktop/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=15706&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules (original)
+++ desktop/experimental/epiphany-browser/debian/rules Sun Apr 20 11:47:11 2008
@@ -3,6 +3,7 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GNOME_MODULE := epiphany
@@ -40,7 +41,7 @@
 gecko_configure_flags := $(common_configure_flags) \
 		--libexecdir=\$${prefix}/lib/epiphany-gecko \
 		--with-engine=mozilla \
-		--with-gecko=xulrunner \
+		--with-gecko=libxul-embedding \
 		--enable-gtk-doc \
 		--enable-spell-checker