r43733 - in /desktop/unstable/epiphany-browser/debian: changelog control.in epiphany-browser-data.install epiphany-browser.install epiphany-browser.links epiphany-browser.menu epiphany-browser.sh epiphany.sh patches/00_epiphany-browser.patch rules

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Tue Oct 21 21:10:28 UTC 2014 

Author: bigon
Date: Tue Oct 21 21:10:27 2014
New Revision: 43733

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43733
Log:
Rename the executable and the desktop file to the upstream name
(epiphany-browser → epiphany)

Added:
    desktop/unstable/epiphany-browser/debian/epiphany-browser.sh
      - copied, changed from r43732, desktop/unstable/epiphany-browser/debian/epiphany.sh
Removed:
    desktop/unstable/epiphany-browser/debian/epiphany.sh
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/control.in
    desktop/unstable/epiphany-browser/debian/epiphany-browser-data.install
    desktop/unstable/epiphany-browser/debian/epiphany-browser.install
    desktop/unstable/epiphany-browser/debian/epiphany-browser.links
    desktop/unstable/epiphany-browser/debian/epiphany-browser.menu
    desktop/unstable/epiphany-browser/debian/patches/00_epiphany-browser.patch
    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=43733&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog	[utf-8] Tue Oct 21 21:10:27 2014
@@ -10,12 +10,14 @@
     Install new search provider, appdata file and documentation
   * Move the .desktop file and the dbus service file to the main package, it
     doesn't really make sense to install them without the executable
+  * Rename the executable and the desktop file to the upstream name
+    (epiphany-browser → epiphany)
 
   [ Michael Biebl ]
   * Update Homepage URL.
   * Set pkg-gnome-maintainers at lists.alioth.debian.org as Maintainer.
 
- -- Laurent Bigonville <bigon at debian.org>  Tue, 21 Oct 2014 20:42:16 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 21 Oct 2014 23:08:31 +0200
 
 epiphany-browser (3.14.0-2) unstable; urgency=medium
 

Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=43733&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in	[utf-8] Tue Oct 21 21:10:27 2014
@@ -64,7 +64,8 @@
             ca-certificates
 Breaks: gnome-session (<< 3.4.2.1-3),
         gnome-shell (<< 3.4.2-1),
-        epiphany-browser-data (<< 3.14.1-1)
+        epiphany-browser-data (<< 3.14.1-1),
+        geoclue-2.0 (<< 2.1.9-2)
 Provides: www-browser, gnome-www-browser
 Description: Intuitive GNOME web browser
  Epiphany is a simple yet powerful GNOME web browser targeted at

Modified: desktop/unstable/epiphany-browser/debian/epiphany-browser-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/epiphany-browser-data.install?rev=43733&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/epiphany-browser-data.install	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/epiphany-browser-data.install	[utf-8] Tue Oct 21 21:10:27 2014
@@ -4,4 +4,3 @@
 usr/share/glib-2.0                                      usr/share
 usr/share/help                                          usr/share
 usr/share/locale                                        usr/share
-usr/share/man                                           usr/share

Modified: desktop/unstable/epiphany-browser/debian/epiphany-browser.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/epiphany-browser.install?rev=43733&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/epiphany-browser.install	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/epiphany-browser.install	[utf-8] Tue Oct 21 21:10:27 2014
@@ -1,4 +1,4 @@
-debian/epiphany.sh                       usr/bin
+debian/epiphany-browser.sh               usr/bin
 debian/bug/control                       usr/share/bug/epiphany-browser
 usr/bin                                  usr
 usr/lib/epiphany/*/web-extensions/*.so
@@ -7,3 +7,4 @@
 usr/share/applications                   usr/share
 usr/share/dbus-1                         usr/share
 usr/share/gnome-shell/search-providers   usr/share/gnome-shell
+usr/share/man                            usr/share

Modified: desktop/unstable/epiphany-browser/debian/epiphany-browser.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/epiphany-browser.links?rev=43733&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/epiphany-browser.links	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/epiphany-browser.links	[utf-8] Tue Oct 21 21:10:27 2014
@@ -1,2 +1,2 @@
-/usr/share/man/man1/epiphany-browser.1.gz /usr/share/man/man1/epiphany.1.gz
+/usr/share/man/man1/epiphany.1.gz /usr/share/man/man1/epiphany-browser.1.gz
 /usr/share/doc/epiphany-browser-data/changelog.gz /usr/share/doc/epiphany-browser/changelog.gz

Modified: desktop/unstable/epiphany-browser/debian/epiphany-browser.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/epiphany-browser.menu?rev=43733&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/epiphany-browser.menu	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/epiphany-browser.menu	[utf-8] Tue Oct 21 21:10:27 2014
@@ -2,5 +2,5 @@
 	section="Applications/Network/Web Browsing" \
 	title="Epiphany web browser" \
 	longtitle="Epiphany web browser" \
-	command="/usr/bin/epiphany-browser" \
+	command="/usr/bin/epiphany" \
 	hints="Web browsers"

Copied: desktop/unstable/epiphany-browser/debian/epiphany-browser.sh (from r43732, desktop/unstable/epiphany-browser/debian/epiphany.sh)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/epiphany-browser.sh?rev=43733&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/epiphany.sh	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/epiphany-browser.sh	[utf-8] Tue Oct 21 21:10:27 2014
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec epiphany-browser "$@"
+exec epiphany "$@"

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=43733&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] Tue Oct 21 21:10:27 2014
@@ -1,34 +1,3 @@
---- a/data/epiphany.desktop.in.in
-+++ b/data/epiphany.desktop.in.in
-@@ -4,7 +4,7 @@ _GenericName=Web Browser
- _X-GNOME-FullName=Epiphany Web Browser
- _Comment=Browse the web
- _Keywords=web;browser;internet;
--Exec=epiphany %U
-+Exec=epiphany-browser %U
- StartupNotify=true
- Terminal=false
- Type=Application
---- a/src/ephy-main.c
-+++ b/src/ephy-main.c
-@@ -310,7 +310,7 @@ main (int argc,
-   user_time = get_startup_id ();
- 
-   option_context = g_option_context_new ("");
--  option_group = g_option_group_new ("epiphany",
-+  option_group = g_option_group_new ("epiphany-browser",
-                                      N_("Web"),
-                                      N_("Web options"),
-                                      NULL, NULL);
-@@ -468,7 +468,7 @@ main (int argc,
-   } else {
-     mode = EPHY_EMBED_SHELL_MODE_BROWSER;
- 
--    g_set_prgname ("epiphany");
-+    g_set_prgname ("epiphany-browser");
-     g_set_application_name (_("Web"));
- 
-     gtk_window_set_default_icon_name ("web-browser");
 --- a/configure.ac
 +++ b/configure.ac
 @@ -20,7 +20,7 @@ m4_define([epiphany_version_minor],[14])

Modified: desktop/unstable/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/rules?rev=43733&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/rules	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/rules	[utf-8] Tue Oct 21 21:10:27 2014
@@ -23,14 +23,9 @@
 
 binary-post-install/epiphany-browser::
 	cd debian/epiphany-browser/usr/bin \
-		&& mv epiphany epiphany-browser \
-		&& mv epiphany.sh epiphany
-	cd debian/epiphany-browser/usr/share/applications \
-		&& mv epiphany.desktop epiphany-browser.desktop
+		&& mv epiphany-browser.sh epiphany-browser
 
 binary-post-install/epiphany-browser-data::
-	cd debian/epiphany-browser-data/usr/share/man/man1 \
-		&& mv epiphany.1 epiphany-browser.1
 	sed -i s/@PACKAGEVERSION@/$(DEB_VERSION)/ debian/branding.conf.in
 	sed -i s/@DISTROID@/`lsb_release -is`/ debian/branding.conf.in
 	sed -i s/@DISTROVERSION@/`lsb_release -rs`/ debian/branding.conf.in \

More information about the pkg-gnome-commits mailing list