[Merge request] Please merge antlr 2.7.7-9 from Debian unstable

[Fabrice Coutadeur]

Binary package hint: antlr

Hi,

Please merge antlr 2.7.7-9 from Debian unstable.

Debian Changelog:
antlr (2.7.7-9) unstable; urgency=low

  * libantlr-java{,-gcj}: Fix typos in dependencies.

 -- Matthias Klose <email address hidden> Tue, 21 Oct 2008 01:08:32 +0200

antlr (2.7.7-8) unstable; urgency=low

  * Build a libantlr-java package, without dependency on a java runtime.
    Needed to bootstrap gcj without having a java runtime installed.
  * Rename antlr-gcj to libantlr-java-gcj.
  * Explicitely call javac with -source 1.4.

 -- Matthias Klose <email address hidden> Mon, 20 Oct 2008 08:01:58 +0200

antlr (2.7.7-7) unstable; urgency=low

  [Michael Koch]
  * Updated watch file to match only Antlr v2.

  [Matthias Klose]
  * antlr: Depend on default-jre-headless.
  * Don't directly build-depend on gcj.
  * Build a antlr-gcj package, replace cantlr with a shell script to use it.

 -- Matthias Klose <email address hidden> Sun, 12 Oct 2008 21:47:32 +0200

Ubuntu changelog:
antlr (2.7.7-6ubuntu4) intrepid-proposed; urgency=low

  * debian/control:
    - Change dependency of cantlr from antlr-gcj to libantlr-java-gcj
  * Closes LP: #290164

 -- Fabrice Coutadeur <email address hidden> Tue, 28 Oct 2008 07:20:56 +0100

antlr (2.7.7-6ubuntu3) intrepid; urgency=low

  * libantlr-java{,-gcj}: Fix typos in depedencies.

 -- Matthias Klose <email address hidden> Mon, 20 Oct 2008 15:08:28 +0000

antlr (2.7.7-6ubuntu2) intrepid; urgency=low

  * Build a libantlr-java package, without dependency on a java runtime.
    Needed to bootstrap gcj without having a java runtime installed.
  * Build a libantlr-java-gcj package, replace cantlr with a shell script to use it.
  * Explicitely call javac with -source 1.4. LP: #264808.

 -- Matthias Klose <email address hidden> Mon, 20 Oct 2008 10:43:13 +0200

antlr (2.7.7-6ubuntu1) intrepid; urgency=low

  * antlr: Depend on default-jre-headless.
  * Set Ubuntu maintainer address.

 -- Matthias Klose <email address hidden> Thu, 31 Jul 2008 10:08:46 +0000

[Fabrice Coutadeur (fabricesp)]

Debdiff between ubuntu version and Debian one:
diff -u antlr-2.7.7/debian/changelog antlr-2.7.7/debian/changelog
--- antlr-2.7.7/debian/changelog
+++ antlr-2.7.7/debian/changelog
@@ -1,32 +1,29 @@
-antlr (2.7.7-6ubuntu4) intrepid-proposed; urgency=low
+antlr (2.7.7-9) unstable; urgency=low

- * debian/control:
- - Change dependency of cantlr from antlr-gcj to libantlr-java-gcj
- * Closes LP: #290164
+ * libantlr-java{,-gcj}: Fix typos in dependencies.

- -- Fabrice Coutadeur <email address hidden> Tue, 28 Oct 2008 07:20:56 +0100
+ -- Matthias Klose <email address hidden> Tue, 21 Oct 2008 01:08:32 +0200

-antlr (2.7.7-6ubuntu3) intrepid; urgency=low
-
- * libantlr-java{,-gcj}: Fix typos in depedencies.
-
- -- Matthias Klose <email address hidden> Mon, 20 Oct 2008 15:08:28 +0000
-
-antlr (2.7.7-6ubuntu2) intrepid; urgency=low
+antlr (2.7.7-8) unstable; urgency=low

   * Build a libantlr-java package, without dependency on a java runtime.
     Needed to bootstrap gcj without having a java runtime installed.
- * Build a libantlr-java-gcj package, replace cantlr with a shell script to use it.
- * Explicitely call javac with -source 1.4. LP: #264808.
+ * Rename antlr-gcj to libantlr-java-gcj.
+ * Explicitely call javac with -source 1.4.
+
+ -- Matthias Klose <email address hidden> Mon, 20 Oct 2008 08:01:58 +0200

- -- Matthias Klose <email address hidden> Mon, 20 Oct 2008 10:43:13 +0200
+antlr (2.7.7-7) unstable; urgency=low

-antlr (2.7.7-6ubuntu1) intrepid; urgency=low
+ [Michael Koch]
+ * Updated watch file to match only Antlr v2.

+ [Matthias Klose]
   * antlr: Depend on default-jre-headless.
- * Set Ubuntu maintainer address.
+ * Don't directly build-depend on gcj.
+ * Build a antlr-gcj package, replace cantlr with a shell script to use it.

- -- Matthias Klose <email address hidden> Thu, 31 Jul 2008 10:08:46 +0000
+ -- Matthias Klose <email address hidden> Sun, 12 Oct 2008 21:47:32 +0200

 antlr (2.7.7-6) unstable; urgency=low

diff -u antlr-2.7.7/debian/control antlr-2.7.7/debian/control
--- antlr-2.7.7/debian/control
+++ antlr-2.7.7/debian/control
@@ -1,8 +1,7 @@
 Source: antlr
 Section: devel
 Priority: optional
-Maintainer: Ubuntu Core developers <email address hidden>
-XSBC-Original-Maintainer: Debian Java Maintainers <email address hidden>
+Maintainer: Debian Java Maintainers <email address hidden>
 Uploaders: Arnaud Vandyck <email address hidden>, John Leuner <email address hidden>, Michael Koch <email address hidden>, Barry Hawkins <email address hidden>
 Build-Depends: debhelper (>= 4), default-jdk-builddep, python, autotools-dev, python-all-dev (>= 2.3.5-11), sharutils
 Build-Depends-Indep: python-support (>= 0.3), nant, cli-common-dev (>= 0.4.4), mono-mcs (>= 1.0) | c-sharp-compiler
@@ -81,7 +80,7 @@
 Package: cantlr
 Section: devel
 Architecture: any
-Depends: gij, libantlr-java-gcj, ${shlibs:Depends}
+Depends: gij, antlr-gcj, ${shlibs:Depends}
 Description: language tool for constructing recognizers, compilers etc
  This is the native-compiled version of antlr. ANTLR stands for ANother
  Tool for Language Recognition, (formerly PCCTS). It is a language tool

[Fabrice Coutadeur (fabricesp)]

Debdiff with the proposed changes

[Fabrice Coutadeur (fabricesp)]

Forgot to merge changelog entries.
New debdiff with correct changelog

[Launchpad Janitor (janitor)]

This bug was fixed in the package antlr - 2.7.7-9ubuntu1

---------------
antlr (2.7.7-9ubuntu1) jaunty; urgency=low

  * Merge from Debian unstable. Remaining Ubuntu changes:
  * debian/control:
    - Change dependency of cantlr from antlr-gcj to libantlr-java-gcj
  * Closes LP: #296932

antlr (2.7.7-9) unstable; urgency=low

  * libantlr-java{,-gcj}: Fix typos in dependencies.

antlr (2.7.7-8) unstable; urgency=low

  * Build a libantlr-java package, without dependency on a java runtime.
    Needed to bootstrap gcj without having a java runtime installed.
  * Rename antlr-gcj to libantlr-java-gcj.
  * Explicitely call javac with -source 1.4.

antlr (2.7.7-7) unstable; urgency=low

  [Michael Koch]
  * Updated watch file to match only Antlr v2.

  [Matthias Klose]
  * antlr: Depend on default-jre-headless.
  * Don't directly build-depend on gcj.
  * Build a antlr-gcj package, replace cantlr with a shell script to use it.

 -- Fabrice Coutadeur <email address hidden> Sat, 08 Nov 2008 04:46:52 +0100