[pkg-java] r16568 - trunk/antlr3/debian

Emmanuel Bourg ebourg-guest at alioth.debian.org
Thu Apr 25 15:17:58 UTC 2013


Author: ebourg-guest
Date: 2013-04-25 15:17:58 +0000 (Thu, 25 Apr 2013)
New Revision: 16568

Modified:
   trunk/antlr3/debian/antlr3.poms
   trunk/antlr3/debian/changelog
   trunk/antlr3/debian/control
   trunk/antlr3/debian/copyright
   trunk/antlr3/debian/maven.cleanIgnoreRules
   trunk/antlr3/debian/maven.ignoreRules
   trunk/antlr3/debian/maven.publishedRules
   trunk/antlr3/debian/maven.rules
   trunk/antlr3/debian/rules
   trunk/antlr3/debian/watch
Log:
Updated the watch file
Converted debian/copyright to the DEP5 format
Added a clean target to debian/rules to allow rebuilds
Updated Standards-Version to 3.9.4 (no changes)


Modified: trunk/antlr3/debian/antlr3.poms
===================================================================
--- trunk/antlr3/debian/antlr3.poms	2013-04-25 12:42:59 UTC (rev 16567)
+++ trunk/antlr3/debian/antlr3.poms	2013-04-25 15:17:58 UTC (rev 16568)
@@ -1,3 +1,30 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install. [mh_install]
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
+#
 pom.xml
 runtime/Java/pom.xml
 tool/pom.xml

Modified: trunk/antlr3/debian/changelog
===================================================================
--- trunk/antlr3/debian/changelog	2013-04-25 12:42:59 UTC (rev 16567)
+++ trunk/antlr3/debian/changelog	2013-04-25 15:17:58 UTC (rev 16568)
@@ -1,3 +1,13 @@
+antlr3 (3.2-8) unstable; urgency=low
+
+  * Team upload.
+  * Updated Standards-Version to 3.9.4 (no changes)
+  * Updated the watch file
+  * Converted debian/copyright to the DEP5 format
+  * Added a clean target to debian/rules to allow rebuilds
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 25 Apr 2013 15:42:16 +0200
+
 antlr3 (3.2-7) unstable; urgency=low
 
   * Team upload.

Modified: trunk/antlr3/debian/control
===================================================================
--- trunk/antlr3/debian/control	2013-04-25 12:42:59 UTC (rev 16567)
+++ trunk/antlr3/debian/control	2013-04-25 15:17:58 UTC (rev 16568)
@@ -2,16 +2,16 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
+Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk,
  maven-debian-helper (>= 1.1), libstringtemplate-java (>= 3.2.1),
  libantlr-maven-plugin-java (>= 2.1), libmaven-plugin-testing-java,
  libmaven-javadoc-plugin-java, libmaven-install-plugin-java,
  default-jdk-doc, libmaven-plugin-tools-java
-Standards-Version: 3.9.0
+Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/antlr3
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/antlr3
-Homepage: http://www.antlr.org/
+Homepage: http://www.antlr3.org/
 
 Package: antlr3
 Architecture: all

Modified: trunk/antlr3/debian/copyright
===================================================================
--- trunk/antlr3/debian/copyright	2013-04-25 12:42:59 UTC (rev 16567)
+++ trunk/antlr3/debian/copyright	2013-04-25 15:17:58 UTC (rev 16568)
@@ -1,38 +1,37 @@
-This package was debianized by John Leuner <jewel at debian.org> on
-Tue, 2 Mar 2008 17:26:37 +0000.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ANTLRv3
+Upstream-Contact: Terence Parr <parrt at antlr.org>
+Source: http://www.antlr3.org/
 
-It was downloaded from http://www.antlr.org/
-
-Upstream Author: Terence Parr <parrt at jguru.com>
-
-Copyright: (C) 2003-2008 Terence Parr
-
+Files: *
+Copyright: 2003-2008, Terence Parr <parrt at antlr.org>
 License:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+  3. The name of the author may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-     1. Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-     3. The name of the author may not be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-On Debian systems the complete text of the BSD license can be found in
-/usr/share/common-licenses/BSD.
+Files: debian/*
+Copyright: 2008, John Leuner <jewel at debian.org> 
+License: BSD
+ On Debian systems the complete text of the BSD license can be found in
+ /usr/share/common-licenses/BSD.

Modified: trunk/antlr3/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/antlr3/debian/maven.cleanIgnoreRules	2013-04-25 12:42:59 UTC (rev 16567)
+++ trunk/antlr3/debian/maven.cleanIgnoreRules	2013-04-25 15:17:58 UTC (rev 16568)
@@ -1,21 +1,2 @@
-# Maven clean ignore rules - ignore some Maven dependencies and plugins during the clean phase
-# Format of this file is:
-# [group] [artifact] [type] [version]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., this dependency is then removed
-# from the POM
-#   junit junit jar s/3\..*/3.x/
-org.antlr antlr3-maven-plugin maven-plugin *
-org.apache.maven.plugins maven-assembly-plugin maven-plugin *
-org.apache.maven.plugins maven-project-info-reports-plugin maven-plugin *
-org.apache.maven.wagon wagon-ssh-external jar *
-org.codehaus.mojo buildnumber-maven-plugin maven-plugin *
-org.codehaus.mojo findbugs-maven-plugin maven-plugin *
+
+org.antlr antlr3-maven-plugin maven-plugin * * *

Modified: trunk/antlr3/debian/maven.ignoreRules
===================================================================
--- trunk/antlr3/debian/maven.ignoreRules	2013-04-25 12:42:59 UTC (rev 16567)
+++ trunk/antlr3/debian/maven.ignoreRules	2013-04-25 15:17:58 UTC (rev 16568)
@@ -1,21 +1,6 @@
-# Maven ignore rules - ignore some Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., this dependency is then removed
-# from the POM
-#   junit junit jar s/3\..*/3.x/
-org.apache.maven.plugins maven-assembly-plugin maven-plugin *
-org.apache.maven.plugins maven-project-info-reports-plugin maven-plugin *
-org.apache.maven.wagon wagon-ssh-external jar *
-org.codehaus.mojo buildnumber-maven-plugin maven-plugin *
-org.codehaus.mojo findbugs-maven-plugin maven-plugin *
 
+org.apache.maven.plugins maven-assembly-plugin maven-plugin * * *
+org.apache.maven.plugins maven-project-info-reports-plugin maven-plugin * * *
+org.apache.maven.wagon wagon-ssh-external jar * * *
+org.codehaus.mojo buildnumber-maven-plugin maven-plugin * * *
+org.codehaus.mojo findbugs-maven-plugin maven-plugin * * *

Modified: trunk/antlr3/debian/maven.publishedRules
===================================================================
--- trunk/antlr3/debian/maven.publishedRules	2013-04-25 12:42:59 UTC (rev 16567)
+++ trunk/antlr3/debian/maven.publishedRules	2013-04-25 15:17:58 UTC (rev 16568)
@@ -1,18 +1,5 @@
-# Maven published rules - additional rules to publish, to help
-# the packaging work of Debian maintainers using mh_make
-# Format of this file is:
-# [group] [artifact] [type] [version]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-#   in this case, elements that match are transformed using
-#   the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match any dependency whose group is ant,
-# replacing it with org.apache.ant
-#   s/ant/org.apache.ant/ * * s/.*/debian/
+
+org.antlr antlr-master * s/3\..*/3.x/ * *
+org.antlr antlr-runtime * s/3\..*/3.x/ * *
+org.antlr antlr * s/3\..*/3.x/ * *
+org.antlr gunit * s/3\..*/3.x/ * *

Modified: trunk/antlr3/debian/maven.rules
===================================================================
--- trunk/antlr3/debian/maven.rules	2013-04-25 12:42:59 UTC (rev 16567)
+++ trunk/antlr3/debian/maven.rules	2013-04-25 15:17:58 UTC (rev 16568)
@@ -1,30 +1,14 @@
-# Maven rules - transform Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-#   in this case, elements that match are transformed using
-#   the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-#   junit junit jar s/3\..*/3.x/
-antlr antlr jar s/2\..*/2.x/ *
-junit junit jar s/4\..*/4.x/ *
-org.antlr antlr * s/3\..*/3.x/ *
-org.antlr antlr-master * s/3\..*/3.x/ *
-org.antlr antlr-runtime * s/3\..*/3.x/ *
-#org.antlr antlr-maven-plugin maven-plugin s/3\..*/3.2/ *
-org.antlr gunit * s/3\..*/3.x/ *
-org.antlr stringtemplate * s/3\..*/3.x/ *
-s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ *
-s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ *
-s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ *
-s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ *
 
+antlr antlr jar s/2\..*/2.x/ * *
+junit junit jar s/4\..*/4.x/ * *
+org.antlr stringtemplate jar s/3\..*/3.x/ * *
+org.codehaus.plexus plexus-compiler-api jar s/.*/debian/ * *
+org.antlr antlr-master * s/3\..*/3.x/ * *
+org.antlr antlr-runtime * s/3\..*/3.x/ * *
+org.antlr antlr * s/3\..*/3.x/ * *
+org.antlr gunit * s/3\..*/3.x/ * *
+org.antlr stringtemplate * s/3\..*/3.x/ * *
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ * *
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * *
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * *

Modified: trunk/antlr3/debian/rules
===================================================================
--- trunk/antlr3/debian/rules	2013-04-25 12:42:59 UTC (rev 16567)
+++ trunk/antlr3/debian/rules	2013-04-25 15:17:58 UTC (rev 16568)
@@ -34,5 +34,11 @@
 	mh_linkrepojar -plibantlr3-gunit-java gunit/pom.xml /usr/share/java/antlr3-gunit.jar
 	dh_installman -pantlr3
 
+clean::
+	rm -Rf antlr3-maven-plugin/target
+	rm -Rf gunit/target
+	rm -Rf gunit-maven-plugin/target
+	rm -Rf tool/target
+
 get-orig-source:
 		-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack

Modified: trunk/antlr3/debian/watch
===================================================================
--- trunk/antlr3/debian/watch	2013-04-25 12:42:59 UTC (rev 16567)
+++ trunk/antlr3/debian/watch	2013-04-25 15:17:58 UTC (rev 16568)
@@ -1,2 +1,2 @@
 version=3
-http://www.antlr.org/download/ /antlr-(.*)\.tar\.gz debian debian/orig-tar.sh
+http://www.antlr3.org/download/antlr-(.*)\.tar\.gz debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list