r18368 - in /desktop/experimental/epiphany-browser/debian: changelog patches/30_ua_debian_version.patch patches/series rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Feb 15 02:06:59 2009
New Revision: 18368

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18368
Log:
* 30_ua_debian_version.patch: new patch to add the Debian version to 
  the user agent string. Closes: #509207.
* rules: pass the appropriate macro so that it works.

Added:
    desktop/experimental/epiphany-browser/debian/patches/30_ua_debian_version.patch
Modified:
    desktop/experimental/epiphany-browser/debian/changelog
    desktop/experimental/epiphany-browser/debian/patches/series
    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=18368&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog (original)
+++ desktop/experimental/epiphany-browser/debian/changelog Sun Feb 15 02:06:59 2009
@@ -2,8 +2,6 @@
 
   * Move the contents of README.Debian to epiphany-browser.README.Debian 
     so that it is actually shipped.
-  * rules: append the Debian version to default-prefs.js so that it 
-    appears in the user-agent string. Closes: #509207.
   * epiphany-browser-data.gconf-defaults: enable the universal encoding 
     detector, to improve display of broken sites.
   * New upstream release.
@@ -15,6 +13,9 @@
     and fill it automatically when using middle-click.
   * Drop epiphany-webkit build for now as it has gone away from the 2.24 
     branch. Don’t worry, it will be soon back for good in experimental.
+  * 30_ua_debian_version.patch: new patch to add the Debian version to 
+    the user agent string. Closes: #509207.
+  * rules: pass the appropriate macro so that it works.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 15 Feb 2009 01:37:24 +0100
 

Added: desktop/experimental/epiphany-browser/debian/patches/30_ua_debian_version.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/30_ua_debian_version.patch?rev=18368&op=file
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/30_ua_debian_version.patch (added)
+++ desktop/experimental/epiphany-browser/debian/patches/30_ua_debian_version.patch Sun Feb 15 02:06:59 2009
@@ -1,0 +1,13 @@
+Index: epiphany-2.24.3/embed/mozilla/mozilla-embed-single.cpp
+===================================================================
+--- epiphany-2.24.3.orig/embed/mozilla/mozilla-embed-single.cpp	2009-02-15 02:36:13.813402305 +0100
++++ epiphany-2.24.3/embed/mozilla/mozilla-embed-single.cpp	2009-02-15 02:37:29.009400609 +0100
+@@ -192,7 +192,7 @@ mozilla_set_default_prefs (MozillaEmbedS
+                 g_warning ("failed to read user preferences, error: %x", rv);
+         }
+ 
+-	pref->SetCharPref ("general.useragent.extra.epiphany", "Epiphany/" UA_VERSION);
++	pref->SetCharPref ("general.useragent.extra.epiphany", "Epiphany/" UA_VERSION " (Debian/" DEB_PACKAGE_VERSION ")");
+ 
+ 	/* Unset old prefs, otherwise they end up in the user agent string too */
+ 	pref->ClearUserPref ("general.useragent.vendor");

Modified: desktop/experimental/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/series?rev=18368&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/series (original)
+++ desktop/experimental/epiphany-browser/debian/patches/series Sun Feb 15 02:06:59 2009
@@ -14,5 +14,6 @@
 12_safetypes.patch
 13_extensions_need_xpcom.patch
 21_chrome_certmanager.patch
+30_ua_debian_version.patch
 99_autoreconf.patch
 99_ltmain_as-needed.patch

Modified: desktop/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=18368&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules (original)
+++ desktop/experimental/epiphany-browser/debian/rules Sun Feb 15 02:06:59 2009
@@ -15,6 +15,9 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_GNU_CPU  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+
+# To add the Debian version to the user agent
+CPPFLAGS += -DDEB_PACKAGE_VERSION=\\\"$(DEB_VERSION)\\\"
 
 CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 
@@ -67,7 +70,7 @@
 	dh_testdir
 	mkdir -p $(builddir)
 	cd $(builddir) && \
-		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+		CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 			$(CURDIR)/configure $($*_configure_flags)
 	touch $@
 
@@ -102,10 +105,6 @@
 	mv debian/epiphany-gecko/usr/share debian/epiphany-browser-data/usr/
 	cd debian/epiphany-browser-data/usr/share/epiphany-browser && \
 		mv mime-types-permissions.xml default-prefs.js $(CURDIR)/debian/epiphany-browser-data/etc/gnome/epiphany/
-	# Add Debian version to the user agent
-	cd debian/epiphany-browser-data/etc/gnome/epiphany && \
-		echo >> default-prefs.js && \
-		echo 'pref("general.useragent.extra.epiphany.debian", "(Debian/$(DEB_VERSION))");' >> default-prefs.js
 	cd debian/epiphany-browser-data/usr/share/man/man1 && \
 		mv epiphany.1 epiphany-browser.1
 	# Correct help file paths