r43732 - in /desktop/unstable/epiphany-browser/debian: changelog control control.in epiphany-browser-data.install epiphany-browser.install rules
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Tue Oct 21 19:38:46 UTC 2014
Author: bigon
Date: Tue Oct 21 19:38:46 2014
New Revision: 43732
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43732
Log:
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
Modified:
desktop/unstable/epiphany-browser/debian/changelog
desktop/unstable/epiphany-browser/debian/control
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/rules
Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=43732&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Tue Oct 21 19:38:46 2014
@@ -8,12 +8,14 @@
* debian/rule: Pass --list-missing to dh_install
* debian/epiphany-browser.install, debian/epiphany-browser-data.install:
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
[ 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 19:06:18 +0200
+ -- Laurent Bigonville <bigon at debian.org> Tue, 21 Oct 2014 20:42:16 +0200
epiphany-browser (3.14.0-2) unstable; urgency=medium
Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=43732&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control [utf-8] Tue Oct 21 19:38:46 2014
@@ -61,12 +61,14 @@
swfdec-mozilla,
epiphany-extensions (<< 3.7.91)
Replaces: epiphany-gecko (<< 2.28),
- epiphany-webkit (<< 2.28)
+ epiphany-webkit (<< 2.28),
+ epiphany-browser-data (<< 3.14.1-1)
Recommends: yelp,
evince,
ca-certificates
Breaks: gnome-session (<< 3.4.2.1-3),
- gnome-shell (<< 3.4.2-1)
+ gnome-shell (<< 3.4.2-1),
+ epiphany-browser-data (<< 3.14.1-1)
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/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=43732&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in [utf-8] Tue Oct 21 19:38:46 2014
@@ -57,12 +57,14 @@
swfdec-mozilla,
epiphany-extensions (<< 3.7.91)
Replaces: epiphany-gecko (<< 2.28),
- epiphany-webkit (<< 2.28)
+ epiphany-webkit (<< 2.28),
+ epiphany-browser-data (<< 3.14.1-1)
Recommends: yelp,
evince,
ca-certificates
Breaks: gnome-session (<< 3.4.2.1-3),
- gnome-shell (<< 3.4.2-1)
+ gnome-shell (<< 3.4.2-1),
+ epiphany-browser-data (<< 3.14.1-1)
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=43732&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 19:38:46 2014
@@ -1,7 +1,6 @@
-usr/share/applications usr/share
-usr/share/dbus-1 usr/share
usr/share/epiphany-browser/[!m]* usr/share/epiphany-browser
usr/share/epiphany-browser/mime-types-permissions.xml etc/gnome/epiphany
+usr/share/GConf/gsettings usr/share/GConf
usr/share/glib-2.0 usr/share
usr/share/help usr/share
usr/share/locale 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=43732&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 19:38:46 2014
@@ -4,5 +4,6 @@
usr/lib/epiphany/*/web-extensions/*.so
usr/lib/epiphany-browser usr/lib
usr/share/appdata usr/share
+usr/share/applications usr/share
+usr/share/dbus-1 usr/share
usr/share/gnome-shell/search-providers usr/share/gnome-shell
-usr/share/GConf/gsettings usr/share/GConf
Modified: desktop/unstable/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/rules?rev=43732&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/rules [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/rules [utf-8] Tue Oct 21 19:38:46 2014
@@ -25,12 +25,12 @@
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
binary-post-install/epiphany-browser-data::
cd debian/epiphany-browser-data/usr/share/man/man1 \
&& mv epiphany.1 epiphany-browser.1
- cd debian/epiphany-browser-data/usr/share/applications \
- && mv epiphany.desktop epiphany-browser.desktop
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