← Back to branch summary

~barry/gedit/bug-788514

« back to all changes in this revision

Viewing changes to debian/patches/07_intltool.patch

  • Committer: Sebastien Bacher
  • Date: 2011-05-04 10:36:14 UTC
  • Revision ID: seb128@ubuntu.com-20110504103614-26pgl25lkfufs9z9
* Resynchronize on Debian, remaining diffs
  - Build-Depends on dh-autoreconf, gnome-common, liblaunchpad-integration
  - Conflicts gir1.2-gedit-3.0 for ppa upgrades, Debian ship the gir in gedit
  - don't Recommends python-gnome2
  - don't Build-Depends on libgconf2-dev nor libx11-dev
* debian/gedit.install:
  - install the gi override
* debian/rules:
  - Use autoreconf.mk
* New upstream release
* Updated build-dependencies
* Added gobject introspection integration
* debian/patches/03_python_path.patch
  debian/patches/04_link_against_libICE.patch
  debian/patches/10_pt_BR_po.patch:
  - Dropped obsolete patches
* debian/patches/90_autoreconf.patch
  debian/patches/99_ltmain_as-needed.patch:
  -  Refreshed
* Recommend yelp. Closes: #600055.
* 10_pt_BR_po.patch: fix an important mistake in the Brazilian 
  Portuguese translation. Closes: #603502.
* New upstream translation release.
* 90_autoreconf.patch: updated for the new version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/07_intltool.patch
1
1
Description: Don't use both Intltool and GNU gettext build system
2
 
Bug: http://bugs.gnome.org/627789
 
2
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=627789
3
3
 
4
 
Index: gedit-2.30.3/configure.ac
 
4
Index: gedit-3.0.0/configure.ac
5
5
===================================================================
6
 
--- gedit-2.30.3.orig/configure.ac      2010-08-24 12:07:56.998437000 +1000
7
 
+++ gedit-2.30.3/configure.ac   2010-08-24 12:08:17.918437001 +1000
8
 
@@ -155,8 +155,6 @@
 
6
--- gedit-3.0.0.orig/configure.ac
 
7
+++ gedit-3.0.0/configure.ac
 
8
@@ -166,9 +166,6 @@
9
9
 
10
10
 IT_PROG_INTLTOOL([0.40.0])
 
11
 
 
12
-AM_GNU_GETTEXT_VERSION([0.17])
 
13
-AM_GNU_GETTEXT([external])
 
14
-
11
15
 AC_SUBST([GETTEXT_PACKAGE], [gedit])
12
 
-AM_GNU_GETTEXT_VERSION([0.17])
13
 
-AM_GLIB_GNU_GETTEXT
14
16
 AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME], [Define to the gettext package name.])
15
17
 
16
 
 dnl ================================================================