r53410 - in /desktop/unstable/epiphany-browser/debian: changelog patches/00_epiphany-browser.patch

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Sun Sep  3 17:10:02 2017
New Revision: 53410

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53410
Log:
Rebase 00_epiphany-browser.patch

Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/patches/00_epiphany-browser.patch

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=53410&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog	[utf-8] Sun Sep  3 17:10:02 2017
@@ -5,6 +5,7 @@
 
   [ Jeremy Bicha ]
   * New upstream release
+  * Rebase 00_epiphany-browser.patch
 
  -- Laurent Bigonville <bigon at debian.org>  Fri, 01 Sep 2017 14:02:19 +0200
 

Modified: desktop/unstable/epiphany-browser/debian/patches/00_epiphany-browser.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/00_epiphany-browser.patch?rev=53410&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/00_epiphany-browser.patch	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/00_epiphany-browser.patch	[utf-8] Sun Sep  3 17:10:02 2017
@@ -1,11 +1,21 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,7 +30,7 @@ AX_REQUIRE_DEFINED([YELP_HELP_INIT])
- dnl Must be a valid git tag
- m4_define([epiphany_changelog_start],[3.24.0])
+Description: Install as epiphany-browser not epiphany
+Author: Jeremy Bicha <jbicha at debian.org>
+---
+ meson.build |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/meson.build
++++ b/meson.build
+@@ -13,9 +13,9 @@ datadir = join_paths(prefix, get_option(
+ libdir = join_paths(prefix, get_option('libdir'))
+ libexecdir = join_paths(prefix, get_option('libexecdir'))
+ localedir = join_paths(prefix, get_option('localedir'))
+-pkgdatadir = join_paths(datadir, 'epiphany')
+-pkglibdir = join_paths(libdir, 'epiphany')
+-pkglibexecdir = join_paths(libexecdir, 'epiphany')
++pkgdatadir = join_paths(datadir, 'epiphany-browser')
++pkglibdir = join_paths(libdir, 'epiphany-browser')
++pkglibexecdir = join_paths(libexecdir, 'epiphany-browser')
+ webextensionsdir = join_paths(pkglibdir, 'web-extensions')
  
--AC_INIT([GNOME Web Browser],[3.24.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
-+AC_INIT([GNOME Web Browser],[3.24.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
- AX_IS_RELEASE([git-directory])
- 
- AC_PREREQ([2.69])
+ iso_codes = dependency('iso-codes')