r45236 - in /desktop/unstable/gedit/debian: ./ patches/

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Mon Jun 15 13:11:04 UTC 2015 

Author: biebl
Date: Mon Jun 15 13:11:03 2015
New Revision: 45236

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45236
Log:
Refresh patches, dropped the ones merged upstream.

Removed:
    desktop/unstable/gedit/debian/patches/10_external-tools_missing_column.patch
    desktop/unstable/gedit/debian/patches/11_quick-open_crash_IM.patch
    desktop/unstable/gedit/debian/patches/12_send-to-fpaste_path.patch
    desktop/unstable/gedit/debian/patches/13_window_size.patch
    desktop/unstable/gedit/debian/patches/14_css_leak.patch
    desktop/unstable/gedit/debian/patches/15_line_ending.patch
    desktop/unstable/gedit/debian/patches/16_highlightmode_dialog.patch
    desktop/unstable/gedit/debian/patches/17_various_leaks.patch
    desktop/unstable/gedit/debian/patches/18_print-preview_typo.patch
Modified:
    desktop/unstable/gedit/debian/changelog
    desktop/unstable/gedit/debian/patches/01_gedit-bugreport-location.patch
    desktop/unstable/gedit/debian/patches/03_no_gnu_gettext.patch
    desktop/unstable/gedit/debian/patches/08_multiarch_fallback.patch
    desktop/unstable/gedit/debian/patches/series

Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=45236&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gedit/debian/changelog	[utf-8] Mon Jun 15 13:11:03 2015
@@ -1,6 +1,7 @@
 gedit (3.16.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches, dropped the ones merged upstream.
 
  -- Michael Biebl <biebl at debian.org>  Mon, 15 Jun 2015 15:03:31 +0200
 

Modified: desktop/unstable/gedit/debian/patches/01_gedit-bugreport-location.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/01_gedit-bugreport-location.patch?rev=45236&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/01_gedit-bugreport-location.patch	[utf-8] (original)
+++ desktop/unstable/gedit/debian/patches/01_gedit-bugreport-location.patch	[utf-8] Mon Jun 15 13:11:03 2015
@@ -1,11 +1,13 @@
---- a/data/org.gnome.gedit.desktop.in.in
-+++ b/data/org.gnome.gedit.desktop.in.in
+Index: gedit-3.16.2/data/org.gnome.gedit.desktop.in.in
+===================================================================
+--- gedit-3.16.2.orig/data/org.gnome.gedit.desktop.in.in	2015-06-15 15:05:15.271907586 +0200
++++ gedit-3.16.2/data/org.gnome.gedit.desktop.in.in	2015-06-15 15:06:04.940662998 +0200
 @@ -15,7 +15,7 @@
  X-GNOME-Bugzilla-Product=gedit
  X-GNOME-Bugzilla-Component=general
  X-GNOME-Bugzilla-Version=@VERSION@
 -X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/gedit/gedit-bugreport.sh
 +X-GNOME-Bugzilla-ExtraInfoScript=@prefix@/share/gedit/gedit-bugreport
- Actions=Window;Document;
+ Actions=new-window;new-document;
  _Keywords=Text;Editor;
  DBusActivatable=true

Modified: desktop/unstable/gedit/debian/patches/03_no_gnu_gettext.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/03_no_gnu_gettext.patch?rev=45236&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/03_no_gnu_gettext.patch	[utf-8] (original)
+++ desktop/unstable/gedit/debian/patches/03_no_gnu_gettext.patch	[utf-8] Mon Jun 15 13:11:03 2015
@@ -1,6 +1,8 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -176,9 +176,6 @@
+Index: gedit-3.16.2/configure.ac
+===================================================================
+--- gedit-3.16.2.orig/configure.ac	2015-06-15 15:06:08.832722161 +0200
++++ gedit-3.16.2/configure.ac	2015-06-15 15:06:08.828722100 +0200
+@@ -190,9 +190,6 @@
  
  IT_PROG_INTLTOOL([0.50.1])
  

Modified: desktop/unstable/gedit/debian/patches/08_multiarch_fallback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/08_multiarch_fallback.patch?rev=45236&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/08_multiarch_fallback.patch	[utf-8] (original)
+++ desktop/unstable/gedit/debian/patches/08_multiarch_fallback.patch	[utf-8] Mon Jun 15 13:11:03 2015
@@ -1,8 +1,10 @@
 Description: Also load plugins from pre-multiarch directory
 Author: Jeremy Bicha <jbicha at ubuntu.com>
 Forwarded: not-needed
---- a/gedit/gedit-dirs.c
-+++ b/gedit/gedit-dirs.c
+Index: gedit-3.16.2/gedit/gedit-dirs.c
+===================================================================
+--- gedit-3.16.2.orig/gedit/gedit-dirs.c	2015-06-15 15:06:14.172803327 +0200
++++ gedit-3.16.2/gedit/gedit-dirs.c	2015-06-15 15:06:14.168803267 +0200
 @@ -36,6 +36,7 @@
  static gchar *gedit_locale_dir       = NULL;
  static gchar *gedit_lib_dir          = NULL;
@@ -42,8 +44,10 @@
  gedit_dirs_get_gedit_plugins_data_dir (void)
  {
  	return gedit_plugins_data_dir;
---- a/gedit/gedit-dirs.h
-+++ b/gedit/gedit-dirs.h
+Index: gedit-3.16.2/gedit/gedit-dirs.h
+===================================================================
+--- gedit-3.16.2.orig/gedit/gedit-dirs.h	2015-06-15 15:06:14.172803327 +0200
++++ gedit-3.16.2/gedit/gedit-dirs.h	2015-06-15 15:06:14.168803267 +0200
 @@ -48,6 +48,8 @@
  
  const gchar	*gedit_dirs_get_gedit_plugins_dir	(void);
@@ -53,9 +57,11 @@
  const gchar	*gedit_dirs_get_gedit_plugins_data_dir	(void);
  
  gchar		*gedit_dirs_get_ui_file			(const gchar *file);
---- a/gedit/gedit-plugins-engine.c
-+++ b/gedit/gedit-plugins-engine.c
-@@ -98,6 +98,10 @@
+Index: gedit-3.16.2/gedit/gedit-plugins-engine.c
+===================================================================
+--- gedit-3.16.2.orig/gedit/gedit-plugins-engine.c	2015-06-15 15:06:14.172803327 +0200
++++ gedit-3.16.2/gedit/gedit-plugins-engine.c	2015-06-15 15:06:14.168803267 +0200
+@@ -99,6 +99,10 @@
  	                             gedit_dirs_get_gedit_plugins_dir (),
  	                             gedit_dirs_get_gedit_plugins_data_dir ());
  

Modified: desktop/unstable/gedit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/series?rev=45236&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gedit/debian/patches/series	[utf-8] Mon Jun 15 13:11:03 2015
@@ -1,12 +1,3 @@
 01_gedit-bugreport-location.patch
 03_no_gnu_gettext.patch
 08_multiarch_fallback.patch
-10_external-tools_missing_column.patch
-11_quick-open_crash_IM.patch
-12_send-to-fpaste_path.patch
-13_window_size.patch
-14_css_leak.patch
-15_line_ending.patch
-16_highlightmode_dialog.patch
-17_various_leaks.patch
-18_print-preview_typo.patch

More information about the pkg-gnome-commits mailing list