Merge lp:~james-page/ubuntu/oneiric/antlr/merge into lp:ubuntu/oneiric/antlr

[James Page]

Merge from Debian

[Dave Walker (davewalker)]

Looks great and builds fine! Uploading.

Thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-16 09:36:52 +0000
+++ debian/changelog	2011-06-17 09:25:20 +0000
@@ -1,3 +1,29 @@
+antlr (2.7.7-17ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable (LP: #798145); Remaining changes:
+    - Make libantlr-java only suggest libantlr-java-gcj.
+
+ -- James Page <[e-mail]>  Thu, 16 Jun 2011 11:55:26 +0100
+
+antlr (2.7.7-17) unstable; urgency=low
+
+  * Team upload.
+
+  [ Niels Thykier ]
+  * Bumped Stands-Versions to 3.9.0.
+    - Added some missing Breaks.
+  * Removed Arnaud Vandyck, John Leuner and Barry Hawkins from
+    uploaders. Thanks for your work on this package.
+  * Replaced B-D on default-jdk-builddep with gcj-native-helper
+    and default-jdk.
+
+  [ tony mancill ]
+  * Bumped Stands-Versions to 3.9.2. (no changes)
+  * Update debian/copyright format to DEP-5.
+  * Remove cantlr Depends on gij. (Closes: #628380)
+
+ -- tony mancill <[e-mail]>  Mon, 30 May 2011 12:46:57 -0700
+
 antlr (2.7.7-16ubuntu2) oneiric; urgency=low
 
   * No-change rebuild for mono 2.0-cil -> 4.0-cil transition
@@ -418,7 +444,7 @@
 
   * Created symlinks to antlr.debug.jar and antlrall.jar
     (Closes: #194953)
-	
+
  -- John Leuner <[e-mail]>  Mon, 18 Aug 2003 13:50:11 +0100
 
 antlr (2.7.2-1) unstable; urgency=low
@@ -512,7 +538,3 @@
   * Initial Release.
 
  -- John Leuner <[e-mail]>  Tue, 26 Dec 2000 15:07:44 +0000
-
-Local variables:
-mode: debian-changelog
-End:

=== modified file 'debian/control'
--- debian/control	2010-07-24 11:10:14 +0000
+++ debian/control	2011-06-17 09:25:20 +0000
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
-Uploaders: Arnaud Vandyck <[e-mail]>, John Leuner <[e-mail]>, Michael Koch <[e-mail]>, Barry Hawkins <[e-mail]>, Torsten Werner <[e-mail]>
-Build-Depends: debhelper (>= 7), default-jdk-builddep, python, autotools-dev, python-all-dev (>= 2.3.5-11), sharutils
+Uploaders: Torsten Werner <[e-mail]>
+Build-Depends: debhelper (>= 7), default-jdk, gcj-native-helper, python, autotools-dev, python-all-dev (>= 2.3.5-11), sharutils
 Build-Depends-Indep: maven-repo-helper, python-support (>= 0.3), nant, cli-common-dev (>= 0.7), mono-devel | c-sharp-compiler, libmono-winforms2.0-cil
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/antlr
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/antlr
 Homepage: http://www.antlr2.org/
@@ -35,6 +35,7 @@
 Depends: ${misc:Depends}
 Suggests: libantlr-java-gcj
 Replaces: antlr (<< 2.7.7-8)
+Breaks: antlr (<< 2.7.7-8)
 Description: language tool for constructing recognizers, compilers etc (java library)
  ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is 
  a language tool that provides a framework for constructing recognizers,
@@ -50,7 +51,7 @@
  ${shlibs:Depends}
 Replaces: antlr-gcj
 Description: language tool for constructing recognizers, compilers etc
- Native support for gij for antlr. ANTLR stands for ANother
+ Native support for gcj for antlr. ANTLR stands for ANother
  Tool for Language Recognition, (formerly PCCTS). It is  a language tool
  that provides a framework for constructing recognizers, compilers, and
  translators from grammatical descriptions containing C++
@@ -85,7 +86,10 @@
 Package: cantlr
 Section: devel
 Architecture: any
-Depends: ${misc:Depends}, gij, libantlr-java-gcj, ${shlibs:Depends}
+Depends: ${misc:Depends}, 
+ gcj-jre | gcj-jre-headless, 
+ libantlr-java-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
@@ -115,6 +119,7 @@
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
 Replaces: antlr (<< 2.7.7-10)
+Breaks: antlr (<< 2.7.7-10)
 Description: language tool for constructing recognizers, compilers etc
  This package contains the Python version of antlr. ANTLR stands for
  ANother Tool for Language Recognition, (formerly PCCTS).

=== modified file 'debian/copyright'
--- debian/copyright	2004-06-11 11:26:50 +0000
+++ debian/copyright	2011-06-17 09:25:20 +0000
@@ -1,27 +1,70 @@
-This package was debianized by John Leuner <[e-mail]> on
-Tue, 26 Dec 2000 15:07:44 +0000.
-
-It was downloaded from http://www.antlr.org/
-
-Upstream Author: Terence Parr <[e-mail]>
-
-Copyright:
-
-We reserve no legal rights to the ANTLR--it is fully in the public
-domain. An individual or company may do whatever they wish with source
-code distributed with ANTLR or the code generated by ANTLR, including
-the incorporation of ANTLR, or its output, into commercial software.
-
-We encourage users to develop software with ANTLR. However, we do ask
-that credit is given to us for developing ANTLR. By "credit", we mean
-that if you use ANTLR or incorporate any source code into one of your
-programs (commercial product, research project, or otherwise) that you
-acknowledge this fact somewhere in the documentation, research report,
-etc... If you like ANTLR and have developed a nice tool with the output,
-please mention that you developed it using ANTLR. In addition, we ask
-that the headers remain intact in our source code. As long as these
-guidelines are kept, we expect to continue enhancing this system and
-expect to make other tools available as they are completed.
-
-Terence Parr, jGuru.com
-
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Upstream-Name: ANTLRv2
+Upstream-Contact: Terence Parr <[e-mail]>
+Source: http://www.antlr2.org/
+
+Files: *
+Copyright: 1989-2011 Terence Parr <[e-mail]>
+License:
+ SOFTWARE RIGHTS
+ .
+ ANTLR 1989-2006 Developed by Terence Parr
+ Partially supported by University of San Francisco & jGuru.com
+ .
+ We reserve no legal rights to the ANTLR--it is fully in the
+ public domain. An individual or company may do whatever
+ they wish with source code distributed with ANTLR or the
+ code generated by ANTLR, including the incorporation of
+ ANTLR, or its output, into commerical software.
+ .
+ We encourage users to develop software with ANTLR. However,
+ we do ask that credit is given to us for developing
+ ANTLR. By "credit", we mean that if you use ANTLR or
+ incorporate any source code into one of your programs
+ (commercial product, research project, or otherwise) that
+ you acknowledge this fact somewhere in the documentation,
+ research report, etc... If you like ANTLR and have
+ developed a nice tool with the output, please mention that
+ you developed it using ANTLR. In addition, we ask that the
+ headers remain intact in our source code. As long as these
+ guidelines are kept, we expect to continue enhancing this
+ system and expect to make other tools available as they are
+ completed.
+ .
+ The primary ANTLR guy:
+ .
+ Terence Parr
+ [e-mail]
+ [e-mail]
+
+Files: debian/*
+Copyright: 2000-2011, John Leuner <[e-mail]>
+           2004-2011, Arnaud Vandyck <[e-mail]>
+           2005-2011, Michael Koch <[e-mail]> 
+           2005-2011, Barry Hawkins <[e-mail]>
+           2008-2011, Matthias Klose <[e-mail]>
+           2009-2011, Torsten Werner <[e-mail]>
+           2009-2011, Ludovic Claude <[e-mail]>
+           2010-2011, Niels Thykier <[e-mail]>
+           2011, tony mancill <[e-mail]>
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.