r18600 - in /desktop/experimental/epiphany-webkit/debian: changelog patches/05_libexecdir.patch rules

[kov at users.alioth.debian.org]

Author: kov
Date: Tue Mar  3 14:05:59 2009
New Revision: 18600

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18600
Log:
refreshed 05_libexecdir.patch

Modified:
    desktop/experimental/epiphany-webkit/debian/changelog
    desktop/experimental/epiphany-webkit/debian/patches/05_libexecdir.patch
    desktop/experimental/epiphany-webkit/debian/rules

Modified: desktop/experimental/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/changelog?rev=18600&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/changelog (original)
+++ desktop/experimental/epiphany-webkit/debian/changelog Tue Mar  3 14:05:59 2009
@@ -3,8 +3,10 @@
   * Upstream development snapshot
   * 04_move_tabs.patch:
   - dropped; gecko-only, does not apply to trunk
-
- -- Gustavo Noronha Silva <kov at debian.org>  Tue, 03 Mar 2009 09:55:26 -0300
+  * 05_libexecdir.patch, debian/rules:
+  - removed gecko-specific parts of the patch
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Tue, 03 Mar 2009 10:45:25 -0300
 
 epiphany-browser (2.24.3-2) UNRELEASED; urgency=low
 

Modified: desktop/experimental/epiphany-webkit/debian/patches/05_libexecdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/05_libexecdir.patch?rev=18600&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/05_libexecdir.patch (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/05_libexecdir.patch Tue Mar  3 14:05:59 2009
@@ -1,7 +1,7 @@
-Index: epiphany-2.22.3/data/epiphany.pc.in
+Index: epiphany-webkit-2.27.0~svn.8837/data/epiphany.pc.in
 ===================================================================
---- epiphany-2.22.3.orig/data/epiphany.pc.in	2008-03-28 15:59:45.000000000 +0100
-+++ epiphany-2.22.3/data/epiphany.pc.in	2008-07-02 10:28:57.799092667 +0200
+--- epiphany-webkit-2.27.0~svn.8837.orig/data/epiphany.pc.in	2009-02-02 22:18:56.000000000 -0200
++++ epiphany-webkit-2.27.0~svn.8837/data/epiphany.pc.in	2009-03-03 11:03:19.000000000 -0300
 @@ -2,8 +2,8 @@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
@@ -13,46 +13,23 @@
  datarootdir=@datarootdir@
  datadir=@datadir@
  icondir=@datadir@/@PACKAGE@/icons
-Index: epiphany-2.22.3/embed/mozilla/Makefile.am
+Index: epiphany-webkit-2.27.0~svn.8837/lib/Makefile.am
 ===================================================================
---- epiphany-2.22.3.orig/embed/mozilla/Makefile.am	2008-06-30 20:01:36.000000000 +0200
-+++ epiphany-2.22.3/embed/mozilla/Makefile.am	2008-07-02 10:28:57.799092667 +0200
-@@ -158,7 +158,7 @@
- 	-I$(top_srcdir)		    		\
- 	$(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs))	\
- 	-DSHARE_DIR=\"$(pkgdatadir)\"   	\
--	-DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\"		\
-+	-DPLUGINDIR=\"$(libexecdir)/$(EPIPHANY_MAJOR)/plugins\"		\
- 	-DMOZILLA_HOME=\"$(GECKO_HOME)\"	\
- 	-DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\"	\
- 	-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\"		\
-Index: epiphany-2.22.3/lib/Makefile.am
-===================================================================
---- epiphany-2.22.3.orig/lib/Makefile.am	2008-03-28 15:59:46.000000000 +0100
-+++ epiphany-2.22.3/lib/Makefile.am	2008-07-02 10:28:57.799092667 +0200
-@@ -80,7 +80,7 @@
- 	-I$(top_builddir)/lib/egg		\
+--- epiphany-webkit-2.27.0~svn.8837.orig/lib/Makefile.am	2009-02-23 20:44:06.000000000 -0300
++++ epiphany-webkit-2.27.0~svn.8837/lib/Makefile.am	2009-03-03 11:03:19.000000000 -0300
+@@ -78,7 +78,7 @@
  	-I$(top_srcdir)/lib/egg			\
+ 	-DDATADIR="\"$(datadir)\""		\
  	-DSHARE_DIR=\"$(pkgdatadir)\" 		\
 -	-DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" 	\
 +	-DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" 	\
  	$(AM_CPPFLAGS)
  
  libephymisc_la_CFLAGS = \
-Index: epiphany-2.22.3/plugins/desktop-file/Makefile.am
+Index: epiphany-webkit-2.27.0~svn.8837/src/Makefile.am
 ===================================================================
---- epiphany-2.22.3.orig/plugins/desktop-file/Makefile.am	2008-03-28 16:02:20.000000000 +0100
-+++ epiphany-2.22.3/plugins/desktop-file/Makefile.am	2008-07-02 10:28:57.799092667 +0200
-@@ -1,4 +1,4 @@
--plugindir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins
-+plugindir = $(libexecdir)/$(EPIPHANY_MAJOR)/plugins
- plugin_LTLIBRARIES = libdesktopfileplugin.la
- 
- libdesktopfileplugin_la_SOURCES = \
-Index: epiphany-2.22.3/src/Makefile.am
-===================================================================
---- epiphany-2.22.3.orig/src/Makefile.am	2008-03-28 16:02:20.000000000 +0100
-+++ epiphany-2.22.3/src/Makefile.am	2008-07-02 10:28:57.803111823 +0200
+--- epiphany-webkit-2.27.0~svn.8837.orig/src/Makefile.am	2009-02-23 20:44:06.000000000 -0300
++++ epiphany-webkit-2.27.0~svn.8837/src/Makefile.am	2009-03-03 11:03:19.000000000 -0300
 @@ -106,8 +106,8 @@
  	-I$(top_srcdir)/lib/egg		\
  	-I$(top_srcdir)/lib/widgets   	\
@@ -64,7 +41,7 @@
  	-DDATADIR=\""$(pkgdatadir)"\" 	\
  	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
  	$(AM_CPPFLAGS)
-@@ -158,8 +158,8 @@
+@@ -173,8 +173,8 @@
  	-I$(top_builddir)/src		\
  	-I$(top_builddir)/src/bookmarks	\
  	$(PYTHON_INCLUDES)		\

Modified: desktop/experimental/epiphany-webkit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/rules?rev=18600&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/rules (original)
+++ desktop/experimental/epiphany-webkit/debian/rules Tue Mar  3 14:05:59 2009
@@ -50,6 +50,7 @@
 endif
 
 webkit_configure_flags := $(common_configure_flags) \
+		--libexecdir=\$${prefix}/lib/epiphany-webkit \
 		--enable-gtk-doc \
 		--enable-spell-checker