r18905 - in /desktop/unstable/epiphany-browser/debian: changelog patches/14_with-engine.patch patches/series rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Mar  8 19:10:17 2009
New Revision: 18905

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18905
Log:
14_with-engine.patch: stolen from upstream. Set the engine 
explicitly in the pkg-config file, since the variable is not 
replaced anymore.

Added:
    desktop/unstable/epiphany-browser/debian/patches/14_with-engine.patch
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/patches/series
    desktop/unstable/epiphany-browser/debian/rules

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=18905&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Sun Mar  8 19:10:17 2009
@@ -1,8 +1,10 @@
 epiphany-browser (2.24.3-2) unstable; urgency=low
 
-  * Fix .pc file by hand so that extensions build correctly.
   * 10_smart_bookmarks.patch: fix crash introduced by the patch because 
     the text is not checked for NULLity. Closes: #516286.
+  * 14_with-engine.patch: stolen from upstream. Set the engine 
+    explicitly in the pkg-config file, since the variable is not 
+    replaced anymore.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 08 Mar 2009 19:44:37 +0100
 

Added: desktop/unstable/epiphany-browser/debian/patches/14_with-engine.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/14_with-engine.patch?rev=18905&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/14_with-engine.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/14_with-engine.patch Sun Mar  8 19:10:17 2009
@@ -1,0 +1,15 @@
+Upstream commit r8786.
+
+Index: epiphany-2.24.3/data/epiphany.pc.in
+===================================================================
+--- epiphany-2.24.3.orig/data/epiphany.pc.in	2009-03-08 20:08:06.349679319 +0100
++++ epiphany-2.24.3/data/epiphany.pc.in	2009-03-08 20:08:40.173174902 +0100
+@@ -8,7 +8,7 @@ datarootdir=@datarootdir@
+ datadir=@datadir@
+ icondir=@datadir@/@PACKAGE@/icons
+ features=@EPIPHANY_FEATURES@
+-engine=@with_engine@
++engine=mozilla
+ 
+ Name: Epiphany Browser
+ Description: GNOME Web Browser

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=18905&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series Sun Mar  8 19:10:17 2009
@@ -13,6 +13,7 @@
 11_useragent-weasel.patch
 12_safetypes.patch
 13_extensions_need_xpcom.patch
+14_with-engine.patch
 21_chrome_certmanager.patch
 30_ua_debian_version.patch
 99_autoreconf.patch

Modified: desktop/unstable/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/rules?rev=18905&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/rules (original)
+++ desktop/unstable/epiphany-browser/debian/rules Sun Mar  8 19:10:17 2009
@@ -126,8 +126,6 @@
 	dh_install
 	cd debian/epiphany-browser/usr/bin && \
 		mv epiphany.sh epiphany
-	# Temporary fix for 2.24.3, should be removed for 2.26
-	sed -i s, at with_engine@,mozilla, debian/epiphany-browser-dev/usr/lib/pkg-config/epiphany-*.pc
 
 clean::
 	dh_testdir