diff -Nru gettext-0.18.1.1/debian/changelog gettext-0.18.1.1/debian/changelog --- gettext-0.18.1.1/debian/changelog 2012-06-07 15:38:07.000000000 +0530 +++ gettext-0.18.1.1/debian/changelog 2012-06-13 20:19:07.000000000 +0530 @@ -1,3 +1,17 @@ +gettext (0.18.1.1-9ubuntu1) quantal; urgency=low + + * Merge from Debian Unstable (LP: #1012705). Remaining Changes: + - Build Java components with gcj. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - Explicitly configure with --disable-csharp. + - Keep gettext.jar in /usr/share/gettext instead of moving it to + /usr/share/java. + - Drop autopoint recommends of gettext. It pulls in git and + other sizable packages which make the CDs explode. + - Mark gettext Multi-Arch: allowed. + + -- Vibhav Pant Wed, 13 Jun 2012 20:15:27 +0530 + gettext (0.18.1.1-9) unstable; urgency=low * Build with hardened build flags. @@ -6,6 +20,26 @@ -- Santiago Vila Thu, 07 Jun 2012 12:08:00 +0200 +gettext (0.18.1.1-8ubuntu1) quantal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build Java components with gcj. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - Explicitly configure with --disable-csharp. + - Keep gettext.jar in /usr/share/gettext instead of moving it to + /usr/share/java. + - Drop autopoint recommends of gettext. It pulls in git and + other sizable packages which make the CDs explode. + - Mark gettext Multi-Arch: allowed. + * Dropped changes, now upstream in Debian or fixed: + - Build with --no-as-needed, needs more work, as plugins are used. + - Make gettext explicitly depend on libgettextpo0 (= ${binary:Version}), + since there's no shlibs dependency but gettext still provides our -dev + package. + - Split libgettextpo0 out into a separate binary package for multiarch. + + -- James Page Mon, 28 May 2012 15:46:50 +0100 + gettext (0.18.1.1-8) unstable; urgency=low * Modified msgfmt to always create little endian .mo files. @@ -38,6 +72,46 @@ -- Santiago Vila Sat, 28 Apr 2012 18:40:40 +0200 +gettext (0.18.1.1-5ubuntu4) quantal; urgency=low + + * No-change rebuild with openjdk-7 as default-jdk. + + -- James Page Fri, 18 May 2012 11:38:56 +0100 + +gettext (0.18.1.1-5ubuntu3) precise; urgency=low + + * No-change rebuild to drop spurious libsfgcc1 dependency on armhf. + + -- Adam Conrad Fri, 02 Dec 2011 17:28:32 -0700 + +gettext (0.18.1.1-5ubuntu2) precise; urgency=low + + * Mark gettext Multi-Arch: allowed. + + -- Steve Langasek Sat, 05 Nov 2011 15:33:38 +0000 + +gettext (0.18.1.1-5ubuntu1) precise; urgency=low + + * Merge from Debian testing. Remaining changes: + - Build with --no-as-needed, needs more work, as plugins are used. + - Build Java components with gcj. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - Explicitly configure with --disable-csharp. + - Keep gettext.jar in /usr/share/gettext instead of moving it to + /usr/share/java. + - Drop autopoint recommends of gettext. It pulls in git and + other sizable packages which make the CDs explode. + * Dropped changes: + - Bump Replaces on gettext and Conflicts on autopoint: the affected + Ubuntu versions were only ever in a devel release, no need to carry + a delta. + * Split libgettextpo0 out into a separate binary package for multiarch. + * Make gettext explicitly depend on libgettextpo0 (= ${binary:Version}), + since there's no shlibs dependency but gettext still provides our -dev + package. + + -- Steve Langasek Thu, 20 Oct 2011 17:57:00 +0000 + gettext (0.18.1.1-5) unstable; urgency=low * Applied patch by Bruno Haible to teach xgettext about new scheme @@ -52,6 +126,23 @@ * Dropped obsolete -D_REENTRANT. Use --enable-threads instead. -- Santiago Vila Fri, 05 Aug 2011 15:47:34 +0200 + +gettext (0.18.1.1-3ubuntu1) natty; urgency=low + + * Merge from Debian testing (LP: #678161). Remaining changes: + - Build with --no-as-needed, needs more work, as plugins are used. + - Build Java components with gcj. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - Explicitly configure with --disable-csharp. + - Keep gettext.jar in /usr/share/gettext instead of moving it to + /usr/share/java. + - debian/control: + + Drop autopoint recommends of gettext. It pulls in git and + other sizable packages which make the CDs explode. + + Bump Replaces on gettext and Conflicts on autopoint to (<< 0.18-1) + rather than (<= 0.17-11), to accommodate previous Ubuntu versions. + + -- Jesper Larsen Sun, 21 Nov 2010 16:38:48 +0100 gettext (0.18.1.1-3) unstable; urgency=high @@ -66,6 +157,32 @@ transitional package. Closes: #595741. -- Santiago Vila Sat, 11 Sep 2010 13:11:40 +0200 + +gettext (0.18.1.1-1ubuntu3) natty; urgency=low + + * Build with --no-as-needed, needs more work, as plugins are used. + + -- Matthias Klose Sat, 20 Nov 2010 13:03:39 +0100 + +gettext (0.18.1.1-1ubuntu2) maverick; urgency=low + + * debian/control: Drop autopoint recommends of gettext. It pulls in git and + other sizable packages which make the CDs explode. + + -- Martin Pitt Mon, 02 Aug 2010 15:45:46 +0200 + +gettext (0.18.1.1-1ubuntu1) maverick; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Build Java components with gcj. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - Explicitly configure with --disable-csharp. + - Keep gettext.jar in /usr/share/gettext instead of moving it to + /usr/share/java. + * Bump Replaces on gettext and Conflicts on autopoint to (<< 0.18-1) + rather than (<= 0.17-11), to accommodate previous Ubuntu versions. + + -- Colin Watson Sun, 01 Aug 2010 16:50:03 -0500 gettext (0.18.1.1-1) unstable; urgency=low @@ -109,6 +226,21 @@ support upgrades which skip releases. -- Santiago Vila Tue, 18 May 2010 13:52:36 +0200 + +gettext (0.17-11ubuntu1) maverick; urgency=low + + * Resynchronise with Debian (LP: #577744). Remaining changes: + - Build Java components with gcj. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - gettext-tools/src/write-catalog.c: + - Add missing "mode" parameter to fix FTBFS. + - Use autoconf's preferred shell when invoking config.status. + - Explicitly configure with --disable-csharp. + - Keep gettext.jar in /usr/share/gettext instead of moving it to + /usr/share/java. + * Convert Ubuntu direct source changes to quilt patches (u01 and u02). + + -- Felix Geyer Sun, 09 May 2010 10:05:58 +0200 gettext (0.17-11) unstable; urgency=low @@ -140,6 +272,33 @@ as they don't have openjdk yet. Closes: #568390. -- Santiago Vila Sun, 14 Feb 2010 16:48:00 +0100 + +gettext (0.17-8ubuntu3) lucid; urgency=low + + * rebuild rest of main for armel armv7/thumb2 optimization; + UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 + + -- Alexander Sack Fri, 05 Mar 2010 04:34:20 +0100 + +gettext (0.17-8ubuntu2) karmic; urgency=low + + * No change rebuild to fix misbuilt binaries on armel. + + -- Loïc Minier Wed, 21 Oct 2009 14:42:47 +0200 + +gettext (0.17-8ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Build Java components with gcj. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - gettext-tools/src/write-catalog.c: + - add missing "mode" parameter to fix FTBFS (from upstream CVS) + - Build-depend on default-jre/-jdk. + - debian/rules: Configure with JAVAC pointing to default-jdk. + - Use autoconf's preferred shell when invoking config.status. + * Explicitly configure with --disable-csharp. + + -- Colin Watson Tue, 06 Oct 2009 16:28:09 +0100 gettext (0.17-8) unstable; urgency=low @@ -164,6 +323,29 @@ * Really depend on libxml2 instead of using the embedded version. -- Santiago Vila Mon, 17 Aug 2009 18:08:54 +0200 + +gettext (0.17-6ubuntu2) jaunty; urgency=low + + * Cherry-pick df8857c0472c33bd786a967569c4b3c9c4c177b2 from upstream to use + autoconf's preferred shell when invoking config.status; LP: #332840. + + -- Loic Minier Tue, 03 Mar 2009 10:04:46 +0100 + +gettext (0.17-6ubuntu1) jaunty; urgency=low + + * Merge with Debian; remaining changes: + - Java components built with gcj instead of jikes-classpath + - Set GCJFLAGS to -fjni -findirect-dispatch. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - add lpia to list of mono-using arches, adjust build-deps + - remove hppa from list of java-using arches, adjust build-deps + - gettext-tools/src/write-catalog.c: + - add missing "mode" parameter to fix FTBFS (from upstream CVS) + - (Build-)depend on default-jre/-jdk. + - debian/rules: Configure with JAVAC pointing to default-jdk. + - debian/rules: Don't set GCJFLAGS. + + -- Matthias Klose Tue, 02 Dec 2008 01:43:19 +0000 gettext (0.17-6) unstable; urgency=low @@ -181,6 +363,22 @@ * po-mode: Do not duplicate headers with emacs23. Closes: #504356. -- Santiago Vila Fri, 28 Nov 2008 11:12:15 +0100 + +gettext (0.17-4ubuntu1) jaunty; urgency=low + + * Merge with Debian; remaining changes: + - Java components built with gcj instead of jikes-classpath + - Set GCJFLAGS to -fjni -findirect-dispatch. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - add lpia to list of mono-using arches, adjust build-deps + - remove hppa from list of java-using arches, adjust build-deps + - gettext-tools/src/write-catalog.c: + - add missing "mode" parameter to fix FTBFS (from upstream CVS) + - (Build-)depend on default-jre/-jdk. + - debian/rules: Configure with JAVAC pointing to default-jdk. + - debian/rules: Don't set GCJFLAGS. + + -- Matthias Klose Mon, 17 Nov 2008 09:28:48 +0000 gettext (0.17-4) unstable; urgency=low @@ -189,6 +387,27 @@ * Both patches by the author. -- Santiago Vila Wed, 27 Aug 2008 18:42:00 +0200 + +gettext (0.17-3ubuntu2) intrepid; urgency=low + + * (Build-)depend on default-jre/-jdk. + * debian/rules: Configure with JAVAC pointing to default-jdk. + * debian/rules: Don't set GCJFLAGS. + + -- Matthias Klose Thu, 31 Jul 2008 06:55:28 +0000 + +gettext (0.17-3ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Java components built with gcj instead of jikes-classpath + - Set GCJFLAGS to -fjni -findirect-dispatch. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - add lpia to list of mono-using arches, adjust build-deps + - remove hppa from list of java-using arches, adjust build-deps + * gettext-tools/src/write-catalog.c: + - add missing "mode" parameter to fix FTBFS (from upstream CVS) + + -- Michael Vogt Mon, 23 Jun 2008 10:02:11 +0200 gettext (0.17-3) unstable; urgency=low @@ -202,6 +421,18 @@ * Converted doc-base file to UTF-8. Moved to "Programming" section. -- Santiago Vila Thu, 12 Jun 2008 18:48:44 +0200 + +gettext (0.17-2ubuntu1) hardy; urgency=low + + * Merge with Debian; remaining changes: + * Remaining Ubuntu changes: + - Java components built with gcj instead of jikes-classpath + - Set GCJFLAGS to -fjni -findirect-dispatch. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - add lpia to list of mono-using arches, adjust build-deps + - remove hppa from list of java-using arches, adjust build-deps + + -- LaMont Jones Wed, 12 Dec 2007 21:12:04 -0700 gettext (0.17-2) unstable; urgency=medium @@ -222,6 +453,29 @@ * gettext tools are now under GPL version 3. -- Santiago Vila Sun, 25 Nov 2007 11:35:30 +0100 + +gettext (0.16.1-2ubuntu3) gutsy; urgency=low + + * Drop hppa from the list of java-using archs + + -- LaMont Jones Mon, 13 Aug 2007 15:35:45 -0600 + +gettext (0.16.1-2ubuntu2) gutsy; urgency=low + + * Add lpia to the list of mono-using arches, and adjust build-deps. + + -- Adam Conrad Tue, 31 Jul 2007 14:55:22 +1000 + +gettext (0.16.1-2ubuntu1) gutsy; urgency=low + + * Merge with Debian; remaining changes: + * Remaining Ubuntu changes: + - Build-depend on file, + - Java components built with gcj instead of jikes-classpath + - Set GCJFLAGS to -fjni -findirect-dispatch. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + + -- Matthias Klose Mon, 9 Jul 2007 16:22:21 +0200 gettext (0.16.1-2) unstable; urgency=low @@ -233,6 +487,27 @@ * Fixed typo in po-mode.el. Closes: #412656. -- Santiago Vila Mon, 2 Jul 2007 20:29:14 +0200 + +gettext (0.16.1-1ubuntu2) feisty; urgency=low + + * Rebuild for changes in the amd64 toolchain. + * Set Ubuntu maintainer address. + + -- Matthias Klose Mon, 5 Mar 2007 01:16:25 +0000 + +gettext (0.16.1-1ubuntu1) feisty; urgency=low + + * Merge to Debian unstable to bring in 0.16.1. This version is compatible + with automake 1.10 and also fixes the segfaults with lisp files. + * Remaining Ubuntu changes: + - Build-depend on file, + - Java components built with gcj instead of jikes-classpath + - Set GCJFLAGS to -fjni -findirect-dispatch. + - Install libintl.jar in /usr/share/java, keep a symlink in + /usr/share/gettext. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + + -- Martin Pitt Wed, 6 Dec 2006 11:16:41 +0100 gettext (0.16.1-1) unstable; urgency=low @@ -251,6 +526,28 @@ is currently uninstallable. -- Santiago Vila Fri, 3 Nov 2006 17:19:02 +0100 + +gettext (0.15-2ubuntu2) feisty; urgency=low + + * Rebuild for ldbl128 change on powerpc and sparc. + + -- Matthias Klose Thu, 2 Nov 2006 09:59:15 +0000 + +gettext (0.15-2ubuntu1) edgy; urgency=low + + * Merge from debian unstable, to fix #65063. Remaining changes: + - Build-depend on file, + - Mono components built with mono-mcs instead of pnet, + - Java components built with gcj instead of jikes-classpath + - Set GCJFLAGS to -fjni -findirect-dispatch. + - Install libintl.jar in /usr/share/java, keep a symlink in + /usr/share/gettext. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + + * Build-depend on java-gcj-compat-dev instead of gcj to get around bad + gcj detection in configure script. + + -- Scott James Remnant Thu, 12 Oct 2006 14:56:58 +0100 gettext (0.15-2) unstable; urgency=low @@ -273,6 +570,53 @@ See gnu.utils.bug for details. -- Santiago Vila Mon, 21 Aug 2006 18:45:14 +0200 + +gettext (0.14.6-1ubuntu6) edgy; urgency=low + + * Re-add build-dependency on gcj. + * Do not compile the native java binaries directly from the sources, + but from the class files. + * Set GCJFLAGS to -fjni -findirect-dispatch. + * Install libintl.jar in /usr/share/java, keep a symlink in + /usr/share/gettext. + * Finally, throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + + -- Matthias Klose Fri, 18 Aug 2006 11:38:31 +0000 + +gettext (0.14.6-1ubuntu5) edgy; urgency=low + + * Build-depend on file; the build dependency is mentioned in + 0.12.1-3, but apparently missing. + + -- Matthias Klose Tue, 15 Aug 2006 07:21:57 +0000 + +gettext (0.14.6-1ubuntu4) edgy; urgency=low + + * Do not try to install libintl.jar. + + -- Matthias Klose Tue, 15 Aug 2006 01:47:47 +0000 + +gettext (0.14.6-1ubuntu3) edgy; urgency=low + + * Temporarily remove build-dependency on gcj. + + -- Matthias Klose Tue, 15 Aug 2006 00:35:23 +0000 + +gettext (0.14.6-1ubuntu2) edgy; urgency=low + + * debian/control: + - replace pnet build dependency with mono as we won't have pnet in main + at least for edgy + * debian/rules: + - build GNU.Gettext.dll with mono instead of pnet + + -- Sebastian Dröge Mon, 10 Jul 2006 00:15:41 +0200 + +gettext (0.14.6-1ubuntu1) edgy; urgency=low + + * Resynchronize with Debian unstable. + + -- Matthias Klose Tue, 4 Jul 2006 11:53:33 +0000 gettext (0.14.6-1) unstable; urgency=low @@ -302,6 +646,25 @@ * Removed no longer required Build-Depends-Indep: texi2html. -- Santiago Vila Mon, 1 May 2006 19:11:56 +0200 + +gettext (0.14.5-2ubuntu3) dapper; urgency=low + + * Rebuild using gcj-4.1. + + -- Matthias Klose Wed, 22 Feb 2006 11:36:30 +0000 + +gettext (0.14.5-2ubuntu2) breezy; urgency=low + + * Build-depend on libgcj-dev. + + -- Matthias Klose Mon, 18 Jul 2005 20:26:07 +0200 + +gettext (0.14.5-2ubuntu1) breezy; urgency=low + + * Resynchronize with Debian. Ubuntu 12479. + * Reenable building the java bits using gcj. Ubuntu 10940. + + -- Matthias Klose Mon, 18 Jul 2005 16:59:36 +0000 gettext (0.14.5-2) unstable; urgency=low @@ -309,12 +672,31 @@ * Changed shlibs file accordingly. -- Santiago Vila Wed, 6 Jul 2005 17:30:10 +0200 + +gettext (0.14.5-1ubuntu2) breezy; urgency=low + + * No change build to cleanup erroneous /usr/share/info/dir.gz on hppa + + -- LaMont Jones Fri, 8 Jul 2005 11:57:19 -0600 + +gettext (0.14.5-1ubuntu1) breezy; urgency=low + + * Resynchronise with Debian, unscramble changelog. + + -- Martin Pitt Thu, 7 Jul 2005 08:55:35 +0000 gettext (0.14.5-1) unstable; urgency=low * New upstream release. -- Santiago Vila Mon, 6 Jun 2005 19:02:50 +0200 + +gettext (0.14.4-2ubuntu1) breezy; urgency=low + + * Disable jikes-classpath and gcj dependancies for now. Will + reenable these when they're available in main. + + -- Jeff Bailey Wed, 18 May 2005 19:48:40 +0000 gettext (0.14.4-2) unstable; urgency=medium @@ -896,21 +1278,14 @@ -- Santiago Vila Wed, 5 Feb 1997 20:24:45 +0100 Mon Sep 16 17:15:48 1996 Erick Branderhorst - * upgraded to mainstream 0.10.24 (not dsc yet) - Wed Jul 17 14:58:30 1996 Erick Branderhorst - * debian.rules (d): 2 * debian.rules: install unstripped libintl.a (reported by J.H.M. Dassen) - Mon Jul 8 19:44:27 1996 Erick Branderhorst - * upgraded to alpha 0.10.23 - Mon Jul 1 19:44:27 1996 Erick Branderhorst - * Semi public releases drove up the revision number to 3 (Sorry) * debian.rules (binary): for this moment back to static libs only, because this gettext code seems to be implemented with glibc @@ -918,27 +1293,18 @@ * debian.control: a gettext package entry * only package been provided right now from the gettext sources is the gettext package. - Sat Jun 22 11:18:48 1996 Erick Branderhorst - * debian.rules (binary): install so lib and symlinks * debian.rules (build): CFLAGS = -O2 -fPIC, so lib * debian.rules (build): no static -N linking - Fri Jun 21 15:02:24 1996 Erick Branderhorst - * mainstream alpha version 0.10.20 - Tue Jun 11 11:24:53 1996 Erick Branderhorst - * mainstream alpha version 0.10.19 - Tue Jun 11 11:24:53 1996 Erick Branderhorst - * updated nl.po * mainstream alpha version 0.10.16 * added README-alpha message in debian.README - Mon Jun 10 09:46:57 1996 Erick Branderhorst - * Initial debian release + diff -Nru gettext-0.18.1.1/debian/control gettext-0.18.1.1/debian/control --- gettext-0.18.1.1/debian/control 2012-06-07 15:30:00.000000000 +0530 +++ gettext-0.18.1.1/debian/control 2012-06-13 19:47:35.000000000 +0530 @@ -1,7 +1,8 @@ Source: gettext Section: devel Priority: optional -Maintainer: Santiago Vila +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Santiago Vila Standards-Version: 3.9.1 Build-Depends: libexpat1-dev, fastjar, default-jdk, file, libncurses5-dev, libxml2-dev, libglib2.0-dev, libcroco3-dev, git (>= 1:1.7.0.5), libunistring-dev Homepage: http://www.gnu.org/software/gettext/ @@ -17,8 +18,9 @@ Package: gettext Architecture: any +Multi-Arch: allowed Depends: ${shlibs:Depends}, libgettextpo0 (= ${binary:Version}), libasprintf0c2 (= ${binary:Version}), gettext-base, dpkg (>= 1.15.4) | install-info -Recommends: curl | wget | lynx-cur, autopoint +Recommends: curl | wget | lynx-cur Breaks: autopoint (<= 0.17-11) Suggests: gettext-doc Provides: libasprintf-dev, libgettextpo-dev diff -Nru gettext-0.18.1.1/debian/rules gettext-0.18.1.1/debian/rules --- gettext-0.18.1.1/debian/rules 2012-06-07 15:37:34.000000000 +0530 +++ gettext-0.18.1.1/debian/rules 2012-06-13 19:51:53.000000000 +0530 @@ -34,13 +34,15 @@ # CSHARP = --enable-csharp=mono # endif +CSHARP = --disable-csharp + NOJAVA_ARCHS = %none% build: cd debian && $(CC) glibc-test.c debian/a.out ./configure --prefix=/usr --enable-threads $(CSHARP) \ - --disable-native-java CC="$(CC)" CFLAGS="$(CFLAGS)" \ + CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ JAVAC=/usr/lib/jvm/default-java/bin/javac \ CPPFLAGS="$(CPPFLAGS) -I/usr/include/libxml2" \ CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" @@ -140,10 +142,8 @@ cp -a debian/tmp/usr/share/info debian/$@/usr/share cp -a debian/tmp/usr/share/aclocal debian/$@/usr/share cp -a debian/tmp/usr/share/gettext debian/$@/usr/share + rm -f debian/$@/usr/lib/gettext/gnu.gettext* rm -f debian/$@/usr/share/gettext/libintl.jar -ifeq (,$(findstring %$(DEB_HOST_ARCH)%,$(NOJAVA_ARCHS))) - mv debian/$@/usr/share/gettext/gettext.jar debian/$@/usr/share/java -endif rm -f debian/$@/usr/lib/GNU.Gettext.dll cp -a debian/tmp/usr/share/man/man1 debian/$@/usr/share/man cp -a debian/tmp/usr/share/locale debian/$@/usr/share