lp:~knorr/ubuntu/natty/gettext/merge-from-squeeze

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/natty/gettext

Ubuntu branches: Pending requested 2010-11-21

Diff: 3232 lines (+3134/-6)

10 files modified

.pc/02-no-usr-share-info-dir-gz/gettext-runtime/libasprintf/Makefile.in (+1246/-0)
.pc/02-no-usr-share-info-dir-gz/gettext-tools/doc/Makefile.in (+1820/-0)
.pc/applied-patches (+1/-0)
debian/changelog (+36/-0)
debian/control (+1/-1)
debian/patches/02-no-usr-share-info-dir-gz (+24/-0)
debian/patches/series (+1/-0)
debian/rules (+3/-1)
gettext-runtime/libasprintf/Makefile.in (+1/-2)
gettext-tools/doc/Makefile.in (+1/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #678161: Merge gettext 0.18.1.1-3 (main) from Debian unstable (main)

Wishlist

Fix Released

Link a bug report

Related blueprints

37. By Jesper Larsen on 2010-11-25

Bump Replaces on gettext and Conflicts on autopoint to (<< 0.18-1)
rather than (<= 0.17-11), to accommodate previous Ubuntu versions.

36. By Jesper Larsen on 2010-11-24

Updated to merge with 0.18.1.1-1ubuntu3

 * Build with --no-as-needed, needs more work, as plugins are used.

35. By Jesper Larsen on 2010-11-21

Merge from Debian testing (LP: #678161). Remaining changes:

34. By Jesper Larsen on 2010-11-21

* Merge from Debian testing. 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.
  - debian/control: Drop autopoint recommends of gettext. It pulls in git and
    other sizable packages which make the CDs explode.
* Do not include /usr/share/info/dir.gz file in binary package if
  install-info is present during the build. Closes: #597407.
* Changed lynx to lynx-cur in gettext Recommends, as lynx is a dummy
  transitional package. Closes: #595741.

33. By Martin Pitt on 2010-08-02

debian/control: Drop autopoint recommends of gettext. It pulls in git and
other sizable packages which make the CDs explode.

32. By Colin Watson on 2010-08-01

releasing version 0.18.1.1-1ubuntu1

31. By Colin Watson on 2010-08-01

Bump Replaces on gettext and Conflicts on autopoint to (<< 0.18-1)
rather than (<= 0.17-11), to accommodate previous Ubuntu versions.

30. By Colin Watson on 2010-08-01

merge from Debian 0.18.1.1-1

29. By Felix Geyer on 2010-05-09

* 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).

28. By Alexander Sack on 2010-03-05

rebuild rest of main for armel armv7/thumb2 optimization;
UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2