r36432 - in /desktop/experimental/gedit/debian: changelog control control.in patches/01_gedit-bugreport-location.patch patches/03_no_gnu_gettext.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Sun Dec  9 23:57:03 2012
New Revision: 36432

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36432
Log:
New upstream release


Added:
    desktop/experimental/gedit/debian/patches/03_no_gnu_gettext.patch
Modified:
    desktop/experimental/gedit/debian/changelog
    desktop/experimental/gedit/debian/control
    desktop/experimental/gedit/debian/control.in
    desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch
    desktop/experimental/gedit/debian/patches/series

Modified: desktop/experimental/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/changelog?rev=36432&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/changelog [utf-8] (original)
+++ desktop/experimental/gedit/debian/changelog [utf-8] Sun Dec  9 23:57:03 2012
@@ -1,8 +1,15 @@
-gedit (3.4.2-2) UNRELEASED; urgency=low
-
+gedit (3.6.2-1) UNRELEASED; urgency=low
+
+  [ Josselin Mouette ]
   * gedit.prerm: don’t remove the alternative when upgrading.
 
- -- Josselin Mouette <joss at debian.org>  Sun, 23 Sep 2012 13:55:00 +0200
+  [ Andreas Henriksson ]
+  * New upstream release.
+    - bump libgtk-3-dev build-dependency to >= 3.6.0.
+    - update 01_gedit-bugreport-location.patch to apply.
+    - add 03_no_gnu_gettext.patch, stolen from ubuntu.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Sun, 09 Dec 2012 23:30:03 +0100
 
 gedit (3.4.2-1) unstable; urgency=low
 

Modified: desktop/experimental/gedit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/control?rev=36432&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/control [utf-8] (original)
+++ desktop/experimental/gedit/debian/control [utf-8] Sun Dec  9 23:57:03 2012
@@ -22,7 +22,7 @@
                libice-dev,
                libxml2-dev (>= 2.5.0),
                libglib2.0-dev (>= 2.28.0),
-               libgtk-3-dev (>= 3.3.15),
+               libgtk-3-dev (>= 3.6.0),
                libgtksourceview-3.0-dev (>= 3.0.0),
                libpeas-dev (>= 1.1.0),
                libx11-dev,

Modified: desktop/experimental/gedit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/control.in?rev=36432&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/control.in [utf-8] (original)
+++ desktop/experimental/gedit/debian/control.in [utf-8] Sun Dec  9 23:57:03 2012
@@ -17,7 +17,7 @@
                libice-dev,
                libxml2-dev (>= 2.5.0),
                libglib2.0-dev (>= 2.28.0),
-               libgtk-3-dev (>= 3.3.15),
+               libgtk-3-dev (>= 3.6.0),
                libgtksourceview-3.0-dev (>= 3.0.0),
                libpeas-dev (>= 1.1.0),
                libx11-dev,

Modified: desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch?rev=36432&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch [utf-8] (original)
+++ desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch [utf-8] Sun Dec  9 23:57:03 2012
@@ -1,7 +1,5 @@
-Index: gedit-3.4.1/data/gedit.desktop.in.in
-===================================================================
---- gedit-3.4.1.orig/data/gedit.desktop.in.in	2012-03-26 19:23:43.000000000 +0200
-+++ gedit-3.4.1/data/gedit.desktop.in.in	2012-04-16 19:38:06.483432794 +0200
+--- a/data/gedit.desktop.in.in
++++ b/data/gedit.desktop.in.in
 @@ -15,7 +15,7 @@
  X-GNOME-Bugzilla-Product=gedit
  X-GNOME-Bugzilla-Component=general
@@ -9,5 +7,5 @@
 -X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/gedit/gedit-bugreport.sh
 +X-GNOME-Bugzilla-ExtraInfoScript=@prefix@/share/gedit/gedit-bugreport
  Actions=Window;Document;
+ _Keywords=Text;
  
- [Desktop Action Window]

Added: desktop/experimental/gedit/debian/patches/03_no_gnu_gettext.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/patches/03_no_gnu_gettext.patch?rev=36432&op=file
==============================================================================
--- desktop/experimental/gedit/debian/patches/03_no_gnu_gettext.patch (added)
+++ desktop/experimental/gedit/debian/patches/03_no_gnu_gettext.patch [utf-8] Sun Dec  9 23:57:03 2012
@@ -1,0 +1,12 @@
+--- gedit-3.5.2/configure.ac	2012-08-31 04:44:10.000000000 +1200
++++ gedit-3.5.1/configure.ac	2012-08-31 10:54:01.373723220 +1200
+@@ -167,9 +167,6 @@
+ 
+ IT_PROG_INTLTOOL([0.40.0])
+ 
+-AM_GNU_GETTEXT_VERSION([0.18])
+-AM_GNU_GETTEXT([external])
+-
+ AC_SUBST([GETTEXT_PACKAGE], [gedit])
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [Define to the gettext package name.])
+ 

Modified: desktop/experimental/gedit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/patches/series?rev=36432&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gedit/debian/patches/series [utf-8] Sun Dec  9 23:57:03 2012
@@ -1,1 +1,2 @@
 01_gedit-bugreport-location.patch
+03_no_gnu_gettext.patch