This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository antlr3.2.
commit 06e7b84bf42f25c183c3d6ef9ef2caddbb68ec35 Author: Emmanuel Bourg <[email protected]> Date: Thu Sep 3 12:03:56 2015 +0200 Cloned the package as antlr3.2 --- debian/README.source | 4 +- debian/antlr3-doc.install | 2 - ...-doc.doc-base.api => antlr3.2-doc.doc-base.api} | 6 +-- debian/antlr3.2-doc.install | 2 + debian/antlr3.2.install | 1 + debian/antlr3.2.manpages | 1 + debian/{antlr3.poms => antlr3.2.poms} | 6 +-- debian/antlr3.install | 1 - debian/antlr3.manpages | 1 - debian/changelog | 4 +- debian/control | 44 +++++++++++++--------- debian/libantlr3-gunit-java-doc.doc-base.api | 10 ----- debian/libantlr3-gunit-java-doc.install | 2 - debian/libantlr3.2-gunit-java-doc.doc-base.api | 10 +++++ debian/libantlr3.2-gunit-java-doc.install | 2 + debian/maven.rules | 10 ++--- debian/orig-tar.sh | 2 +- debian/rules | 14 +++---- debian/scripts/{antlr3 => antlr3.2} | 2 +- debian/scripts/{antlr3.1 => antlr3.2.1} | 0 20 files changed, 68 insertions(+), 56 deletions(-) diff --git a/debian/README.source b/debian/README.source index dbc0033..25bd95c 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,5 +1,5 @@ -Information about antlr3 ------------------------------- +Information about antlr3.2 +-------------------------- This package was debianized using the mh_make command from the maven-debian-helper package. diff --git a/debian/antlr3-doc.install b/debian/antlr3-doc.install deleted file mode 100644 index 319171f..0000000 --- a/debian/antlr3-doc.install +++ /dev/null @@ -1,2 +0,0 @@ -target/site/apidocs/* usr/share/doc/antlr3/api - diff --git a/debian/antlr3-doc.doc-base.api b/debian/antlr3.2-doc.doc-base.api similarity index 60% rename from debian/antlr3-doc.doc-base.api rename to debian/antlr3.2-doc.doc-base.api index c7127c3..97ed674 100644 --- a/debian/antlr3-doc.doc-base.api +++ b/debian/antlr3.2-doc.doc-base.api @@ -1,4 +1,4 @@ -Document: antlr3-api +Document: antlr3.2-api Title: API Javadoc for ANTLR 3 Author: ANTLR developers Abstract: This is the API Javadoc provided for the @@ -6,5 +6,5 @@ Abstract: This is the API Javadoc provided for the Section: Programming Format: HTML -Index: /usr/share/doc/antlr3/api/index.html -Files: /usr/share/doc/antlr3/api/* +Index: /usr/share/doc/antlr3.2/api/index.html +Files: /usr/share/doc/antlr3.2/api/* diff --git a/debian/antlr3.2-doc.install b/debian/antlr3.2-doc.install new file mode 100644 index 0000000..c75cb78 --- /dev/null +++ b/debian/antlr3.2-doc.install @@ -0,0 +1,2 @@ +target/site/apidocs/* usr/share/doc/antlr3.2/api + diff --git a/debian/antlr3.2.install b/debian/antlr3.2.install new file mode 100644 index 0000000..1624749 --- /dev/null +++ b/debian/antlr3.2.install @@ -0,0 +1 @@ +debian/scripts/antlr3.2 /usr/bin diff --git a/debian/antlr3.2.manpages b/debian/antlr3.2.manpages new file mode 100644 index 0000000..adb5fc7 --- /dev/null +++ b/debian/antlr3.2.manpages @@ -0,0 +1 @@ +debian/scripts/antlr3.2.1 diff --git a/debian/antlr3.poms b/debian/antlr3.2.poms similarity index 90% rename from debian/antlr3.poms rename to debian/antlr3.2.poms index 26a9957..a95f631 100644 --- a/debian/antlr3.poms +++ b/debian/antlr3.2.poms @@ -28,6 +28,6 @@ pom.xml runtime/Java/pom.xml tool/pom.xml -antlr3-maven-plugin/pom.xml --package=antlr3-maven-plugin -gunit/pom.xml --package=libantlr3-gunit-java -gunit-maven-plugin/pom.xml --package=antlr3-gunit-maven-plugin +antlr3-maven-plugin/pom.xml --package=antlr3.2-maven-plugin +gunit/pom.xml --package=libantlr3.2-gunit-java +gunit-maven-plugin/pom.xml --package=antlr3.2-gunit-maven-plugin diff --git a/debian/antlr3.install b/debian/antlr3.install deleted file mode 100644 index 98cf6f8..0000000 --- a/debian/antlr3.install +++ /dev/null @@ -1 +0,0 @@ -debian/scripts/antlr3 /usr/bin diff --git a/debian/antlr3.manpages b/debian/antlr3.manpages deleted file mode 100644 index 29e298b..0000000 --- a/debian/antlr3.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/scripts/antlr3.1 diff --git a/debian/changelog b/debian/changelog index f018aea..730a884 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ -antlr3 (3.2-12) UNRELEASED; urgency=medium +antlr3.2 (3.2-12) UNRELEASED; urgency=medium + * Cloned the package as antlr3.2 since some packages are incompatible + with ANTLR 3.5 * debian/watch: Watch the release tags on Github * Use XZ compression for the upstream tarball diff --git a/debian/control b/debian/control index ce1638b..4d3ffef 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: antlr3 +Source: antlr3.2 Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> @@ -18,17 +18,19 @@ Build-Depends: bnd, libstringtemplate-java (>= 3.2.1), maven-debian-helper (>= 1.1) Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-java/antlr3.git -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/antlr3.git +Vcs-Git: git://anonscm.debian.org/pkg-java/antlr3.2.git +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/antlr3.2.git Homepage: http://www.antlr3.org -Package: antlr3 +Package: antlr3.2 Architecture: all Depends: default-jre-headless | java2-runtime-headless | java5-runtime-headless | java6-runtime-headless, libstringtemplate-java, ${misc:Depends} Recommends: ${maven:OptionalDepends} +Breaks: antlr3 (<< 3.3~) +Replaces: antlr3 (<< 3.3~) Description: language tool for constructing recognizers, compilers etc ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is a language tool that provides a framework for constructing recognizers, @@ -44,11 +46,13 @@ Description: language tool for constructing recognizers, compilers etc files (e.g., HTML, SGML). ANTLR is designed to handle all of your translation tasks. -Package: antlr3-doc +Package: antlr3.2-doc Architecture: all Section: doc Depends: default-jdk-doc, ${misc:Depends} -Suggests: libantlr3-java +Suggests: libantlr3.2-java +Breaks: antlr3-doc (<< 3.3~) +Replaces: antlr3-doc (<< 3.3~) Description: language tool for constructing compilers etc - documentation ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is a language tool that provides a framework for constructing recognizers, @@ -57,13 +61,15 @@ Description: language tool for constructing compilers etc - documentation . This package provides the API documentation for ANTLR 3 -Package: antlr3-maven-plugin +Package: antlr3.2-maven-plugin Architecture: all -Depends: antlr3 (>= ${source:Version}), +Depends: antlr3.2 (>= ${source:Version}), libmaven2-core-java, libplexus-compiler-java, ${misc:Depends} -Description: Maven plugin for ANTLR 3 +Breaks: antlr3-maven-plugin (<< 3.3~) +Replaces: antlr3-maven-plugin (<< 3.3~) +Description: Maven plugin for ANTLR 3.2 ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is a language tool that provides a framework for constructing recognizers, compilers, and translators from grammatical descriptions containing C++ @@ -72,10 +78,12 @@ Description: Maven plugin for ANTLR 3 This package provides the Maven plugin that supports compiling ANTLR 3 grammars during a Maven build -Package: libantlr3-gunit-java +Package: libantlr3.2-gunit-java Architecture: all -Depends: antlr3 (>= ${source:Version}), junit4, ${misc:Depends} -Suggests: antlr3-gunit-maven-plugin +Depends: antlr3.2 (>= ${source:Version}), junit4, ${misc:Depends} +Suggests: antlr3.2-gunit-maven-plugin +Breaks: libantlr3-gunit-java (<< 3.3~) +Replaces: libantlr3-gunit-java (<< 3.3~) Description: Unit Test framework for ANTLR grammars gUnit is a "Unit Test" framework for ANTLR grammars. It provides a simple way to write and run automated tests for ANTLR grammars in a manner similar @@ -90,11 +98,11 @@ Description: Unit Test framework for ANTLR grammars in your parser objects. The generator, on the other hand, translates your gUnit script to jUnit Java code that you can compile and execute by hand. -Package: libantlr3-gunit-java-doc +Package: libantlr3.2-gunit-java-doc Architecture: all Section: doc -Depends: antlr3-doc, junit4-doc, ${misc:Depends} -Suggests: libantlr3-gunit-java +Depends: antlr3.2-doc, junit4-doc, ${misc:Depends} +Suggests: libantlr3.2-gunit-java Description: API documentation for gUnit gUnit is a "Unit Test" framework for ANTLR grammars. It provides a simple way to write and run automated tests for ANTLR grammars in a manner similar @@ -111,12 +119,14 @@ Description: API documentation for gUnit . This package provides the API documentation for gUnit for ANTLR 3 -Package: antlr3-gunit-maven-plugin +Package: antlr3.2-gunit-maven-plugin Architecture: all -Depends: libantlr3-gunit-java (>= ${source:Version}), +Depends: libantlr3.2-gunit-java (>= ${source:Version}), libmaven2-core-java, libplexus-compiler-java, ${misc:Depends} +Breaks: antlr3-gunit-maven-plugin (<< 3.3~) +Replaces: antlr3-gunit-maven-plugin (<< 3.3~) Description: Maven plugin for gUnit, a unit test framework for ANTLR grammars gUnit is a "Unit Test" framework for ANTLR grammars. It provides a simple way to write and run automated tests for ANTLR grammars in a manner similar diff --git a/debian/libantlr3-gunit-java-doc.doc-base.api b/debian/libantlr3-gunit-java-doc.doc-base.api deleted file mode 100644 index 76c7acd..0000000 --- a/debian/libantlr3-gunit-java-doc.doc-base.api +++ /dev/null @@ -1,10 +0,0 @@ -Document: libantlr3-gunit-java -Title: API Javadoc for gUnit for ANTLR 3 -Author: ANTLR developers -Abstract: This is the API Javadoc provided for the - gUnit testing framework for Antlr3. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libantlr3-gunit-java/api/index.html -Files: /usr/share/doc/libantlr3-gunit-java/api/* diff --git a/debian/libantlr3-gunit-java-doc.install b/debian/libantlr3-gunit-java-doc.install deleted file mode 100644 index 8fd5796..0000000 --- a/debian/libantlr3-gunit-java-doc.install +++ /dev/null @@ -1,2 +0,0 @@ -gunit/target/apidocs/* usr/share/doc/libantlr3-gunit-java/api - diff --git a/debian/libantlr3.2-gunit-java-doc.doc-base.api b/debian/libantlr3.2-gunit-java-doc.doc-base.api new file mode 100644 index 0000000..f0a5dc7 --- /dev/null +++ b/debian/libantlr3.2-gunit-java-doc.doc-base.api @@ -0,0 +1,10 @@ +Document: libantlr3.2-gunit-java +Title: API Javadoc for gUnit for ANTLR 3.2 +Author: ANTLR developers +Abstract: This is the API Javadoc provided for the + gUnit testing framework for Antlr3. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libantlr3.2-gunit-java/api/index.html +Files: /usr/share/doc/libantlr3.2-gunit-java/api/* diff --git a/debian/libantlr3.2-gunit-java-doc.install b/debian/libantlr3.2-gunit-java-doc.install new file mode 100644 index 0000000..e2efe0d --- /dev/null +++ b/debian/libantlr3.2-gunit-java-doc.install @@ -0,0 +1,2 @@ +gunit/target/apidocs/* usr/share/doc/libantlr3.2-gunit-java/api + diff --git a/debian/maven.rules b/debian/maven.rules index bafc722..ab11be3 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -3,12 +3,12 @@ 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/ * * +org.antlr antlr-master * * * * +org.antlr antlr-runtime * * * * +org.antlr antlr * * * * +org.antlr gunit * * * * +org.antlr stringtemplate * * * * diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 62a3a32..c574034 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -1,6 +1,6 @@ #!/bin/bash -TAR=../antlr3_$2.orig.tar.xz +TAR=../antlr3.2_$2.orig.tar.xz DIR=antlr-$2 ORIG_TAR=$3 diff --git a/debian/rules b/debian/rules index 88e5f63..309727f 100755 --- a/debian/rules +++ b/debian/rules @@ -19,12 +19,12 @@ DEB_MAVEN_ARGS := -DbuildNumber="debian-$(shell echo $(DEB_NOEPOCH_VERSION) | se before-mvn-build:: PLUGIN_ARGS += -Dmaven.test.skip=true -Duse.maven.repo.local=true before-mvn-build:: unpatch-poms cp -r debian/generated-sources/antlr3/* tool/src/main/java - mh_patchpoms -pantlr3 --debian-build --keep-pom-version -idebian/maven.bootstrap.ignoreRules --maven-repo=$(DEB_MAVEN_REPO) + mh_patchpoms -pantlr3.2 --debian-build --keep-pom-version -idebian/maven.bootstrap.ignoreRules --maven-repo=$(DEB_MAVEN_REPO) $(DEB_MAVEN_INVOKE) $(PLUGIN_ARGS) -N $(DEB_MAVEN_BUILD_TARGET) $(DEB_MAVEN_INSTALL_TARGET) cd runtime/Java && $(DEB_MAVEN_INVOKE) $(PLUGIN_ARGS) $(DEB_MAVEN_BUILD_TARGET) $(DEB_MAVEN_INSTALL_TARGET) cd tool && $(DEB_MAVEN_INVOKE) $(PLUGIN_ARGS) $(DEB_MAVEN_BUILD_TARGET) $(DEB_MAVEN_INSTALL_TARGET) cd antlr3-maven-plugin && $(DEB_MAVEN_INVOKE) $(PLUGIN_ARGS) $(DEB_MAVEN_BUILD_TARGET) $(DEB_MAVEN_INSTALL_TARGET) - mh_unpatchpoms -pantlr3 + mh_unpatchpoms -pantlr3.2 common-post-build-indep:: # Generate OSGi metadata @@ -33,11 +33,11 @@ common-post-build-indep:: bnd wrap -properties debian/antlr3-runtime.bnd -output runtime/Java/target/antlr-runtime-[0-9].[0-9].jar \ runtime/Java/target/antlr-runtime-[0-9].[0-9].jar -binary-post-install/antlr3:: - mh_linkrepojar -pantlr3 runtime/Java/pom.xml /usr/share/java/antlr3-runtime.jar - mh_linkrepojar -pantlr3 tool/pom.xml /usr/share/java/antlr3.jar - mh_linkrepojar -plibantlr3-gunit-java gunit/pom.xml /usr/share/java/antlr3-gunit.jar - dh_installman -pantlr3 +binary-post-install/antlr3.2:: + mh_linkrepojar -pantlr3.2 runtime/Java/pom.xml /usr/share/java/antlr3-runtime-3.2.jar + mh_linkrepojar -pantlr3.2 tool/pom.xml /usr/share/java/antlr3-3.2.jar + mh_linkrepojar -plibantlr3.2-gunit-java gunit/pom.xml /usr/share/java/antlr3-gunit-3.2.jar + dh_installman -pantlr3.2 clean:: mh_clean diff --git a/debian/scripts/antlr3 b/debian/scripts/antlr3.2 similarity index 70% rename from debian/scripts/antlr3 rename to debian/scripts/antlr3.2 index 7cfa489..b90e539 100755 --- a/debian/scripts/antlr3 +++ b/debian/scripts/antlr3.2 @@ -1,4 +1,4 @@ #!/bin/sh -CLASSPATH=/usr/share/java/stringtemplate.jar:/usr/share/java/antlr3.jar:/usr/share/java/antlr3-runtime.jar +CLASSPATH=/usr/share/java/stringtemplate.jar:/usr/share/java/antlr3-3.2.jar:/usr/share/java/antlr3-runtime-3.2.jar exec java -cp $CLASSPATH org.antlr.Tool "$@" diff --git a/debian/scripts/antlr3.1 b/debian/scripts/antlr3.2.1 similarity index 100% rename from debian/scripts/antlr3.1 rename to debian/scripts/antlr3.2.1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/antlr3.2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
