r35115 - in /desktop/unstable/epiphany-browser/debian: changelog patches/00_epiphany-browser.patch patches/01_email-as-user-for-password-remembering.patch patches/13_toolbar_size_fixes.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed May 23 05:21:58 2012
New Revision: 35115

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35115
Log:
Update patches

Removed:
    desktop/unstable/epiphany-browser/debian/patches/01_email-as-user-for-password-remembering.patch
    desktop/unstable/epiphany-browser/debian/patches/13_toolbar_size_fixes.patch
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/patches/00_epiphany-browser.patch
    desktop/unstable/epiphany-browser/debian/patches/series

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=35115&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Wed May 23 05:21:58 2012
@@ -1,6 +1,10 @@
 epiphany-browser (3.4.2-1) UNRELEASED; 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:18:42 +0200
 

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=35115&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] Wed May 23 05:21:58 2012
@@ -1,9 +1,9 @@
-Index: epiphany-3.4.1/configure.ac
+Index: epiphany-3.4.2/configure.ac
 ===================================================================
---- epiphany-3.4.1.orig/configure.ac	2012-04-18 16:30:21.000000000 +0200
-+++ epiphany-3.4.1/configure.ac	2012-04-30 18:05:10.686231369 +0200
+--- epiphany-3.4.2.orig/configure.ac	2012-05-19 15:12:42.000000000 +0200
++++ epiphany-3.4.2/configure.ac	2012-05-23 07:19:29.199995381 +0200
 @@ -20,7 +20,7 @@
- m4_define([epiphany_version_micro],[1])
+ m4_define([epiphany_version_micro],[2])
  m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro])
  
 -AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
@@ -11,10 +11,10 @@
  
  AC_PREREQ([2.59])
  
-Index: epiphany-3.4.1/data/epiphany.desktop.in.in
+Index: epiphany-3.4.2/data/epiphany.desktop.in.in
 ===================================================================
---- epiphany-3.4.1.orig/data/epiphany.desktop.in.in	2012-03-26 17:59:35.000000000 +0200
-+++ epiphany-3.4.1/data/epiphany.desktop.in.in	2012-04-30 18:05:10.686231369 +0200
+--- epiphany-3.4.2.orig/data/epiphany.desktop.in.in	2012-03-26 17:59:35.000000000 +0200
++++ epiphany-3.4.2/data/epiphany.desktop.in.in	2012-05-23 07:19:29.203995381 +0200
 @@ -3,7 +3,7 @@
  _GenericName=Web Browser
  _X-GNOME-FullName=Epiphany Web Browser
@@ -24,10 +24,10 @@
  StartupNotify=true
  Terminal=false
  Type=Application
-Index: epiphany-3.4.1/src/ephy-main.c
+Index: epiphany-3.4.2/src/ephy-main.c
 ===================================================================
---- epiphany-3.4.1.orig/src/ephy-main.c	2012-04-18 16:28:36.000000000 +0200
-+++ epiphany-3.4.1/src/ephy-main.c	2012-04-30 18:05:10.694231364 +0200
+--- epiphany-3.4.2.orig/src/ephy-main.c	2012-05-19 15:09:26.000000000 +0200
++++ epiphany-3.4.2/src/ephy-main.c	2012-05-23 07:19:29.207995381 +0200
 @@ -317,7 +317,7 @@
    user_time = get_startup_id ();
  

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=35115&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series [utf-8] Wed May 23 05:21:58 2012
@@ -1,6 +1,4 @@
 00_epiphany-browser.patch
-01_email-as-user-for-password-remembering.patch
 07_bookmarks.patch
 12_safetypes.patch
-13_toolbar_size_fixes.patch
 14_pkglibdir.patch