Public Pastes
daily pastebin goal
11%
SHARE
TWEET

Untitled

a guest Jun 5th, 2015 272 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff -Nru epiphany-browser-3.16.1/debian/changelog epiphany-browser-3.16.1/debian/changelog
  2. --- epiphany-browser-3.16.1/debian/changelog    2015-06-02 15:50:43.000000000 +1000
  3. +++ epiphany-browser-3.16.1/debian/changelog    2015-06-06 07:41:35.000000000 +1000
  4. @@ -1,3 +1,17 @@
  5. +epiphany-browser (3.16.1-1ubuntu1) wily; urgency=low
  6. +
  7. +  * Merge from Debian unstable.  Remaining changes:
  8. +    - debian/patches/07_bookmarks.patch:
  9. +      Add Ubuntu-specific default bookmarks, borrowed from Firefox
  10. +    - debian/patches/81_ubuntu_force_update_bookmarks_menu.patch:
  11. +      update the bookmarks menu every time the internal structure
  12. +      is changed (needed for the indicator application menu to work
  13. +      correctly).
  14. +    - debian/patches/ubuntu_titlebars.patch: Use traditional titlebars
  15. +      for non-GNOME sessions
  16. +
  17. + -- Jackson Doak <noskcaj@ubuntu.com>  Tue, 02 Jun 2015 10:42:34 +0000
  18. +
  19.  epiphany-browser (3.16.1-1) unstable; urgency=medium
  20.  
  21.    * New upstream release.
  22. @@ -10,6 +24,21 @@
  23.  
  24.   -- Michael Biebl <biebl@debian.org>  Tue, 02 Jun 2015 07:50:41 +0200
  25.  
  26. +epiphany-browser (3.14.2-0ubuntu1) vivid; urgency=medium
  27. +
  28. +  * New upstream release.
  29. +  * Merge from debian. Remaining changes:
  30. +    - debian/patches/07_bookmarks.patch:
  31. +      Add Ubuntu-specific default bookmarks, borrowed from Firefox
  32. +    - debian/patches/81_ubuntu_force_update_bookmarks_menu.patch:
  33. +      update the bookmarks menu every time the internal structure
  34. +      is changed (needed for the indicator application menu to work
  35. +      correctly).
  36. +    - debian/patches/ubuntu_titlebars.patch: Use traditional titlebars
  37. +      for non-GNOME sessions
  38. +
  39. + -- Jackson Doak <noskcaj@ubuntu.com>  Sun, 21 Dec 2014 10:19:27 +1100
  40. +
  41.  epiphany-browser (3.14.1-1) unstable; urgency=medium
  42.  
  43.    [ Laurent Bigonville ]
  44. @@ -96,6 +125,34 @@
  45.  
  46.   -- Sjoerd Simons <sjoerd@debian.org>  Fri, 11 Apr 2014 23:16:25 +0200
  47.  
  48. +epiphany-browser (3.10.3-0ubuntu3) utopic; urgency=medium
  49. +
  50. +  * No change rebuild for gnome-desktop 3.12
  51. +
  52. + -- Tim Lunn <tim@feathertop.org>  Tue, 23 Sep 2014 08:23:13 +1000
  53. +
  54. +epiphany-browser (3.10.3-0ubuntu2) trusty; urgency=medium
  55. +
  56. +  * debian/patches/ubuntu_titlebars.patch: Use traditional titlebars
  57. +    for non-GNOME sessions (LP: #1263387)
  58. +
  59. + -- Tim Lunn <tim@feathertop.org>  Sun, 22 Dec 2013 11:03:08 +1100
  60. +
  61. +epiphany-browser (3.10.3-0ubuntu1) trusty; urgency=low
  62. +
  63. +  * New upstream release (LP: #1260942)
  64. +  * Sync with Debian. Remaining changes:
  65. +    - debian/patches/07_bookmarks.patch:
  66. +      Add Ubuntu-specific default bookmarks, borrowed from Firefox
  67. +    - debian/patches/81_ubuntu_force_update_bookmarks_menu.patch:
  68. +      update the bookmarks menu every time the internal structure
  69. +      is changed (needed for the indicator application menu to work
  70. +      correctly).
  71. +    - Don't depend on gnome-desktop3 3.10
  72. +   * debian/patches/00_epiphany-browser.patch: Refreshed
  73. +
  74. + -- Tim Lunn <tim@feathertop.org>  Sat, 14 Dec 2013 07:46:25 +1100
  75. +
  76.  epiphany-browser (3.10.1-2) UNRELEASED; urgency=low
  77.  
  78.    * debian/rules:
  79. @@ -123,6 +180,16 @@
  80.  
  81.   -- Sjoerd Simons <sjoerd@debian.org>  Sun, 03 Nov 2013 18:56:59 +0100
  82.  
  83. +epiphany-browser (3.8.2-4ubuntu1) trusty; urgency=low
  84. +
  85. +  * Resynchronize on Debian, remaining changes
  86. +  * debian/patches/07_bookmarks.patch:
  87. +    - Ubuntu-specific default bookmarks, borrowed from Firefox
  88. +  * debian/patches/81_ubuntu_force_update_bookmarks_menu.patch:
  89. +    - update the bookmarks on changes, needed for appmenu to work correctly
  90. +
  91. + -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 13 Nov 2013 11:39:29 +0100
  92. +
  93.  epiphany-browser (3.8.2-4) unstable; urgency=low
  94.  
  95.    * debian/rules:
  96. @@ -2614,3 +2681,4 @@
  97.    * Initial packaging from CVS.
  98.  
  99.   -- Edd Dumbill <ejad@debian.org>  Fri, 14 Feb 2003 23:05:40 +0000
  100. +
  101. diff -Nru epiphany-browser-3.16.1/debian/control epiphany-browser-3.16.1/debian/control
  102. --- epiphany-browser-3.16.1/debian/control      2015-06-02 15:58:17.000000000 +1000
  103. +++ epiphany-browser-3.16.1/debian/control      2015-06-06 07:43:50.000000000 +1000
  104. @@ -5,8 +5,9 @@
  105.  Source: epiphany-browser
  106.  Section: gnome
  107.  Priority: optional
  108. -Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
  109. -Uploaders: Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
  110. +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
  111. +XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
  112. +Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
  113.  Build-Depends: debhelper (>= 9),
  114.                 cdbs (>= 0.4.90),
  115.                 dh-autoreconf,
  116. diff -Nru epiphany-browser-3.16.1/debian/control.in epiphany-browser-3.16.1/debian/control.in
  117. --- epiphany-browser-3.16.1/debian/control.in   2015-06-02 15:45:54.000000000 +1000
  118. +++ epiphany-browser-3.16.1/debian/control.in   2015-06-02 20:42:26.000000000 +1000
  119. @@ -1,7 +1,8 @@
  120.  Source: epiphany-browser
  121.  Section: gnome
  122.  Priority: optional
  123. -Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
  124. +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
  125. +XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
  126.  Uploaders: @GNOME_TEAM@
  127.  Build-Depends: debhelper (>= 9),
  128.                 cdbs (>= 0.4.90),
  129. diff -Nru epiphany-browser-3.16.1/debian/patches/00_epiphany-browser.patch epiphany-browser-3.16.1/debian/patches/00_epiphany-browser.patch
  130. --- epiphany-browser-3.16.1/debian/patches/00_epiphany-browser.patch    2014-11-10 13:06:27.000000000 +1100
  131. +++ epiphany-browser-3.16.1/debian/patches/00_epiphany-browser.patch    2015-06-06 07:41:11.000000000 +1000
  132. @@ -1,6 +1,10 @@
  133. +---
  134. + configure.ac |    2 +-
  135. + 1 file changed, 1 insertion(+), 1 deletion(-)
  136. +
  137.  --- a/configure.ac
  138.  +++ b/configure.ac
  139. -@@ -20,7 +20,7 @@ m4_define([epiphany_version_minor],[14])
  140. +@@ -20,7 +20,7 @@ m4_define([epiphany_version_minor],[16])
  141.   m4_define([epiphany_version_micro],[1])
  142.   m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro])
  143.  
  144. diff -Nru epiphany-browser-3.16.1/debian/patches/07_bookmarks.patch epiphany-browser-3.16.1/debian/patches/07_bookmarks.patch
  145. --- epiphany-browser-3.16.1/debian/patches/07_bookmarks.patch   2014-09-23 23:39:06.000000000 +1000
  146. +++ epiphany-browser-3.16.1/debian/patches/07_bookmarks.patch   2015-06-02 20:42:26.000000000 +1000
  147. @@ -1,24 +1,31 @@
  148.  --- a/data/default-bookmarks.rdf.in
  149.  +++ b/data/default-bookmarks.rdf.in
  150. -@@ -34,4 +34,21 @@
  151. +@@ -34,4 +34,28 @@
  152.            https://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI -->
  153.       <_ephy:smartlink>https://duckduckgo.com/?q=%s&amp;t=epiphany</_ephy:smartlink>
  154.     </item>
  155. ++  <item rdf:about="http://www.ubuntu.com/">
  156. ++    <_title>Ubuntu</_title>
  157. ++    <_link>http://www.ubuntu.com/</_link>
  158. ++  </item>
  159. ++  <item rdf:about="https://wiki.ubuntu.com/">
  160. ++    <_title>Ubuntu Wiki (community-edited website)</_title>
  161. ++    <_link>https://wiki.ubuntu.com/</_link>
  162. ++  </item>
  163. ++  <item rdf:about="https://answers.launchpad.net/ubuntu/+addquestion">
  164. ++    <_title>Make a Support Request to the Ubuntu Community</_title>
  165. ++    <_link>https://answers.launchpad.net/ubuntu/+addquestion</_link>
  166. ++  </item>
  167.  +  <item rdf:about="http://www.debian.org/">
  168. -+    <_title>Debian</_title>
  169. ++    <_title>Debian (Ubuntu is based on Debian)</_title>
  170.  +    <_link>http://www.debian.org/</_link>
  171.  +  </item>
  172. ++  <item rdf:about="https://one.ubuntu.com/">
  173. ++    <_title>Ubuntu One - The personal cloud that brings your digital life together</_title>
  174. ++    <_link>https://one.ubuntu.com/</_link>
  175. ++  </item>
  176.  +  <item rdf:about="http://www.gnome.org/">
  177.  +    <_title>GNOME</_title>
  178.  +    <_link>http://www.gnome.org/</_link>
  179.  +  </item>
  180. -+  <item rdf:about="http://planet.debian.org/">
  181. -+    <_title>Planet Debian</_title>
  182. -+    <_link>http://planet.debian.org/</_link>
  183. -+  </item>
  184. -+  <item rdf:about="http://bugs.debian.org/">
  185. -+    <_title>Debian Bug Tracking System</_title>
  186. -+    <_link>http://bugs.debian.org/</_link>
  187. -+    <_ephy:smartlink>http://bugs.debian.org/%s</_ephy:smartlink>
  188. -+  </item>
  189.   </rdf:RDF>
  190. diff -Nru epiphany-browser-3.16.1/debian/patches/81_ubuntu_force_update_bookmarks_menu.patch epiphany-browser-3.16.1/debian/patches/81_ubuntu_force_update_bookmarks_menu.patch
  191. --- epiphany-browser-3.16.1/debian/patches/81_ubuntu_force_update_bookmarks_menu.patch  1970-01-01 10:00:00.000000000 +1000
  192. +++ epiphany-browser-3.16.1/debian/patches/81_ubuntu_force_update_bookmarks_menu.patch  2014-12-21 16:51:11.000000000 +1100
  193. @@ -0,0 +1,24 @@
  194. +Index: epiphany-3.5.4/src/bookmarks/ephy-bookmarks-ui.c
  195. +===================================================================
  196. +--- epiphany-3.5.4.orig/src/bookmarks/ephy-bookmarks-ui.c      2012-06-14 23:08:57.000000000 +1200
  197. ++++ epiphany-3.5.4/src/bookmarks/ephy-bookmarks-ui.c   2012-07-18 11:57:35.251652165 +1200
  198. +@@ -119,6 +119,9 @@
  199. +       }
  200. +
  201. +       g_string_truncate (bookmarks_menu_string, 0);
  202. ++      // Hack: Update the bookmarks menu with actual data, so that the
  203. ++      // Ubuntu global menu can update immediately
  204. ++      activate_bookmarks_menu (NULL, window);
  205. + }
  206. +
  207. + static void
  208. +@@ -233,6 +236,9 @@
  209. +       g_signal_connect_object (action, "activate",
  210. +                                G_CALLBACK (activate_bookmarks_menu),
  211. +                                G_OBJECT (window), 0);
  212. ++     
  213. ++      // Hack: update the menu immediately, for the Ubuntu bookmarks menu
  214. ++      activate_bookmarks_menu (NULL, window);
  215. + }
  216. +
  217. + void
  218. diff -Nru epiphany-browser-3.16.1/debian/patches/series epiphany-browser-3.16.1/debian/patches/series
  219. --- epiphany-browser-3.16.1/debian/patches/series       2014-10-11 09:12:04.000000000 +1100
  220. +++ epiphany-browser-3.16.1/debian/patches/series       2015-06-02 20:42:26.000000000 +1000
  221. @@ -1,3 +1,5 @@
  222.  00_epiphany-browser.patch
  223.  07_bookmarks.patch
  224.  12_safetypes.patch
  225. +81_ubuntu_force_update_bookmarks_menu.patch
  226. +ubuntu_titlebars.patch
  227. diff -Nru epiphany-browser-3.16.1/debian/patches/ubuntu_titlebars.patch epiphany-browser-3.16.1/debian/patches/ubuntu_titlebars.patch
  228. --- epiphany-browser-3.16.1/debian/patches/ubuntu_titlebars.patch       1970-01-01 10:00:00.000000000 +1000
  229. +++ epiphany-browser-3.16.1/debian/patches/ubuntu_titlebars.patch       2014-12-21 16:51:11.000000000 +1100
  230. @@ -0,0 +1,39 @@
  231. +From 716669f8d58efd5391ab7c8c8972615ada294a0f Mon Sep 17 00:00:00 2001
  232. +From: Yosef Or Boczko <yoseforb@gmail.com>
  233. +Date: Thu, 29 Aug 2013 22:34:37 +0300
  234. +Subject: wphy-window: Use the top bar GtkBox as titlebar
  235. +
  236. +The GtkEventBox is to ensure opacity (see
  237. +bug #706045).
  238. +
  239. +https://bugzilla.gnome.org/show_bug.cgi?id=706050
  240. +
  241. +Modified to only show titlebars under non-GNOME sessions
  242. +
  243. +---
  244. +
  245. +
  246. +Index: epiphany-browser-3.14.2/src/ephy-window.c
  247. +===================================================================
  248. +--- epiphany-browser-3.14.2.orig/src/ephy-window.c
  249. ++++ epiphany-browser-3.14.2/src/ephy-window.c
  250. +@@ -3240,9 +3240,18 @@ setup_toolbar (EphyWindow *window)
  251. +       EphyWindowPrivate *priv = window->priv;
  252. +       EphyEmbedShellMode app_mode;
  253. +       EphyTitleBox *title_box;
  254. ++      const char* session;
  255. +
  256. +       toolbar = ephy_toolbar_new (window);
  257. +-      gtk_window_set_titlebar (GTK_WINDOW (window), toolbar);
  258. ++      session = g_getenv ("XDG_CURRENT_DESKTOP");
  259. ++      if (session && strstr (session, "GNOME")) {
  260. ++              gtk_window_set_titlebar (GTK_WINDOW (window), toolbar);
  261. ++      } else {
  262. ++              gtk_box_pack_start (GTK_BOX (priv->main_vbox),
  263. ++                                  toolbar, FALSE, FALSE, 0);
  264. ++              gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (toolbar), FALSE);
  265. ++      }
  266. ++
  267. +       gtk_widget_show (toolbar);
  268. +
  269. +       app_mode = ephy_embed_shell_get_mode (ephy_embed_shell_get_default ());
RAW Paste Data
Top