r36454 - in /desktop/experimental/epiphany-browser/debian: changelog control control.in rules

Wed Dec 12 03:33:38 UTC 2012

Author: jbicha-guest
Date: Wed Dec 12 03:33:37 2012
New Revision: 36454

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36454
Log:
* Rename gir1.2-epiphany-3.4 -> gir1.2-epiphany-3.6
* Restore accidentally dropped changes from 3.4.2-2
* Rename epiphany.desktop to epiphany-browser.desktop so that the
  shell recognizes it.
* Break g-session and g-shell versions relying on this name.
* New upstream release.
* debian/patches/00_epiphany-browser.patch: Refreshed.
* debian/patches/01_email-as-user-for-password-remembering.patch: Removed,
  merged upstream.
* debian/patches/13_toolbar_size_fixes.patch: Removed, merged upstream.

Modified:
    desktop/experimental/epiphany-browser/debian/changelog
    desktop/experimental/epiphany-browser/debian/control
    desktop/experimental/epiphany-browser/debian/control.in
    desktop/experimental/epiphany-browser/debian/rules

Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=36454&op=diff
==============================================================================

--- desktop/experimental/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog [utf-8] Wed Dec 12 03:33:37 2012
@@ -1,6 +1,7 @@
 epiphany-browser (3.6.1-2) UNRELEASED; urgency=low
 
-  * Rename gir1.2-epiphany-3.4 -> gir1.2-epiphany-3.6.
+  * Rename gir1.2-epiphany-3.4 -> gir1.2-epiphany-3.6
+  * Restore accidentally dropped changes from 3.4.2-2
 
  -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 11 Dec 2012 22:13:41 -0500
 
@@ -31,6 +32,24 @@
     coverage feature
 
  -- Gustavo Noronha Silva <kov at debian.org>  Mon, 10 Dec 2012 11:40:01 +0100
+
+epiphany-browser (3.4.2-2) unstable; urgency=low
+
+  * Rename epiphany.desktop to epiphany-browser.desktop so that the
+    shell recognizes it.
+  * Break g-session and g-shell versions relying on this name.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 22 Sep 2012 14:07:14 +0200
+
+epiphany-browser (3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/00_epiphany-browser.patch: Refreshed.
+  * debian/patches/01_email-as-user-for-password-remembering.patch: Removed,
+    merged upstream.
+  * debian/patches/13_toolbar_size_fixes.patch: Removed, merged upstream.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 23 May 2012 07:22:50 +0200
 
 epiphany-browser (3.4.1-1) unstable; urgency=low
 

Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=36454&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control [utf-8] Wed Dec 12 03:33:37 2012
@@ -6,7 +6,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Jeremy Bicha <jbicha at ubuntu.com>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 8),
                cdbs (>= 0.4.90),
                dh-autoreconf,
@@ -63,7 +63,9 @@
             evince,
             ca-certificates
 Suggests: epiphany-extensions
-Breaks: epiphany-extensions (<< 2.30.0-4)
+Breaks: epiphany-extensions (<< 2.30.0-4),
+        gnome-session (<< 3.4.2.1-3),
+        gnome-shell (<< 3.4.2-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/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=36454&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control.in [utf-8] Wed Dec 12 03:33:37 2012
@@ -59,7 +59,9 @@
             evince,
             ca-certificates
 Suggests: epiphany-extensions
-Breaks: epiphany-extensions (<< 2.30.0-4)
+Breaks: epiphany-extensions (<< 2.30.0-4),
+        gnome-session (<< 3.4.2.1-3),
+        gnome-shell (<< 3.4.2-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/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=36454&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/rules [utf-8] Wed Dec 12 03:33:37 2012
@@ -46,7 +46,8 @@
 		&& sed -r 's/^(Exec=epiphany-browser)/\1 -n/' epiphany.desktop | grep -v ^MimeType > epiphany-newtab.desktop \
 		&& echo 'MimeType=x-scheme-handler/http;x-scheme-handler/https;' >> epiphany-newtab.desktop \
 		&& echo 'NoDisplay=true' >> epiphany-newtab.desktop \
-		&& sed -ri 's,x-scheme-handler/[^;]+;,,g' epiphany.desktop
+		&& sed -ri 's,x-scheme-handler/[^;]+;,,g' epiphany.desktop \
+		&& 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 \


