r28165 - in /desktop/experimental/epiphany-browser/debian: changelog control control.in patches/00_epiphany-browser.patch patches/11_browse_to.patch patches/series rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Thu Jun 2 11:18:52 UTC 2011 

Author: joss
Date: Thu Jun  2 11:18:52 2011
New Revision: 28165

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28165
Log:
* rules: create a new epiphany-newtab.desktop which is the handler for 
  x-scheme-handler/http{,s} and has NoDisplay=true.
* Drop epiphany-gecko and epiphany-webkit transitional packages.
* 11_browse_to.patch: new patch. Fix “browse to” feature, by looking 
  for inode/directory instead of x-directory/normal.

Added:
    desktop/experimental/epiphany-browser/debian/patches/11_browse_to.patch
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/patches/00_epiphany-browser.patch
    desktop/experimental/epiphany-browser/debian/patches/series
    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=28165&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog [utf-8] Thu Jun  2 11:18:52 2011
@@ -1,10 +1,12 @@
-epiphany-browser (3.0.2-2) UNRELEASED; urgency=low
-
-  * 00_epiphany-browser.patch: also start epiphany with -n option, 
-    because the MIME handling settings for x-scheme-http(s) don’t allow 
-    to set “open in a new tab” now, while it’s the reasonable setting.
-
- -- Josselin Mouette <joss at debian.org>  Thu, 02 Jun 2011 11:22:11 +0200
+epiphany-browser (3.0.2-2) experimental; urgency=low
+
+  * rules: create a new epiphany-newtab.desktop which is the handler for 
+    x-scheme-handler/http{,s} and has NoDisplay=true.
+  * Drop epiphany-gecko and epiphany-webkit transitional packages.
+  * 11_browse_to.patch: new patch. Fix “browse to” feature, by looking 
+    for inode/directory instead of x-directory/normal.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 02 Jun 2011 13:02:26 +0200
 
 epiphany-browser (3.0.2-1) experimental; urgency=low
 

Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=28165&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control [utf-8] Thu Jun  2 11:18:52 2011
@@ -129,20 +129,6 @@
  .
  This package contains detached debugging symbols.
 
-Package: epiphany-webkit
-Architecture: all
-Depends: epiphany-browser (>= 2.28.0), ${misc:Depends}
-Description: Dummy, transitional package
- This package has been made obsolete by epiphany-browser 2.28.0, and
- is safe to remove.
-
-Package: epiphany-gecko
-Architecture: all
-Depends: epiphany-browser (>= 2.28.0), ${misc:Depends}
-Description: Dummy, transitional package
- This package has been made obsolete by epiphany-browser 2.28.0, and
- is safe to remove.
-
 Package: gir1.2-epiphany-2.31
 Section: libs
 Architecture: any

Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=28165&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control.in [utf-8] Thu Jun  2 11:18:52 2011
@@ -124,20 +124,6 @@
  .
  This package contains detached debugging symbols.
 
-Package: epiphany-webkit
-Architecture: all
-Depends: epiphany-browser (>= 2.28.0), ${misc:Depends}
-Description: Dummy, transitional package
- This package has been made obsolete by epiphany-browser 2.28.0, and
- is safe to remove.
-
-Package: epiphany-gecko
-Architecture: all
-Depends: epiphany-browser (>= 2.28.0), ${misc:Depends}
-Description: Dummy, transitional package
- This package has been made obsolete by epiphany-browser 2.28.0, and
- is safe to remove.
-
 Package: gir1.2-epiphany-2.31
 Section: libs
 Architecture: any

Modified: desktop/experimental/epiphany-browser/debian/patches/00_epiphany-browser.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/00_epiphany-browser.patch?rev=28165&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/00_epiphany-browser.patch [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/00_epiphany-browser.patch [utf-8] Thu Jun  2 11:18:52 2011
@@ -20,7 +20,7 @@
  _X-GNOME-FullName=Epiphany Web Browser
  _Comment=Browse the web
 -Exec=epiphany %U
-+Exec=epiphany-browser -n %U
++Exec=epiphany-browser %U
  StartupNotify=true
  Terminal=false
  Type=Application

Added: desktop/experimental/epiphany-browser/debian/patches/11_browse_to.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/11_browse_to.patch?rev=28165&op=file
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/11_browse_to.patch (added)
+++ desktop/experimental/epiphany-browser/debian/patches/11_browse_to.patch [utf-8] Thu Jun  2 11:18:52 2011
@@ -1,0 +1,13 @@
+Index: epiphany-3.0.2/lib/ephy-file-helpers.c
+===================================================================
+--- epiphany-3.0.2.orig/lib/ephy-file-helpers.c	2011-06-02 13:00:53.564707857 +0200
++++ epiphany-3.0.2/lib/ephy-file-helpers.c	2011-06-02 13:00:59.488736819 +0200
+@@ -868,7 +868,7 @@ ephy_file_browse_to (GFile *file,
+ 
+ 	parent = g_file_get_parent (file);
+ 	/* TODO find a way to make nautilus scroll to the actual file */
+-	ret = ephy_file_launch_handler ("x-directory/normal",
++	ret = ephy_file_launch_handler ("inode/directory",
+ 					parent,
+ 					user_time);
+ 

Modified: desktop/experimental/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/series?rev=28165&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/series [utf-8] Thu Jun  2 11:18:52 2011
@@ -4,4 +4,5 @@
 05_libexecdir.patch
 07_bookmarks.patch
 10_smart_bookmarks.patch
+11_browse_to.patch
 12_safetypes.patch

Modified: desktop/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=28165&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/rules [utf-8] Thu Jun  2 11:18:52 2011
@@ -50,5 +50,10 @@
 	dh_installchangelogs -p$(cdbs_curpkg) ./ChangeLog
 	cd debian/epiphany-browser-data/usr/share/man/man1 \
 		&& mv epiphany.1 epiphany-browser.1
+	cd debian/epiphany-browser-data/usr/share/applications \
+		&& 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 's/@PACKAGEVERSION@/$(DEB_VERSION)/' debian/branding.conf.in \
 		> debian/epiphany-browser-data/usr/share/epiphany-browser/branding.conf

More information about the pkg-gnome-commits mailing list