r34665 - in /desktop/unstable/epiphany-browser/debian: changelog patches/14_pkglibdir.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Apr 30 16:31:36 2012
New Revision: 34665

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34665
Log:
debian/patches/14_pkglibdir.patch: Use pkglibdir instead of hard-coding
the package name in the extensiondir path. We override the package name
in the Debian build to avoid file name clashes with the existing epiphany
package.

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

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=34665&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Mon Apr 30 16:31:36 2012
@@ -12,8 +12,12 @@
     have the same height, regardless of things like fonts.
     Patch cherry-picked from upstream Git.
   * debian/patches/00_epiphany-browser.patch: Refreshed.
-
- -- Michael Biebl <biebl at debian.org>  Mon, 30 Apr 2012 18:05:45 +0200
+  * debian/patches/14_pkglibdir.patch: Use pkglibdir instead of hard-coding
+    the package name in the extensiondir path. We override the package name
+    in the Debian build to avoid file name clashes with the existing epiphany
+    package.
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 30 Apr 2012 18:08:26 +0200
 
 epiphany-browser (3.4.0.1-2) experimental; urgency=low
 

Added: desktop/unstable/epiphany-browser/debian/patches/14_pkglibdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/14_pkglibdir.patch?rev=34665&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/14_pkglibdir.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/14_pkglibdir.patch [utf-8] Mon Apr 30 16:31:36 2012
@@ -1,0 +1,57 @@
+From 36bdf58d2d3701c9ca6e02ddd156ee216f72cedb Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Tue, 13 Mar 2012 23:40:11 +0100
+Subject: [PATCH] Use $(pkglibdir) instead of $(libdir)/epiphany
+
+to avoid hard coding the package name.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=672023
+---
+ data/epiphany.pc.in |    4 ++--
+ lib/Makefile.am     |    2 +-
+ src/Makefile.am     |    4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+Index: epiphany-3.4.1/data/epiphany.pc.in
+===================================================================
+--- epiphany-3.4.1.orig/data/epiphany.pc.in	2012-03-16 00:53:14.000000000 +0100
++++ epiphany-3.4.1/data/epiphany.pc.in	2012-04-30 18:14:32.162211511 +0200
+@@ -2,8 +2,8 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@/epiphany/@EPIPHANY_MAJOR@
+-extensionsdir=@libdir@/epiphany/@EPIPHANY_API_VERSION@/extensions
+-loaderdir=@libdir@/epiphany/@EPIPHANY_MAJOR@/loaders
++extensionsdir=@libdir@/@PACKAGE@/@EPIPHANY_API_VERSION@/extensions
++loaderdir=@libdir@/@PACKAGE@/@EPIPHANY_MAJOR@/loaders
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+ icondir=@datadir@/@PACKAGE@/icons
+Index: epiphany-3.4.1/lib/Makefile.am
+===================================================================
+--- epiphany-3.4.1.orig/lib/Makefile.am	2012-04-13 14:17:05.000000000 +0200
++++ epiphany-3.4.1/lib/Makefile.am	2012-04-30 18:14:52.718210781 +0200
+@@ -86,7 +86,7 @@
+ 	-DDATADIR="\"$(datadir)\""		\
+ 	-DSHARE_DIR=\"$(pkgdatadir)\" 		\
+ 	-DTOP_SRC_DATADIR=\"$(top_srcdir)/data\"          \
+-	-DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_API_VERSION)/extensions"\" 	\
++	-DEXTENSIONS_DIR=\""$(pkglibdir)/$(EPIPHANY_API_VERSION)/extensions"\" 	\
+ 	$(AM_CPPFLAGS)
+ 
+ libephymisc_la_CFLAGS = \
+Index: epiphany-3.4.1/src/Makefile.am
+===================================================================
+--- epiphany-3.4.1.orig/src/Makefile.am	2012-04-18 16:28:36.000000000 +0200
++++ epiphany-3.4.1/src/Makefile.am	2012-04-30 18:14:32.170211511 +0200
+@@ -95,8 +95,8 @@
+ 	-I$(top_srcdir)/lib/history	\
+ 	-I$(top_srcdir)/lib/widgets   	\
+ 	-I$(top_srcdir)/src/bookmarks   \
+-	-DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_API_VERSION)/extensions"\" 	\
+-	-DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\"		\
++	-DEXTENSIONS_DIR=\""$(pkglibdir)/$(EPIPHANY_API_VERSION)/extensions"\" 	\
++	-DLOADER_DIR=\""$(pkglibdir)/$(EPIPHANY_MAJOR)/loaders"\"		\
+ 	-DDATADIR=\""$(pkgdatadir)"\" 	\
+ 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
+ 	$(AM_CPPFLAGS)

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=34665&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series [utf-8] Mon Apr 30 16:31:36 2012
@@ -3,3 +3,4 @@
 07_bookmarks.patch
 12_safetypes.patch
 13_toolbar_size_fixes.patch
+14_pkglibdir.patch