[groovy2] 01/02: Reverted to groovy as the package name
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon May 2 15:52:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository groovy2.
commit c3265f93b95c5f306696c5377aac8d55fa1b40c2
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon May 2 17:47:30 2016 +0200
Reverted to groovy as the package name
---
debian/changelog | 3 ++-
debian/control | 12 ++++-----
...roovy2-doc.doc-base.1 => groovy-doc.doc-base.1} | 6 ++---
...roovy2-doc.doc-base.2 => groovy-doc.doc-base.2} | 6 ++---
debian/{groovy2-doc.install => groovy-doc.install} | 4 +--
debian/{groovy2.install => groovy.install} | 20 +++++++-------
debian/groovy.links | 31 ++++++++++++++++++++++
debian/{groovy2.manpages => groovy.manpages} | 0
debian/{groovy2.postinst => groovy.postinst} | 8 ++----
debian/{groovy2.prerm => groovy.prerm} | 2 +-
debian/groovy2.links | 31 ----------------------
debian/maven.rules | 1 -
debian/orig-tar.sh | 2 +-
debian/patches/02_fix_start_script.diff | 2 +-
debian/rules | 28 +++++++++----------
15 files changed, 76 insertions(+), 80 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e149bbc..5d67339 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-groovy2 (2.4.5-2) UNRELEASED; urgency=medium
+groovy (2.4.5-2) UNRELEASED; urgency=medium
* Team upload.
+ * Reverted to groovy as the package name
* Depend on libasm-java (>= 5.0) instead of libasm4-java
* Removed the build dependency on libcobertura-java
* Standards-Version updated to 3.9.8 (no changes)
diff --git a/debian/control b/debian/control
index c22ab8a..08fcbd1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: groovy2
+Source: groovy
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
@@ -28,11 +28,11 @@ Build-Depends: ant,
testng,
bnd (>= 2.1.0)
Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/groovy2.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/groovy2.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/groovy.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/groovy.git
Homepage: http://www.groovy-lang.org
-Package: groovy2
+Package: groovy
Architecture: all
Depends: antlr,
default-jre-headless | java6-runtime-headless,
@@ -68,12 +68,12 @@ Description: Agile dynamic language for the Java Virtual Machine
dynamically as an alternative language such as for scripting Java objects,
templating or writing unit test cases.
-Package: groovy2-doc
+Package: groovy-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
Recommends: default-jdk-doc
-Suggests: groovy2
+Suggests: groovy
Description: Agile dynamic language for the Java Virtual Machine (documentation)
Groovy is an agile dynamic language for the JVM combining lots of great
features from languages like Python, Ruby and Smalltalk and making them
diff --git a/debian/groovy2-doc.doc-base.1 b/debian/groovy-doc.doc-base.1
similarity index 73%
rename from debian/groovy2-doc.doc-base.1
rename to debian/groovy-doc.doc-base.1
index ee05a23..e67799d 100644
--- a/debian/groovy2-doc.doc-base.1
+++ b/debian/groovy-doc.doc-base.1
@@ -1,4 +1,4 @@
-Document: groovy2-doc1
+Document: groovy-doc1
Title: Java API Documentation for Groovy
Author: Groovy Development Team (dev at groovy.codehaus.org)
Abstract: This manual is the Java API documentation for Groovy.
@@ -7,5 +7,5 @@ Abstract: This manual is the Java API documentation for Groovy.
Section: Programming
Format: HTML
-Index: /usr/share/doc/groovy2/api/index.html
-Files: /usr/share/doc/groovy2/api/*
+Index: /usr/share/doc/groovy/api/index.html
+Files: /usr/share/doc/groovy/api/*
diff --git a/debian/groovy2-doc.doc-base.2 b/debian/groovy-doc.doc-base.2
similarity index 67%
rename from debian/groovy2-doc.doc-base.2
rename to debian/groovy-doc.doc-base.2
index 423e7d4..82c1469 100644
--- a/debian/groovy2-doc.doc-base.2
+++ b/debian/groovy-doc.doc-base.2
@@ -1,9 +1,9 @@
-Document: groovy2-doc2
+Document: groovy-doc2
Title: Groovy API Documentation for Groovy developers
Author: Groovy Development Team (dev at groovy.codehaus.org)
Abstract: This manual is the Groovy API documentation for Groovy developers.
Section: Programming
Format: HTML
-Index: /usr/share/doc/groovy2/gapi/index.html
-Files: /usr/share/doc/groovy2/gapi/*
+Index: /usr/share/doc/groovy/gapi/index.html
+Files: /usr/share/doc/groovy/gapi/*
diff --git a/debian/groovy2-doc.install b/debian/groovy-doc.install
similarity index 94%
rename from debian/groovy2-doc.install
rename to debian/groovy-doc.install
index 3fc6cd7..1a5afcd 100644
--- a/debian/groovy2-doc.install
+++ b/debian/groovy-doc.install
@@ -1,2 +1,2 @@
-target/distributions/doc/groovy-*/html/api /usr/share/doc/groovy2
-target/distributions/doc/groovy-*/html/gapi /usr/share/doc/groovy2
+target/distributions/doc/groovy-*/html/api /usr/share/doc/groovy
+target/distributions/doc/groovy-*/html/gapi /usr/share/doc/groovy
diff --git a/debian/groovy2.install b/debian/groovy.install
similarity index 85%
rename from debian/groovy2.install
rename to debian/groovy.install
index 2318304..7d5f4b1 100644
--- a/debian/groovy2.install
+++ b/debian/groovy.install
@@ -1,10 +1,10 @@
-target/distributions/bin/groovy-*/bin/grape /usr/share/groovy2/bin
-target/distributions/bin/groovy-*/bin/groovy /usr/share/groovy2/bin
-target/distributions/bin/groovy-*/bin/groovyConsole /usr/share/groovy2/bin
-target/distributions/bin/groovy-*/bin/groovyc /usr/share/groovy2/bin
-target/distributions/bin/groovy-*/bin/groovydoc /usr/share/groovy2/bin
-target/distributions/bin/groovy-*/bin/groovysh /usr/share/groovy2/bin
-target/distributions/bin/groovy-*/bin/java2groovy /usr/share/groovy2/bin
-target/distributions/bin/groovy-*/bin/startGroovy /usr/share/groovy2/bin
-target/distributions/bin/groovy-*/conf/* /etc/groovy2
-target/distributions/bin/groovy-*/indy /usr/share/groovy2
+target/distributions/bin/groovy-*/bin/grape /usr/share/groovy/bin
+target/distributions/bin/groovy-*/bin/groovy /usr/share/groovy/bin
+target/distributions/bin/groovy-*/bin/groovyConsole /usr/share/groovy/bin
+target/distributions/bin/groovy-*/bin/groovyc /usr/share/groovy/bin
+target/distributions/bin/groovy-*/bin/groovydoc /usr/share/groovy/bin
+target/distributions/bin/groovy-*/bin/groovysh /usr/share/groovy/bin
+target/distributions/bin/groovy-*/bin/java2groovy /usr/share/groovy/bin
+target/distributions/bin/groovy-*/bin/startGroovy /usr/share/groovy/bin
+target/distributions/bin/groovy-*/conf/* /etc/groovy
+target/distributions/bin/groovy-*/indy /usr/share/groovy
diff --git a/debian/groovy.links b/debian/groovy.links
new file mode 100644
index 0000000..3254f65
--- /dev/null
+++ b/debian/groovy.links
@@ -0,0 +1,31 @@
+/etc/groovy /usr/share/groovy/conf
+/usr/share/groovy/man/man1/groovy.1.gz /usr/share/groovy/man/man1/groovyConsole.1.gz
+/usr/share/groovy/man/man1/groovy.1.gz /usr/share/groovy/man/man1/groovydoc.1.gz
+/usr/share/groovy/man/man1/groovy.1.gz /usr/share/groovy/man/man1/groovysh.1.gz
+/usr/share/groovy/man/man1/groovy.1.gz /usr/share/groovy/man/man1/java2groovy.1.gz
+/usr/share/groovy/man/man1/groovy.1.gz /usr/share/groovy/man/man1/startGroovy.1.gz
+/usr/share/java/ant-antlr.jar /usr/share/groovy/lib/ant-antlr.jar
+/usr/share/java/ant-junit.jar /usr/share/groovy/lib/ant-junit.jar
+/usr/share/java/ant-launcher.jar /usr/share/groovy/lib/ant-launcher.jar
+/usr/share/java/ant.jar /usr/share/groovy/lib/ant.jar
+/usr/share/java/antlr.jar /usr/share/groovy/lib/antlr.jar
+/usr/share/java/asm4-analysis.jar /usr/share/groovy/lib/asm4-analysis.jar
+/usr/share/java/asm4-commons.jar /usr/share/groovy/lib/asm4-commons.jar
+/usr/share/java/asm4-tree.jar /usr/share/groovy/lib/asm4-tree.jar
+/usr/share/java/asm4-util.jar /usr/share/groovy/lib/asm4-util.jar
+/usr/share/java/asm4.jar /usr/share/groovy/lib/asm4.jar
+/usr/share/java/bsf.jar /usr/share/groovy/lib/bsf.jar
+/usr/share/java/commons-cli.jar /usr/share/groovy/lib/commons-cli.jar
+/usr/share/java/commons-logging.jar /usr/share/groovy/lib/commons-logging.jar
+/usr/share/java/hamcrest-core.jar /usr/share/groovy/lib/hamcrest-core.jar
+/usr/share/java/ivy.jar /usr/share/groovy/lib/ivy.jar
+/usr/share/java/jansi.jar /usr/share/groovy/lib/jansi.jar
+/usr/share/java/jcommander.jar /usr/share/groovy/lib/jcommander.jar
+/usr/share/java/jline2.jar /usr/share/groovy/lib/jline2.jar
+/usr/share/java/jsp-api-2.1.jar /usr/share/groovy/lib/jsp-api-2.1.jar
+/usr/share/java/jsr166y.jar /usr/share/groovy/lib/jsr166y.jar
+/usr/share/java/junit4.jar /usr/share/groovy/lib/junit4.jar
+/usr/share/java/qdox.jar /usr/share/groovy/lib/qdox.jar
+/usr/share/java/servlet-api-2.5.jar /usr/share/groovy/lib/servlet-api-2.5.jar
+/usr/share/java/testng.jar /usr/share/groovy/lib/testng.jar
+/usr/share/java/xstream.jar /usr/share/groovy/lib/xstream.jar
diff --git a/debian/groovy2.manpages b/debian/groovy.manpages
similarity index 100%
rename from debian/groovy2.manpages
rename to debian/groovy.manpages
diff --git a/debian/groovy2.postinst b/debian/groovy.postinst
similarity index 72%
rename from debian/groovy2.postinst
rename to debian/groovy.postinst
index 437cd93..fbe6959 100644
--- a/debian/groovy2.postinst
+++ b/debian/groovy.postinst
@@ -1,13 +1,9 @@
#!/bin/sh
set -e
-GROOVY_HOME=/usr/share/groovy2
+GROOVY_HOME=/usr/share/groovy
MANDIR=/usr/share/man
-PRIORITY=10
-
-# I decided to assign a priority of 10 to groovy2 alternatives
-# and 20 to groovy ones since for jessie there is going to be
-# more software in the archive depending on groovy than on groovy2.
+PRIORITY=20
add_groovy_alternative() {
if [ x"" != "x$3" ]; then
diff --git a/debian/groovy2.prerm b/debian/groovy.prerm
similarity index 95%
rename from debian/groovy2.prerm
rename to debian/groovy.prerm
index 622a6cd..7d96f3a 100644
--- a/debian/groovy2.prerm
+++ b/debian/groovy.prerm
@@ -1,7 +1,7 @@
#!/bin/sh
set -e
-GROOVY_HOME=/usr/share/groovy2
+GROOVY_HOME=/usr/share/groovy
remove_groovy_alternatives() {
for cmd in groovy groovyc grape \
diff --git a/debian/groovy2.links b/debian/groovy2.links
deleted file mode 100644
index 3a0132f..0000000
--- a/debian/groovy2.links
+++ /dev/null
@@ -1,31 +0,0 @@
-/etc/groovy2 /usr/share/groovy2/conf
-/usr/share/groovy2/man/man1/groovy.1.gz /usr/share/groovy2/man/man1/groovyConsole.1.gz
-/usr/share/groovy2/man/man1/groovy.1.gz /usr/share/groovy2/man/man1/groovydoc.1.gz
-/usr/share/groovy2/man/man1/groovy.1.gz /usr/share/groovy2/man/man1/groovysh.1.gz
-/usr/share/groovy2/man/man1/groovy.1.gz /usr/share/groovy2/man/man1/java2groovy.1.gz
-/usr/share/groovy2/man/man1/groovy.1.gz /usr/share/groovy2/man/man1/startGroovy.1.gz
-/usr/share/java/ant-antlr.jar /usr/share/groovy2/lib/ant-antlr.jar
-/usr/share/java/ant-junit.jar /usr/share/groovy2/lib/ant-junit.jar
-/usr/share/java/ant-launcher.jar /usr/share/groovy2/lib/ant-launcher.jar
-/usr/share/java/ant.jar /usr/share/groovy2/lib/ant.jar
-/usr/share/java/antlr.jar /usr/share/groovy2/lib/antlr.jar
-/usr/share/java/asm4-analysis.jar /usr/share/groovy2/lib/asm4-analysis.jar
-/usr/share/java/asm4-commons.jar /usr/share/groovy2/lib/asm4-commons.jar
-/usr/share/java/asm4-tree.jar /usr/share/groovy2/lib/asm4-tree.jar
-/usr/share/java/asm4-util.jar /usr/share/groovy2/lib/asm4-util.jar
-/usr/share/java/asm4.jar /usr/share/groovy2/lib/asm4.jar
-/usr/share/java/bsf.jar /usr/share/groovy2/lib/bsf.jar
-/usr/share/java/commons-cli.jar /usr/share/groovy2/lib/commons-cli.jar
-/usr/share/java/commons-logging.jar /usr/share/groovy2/lib/commons-logging.jar
-/usr/share/java/hamcrest-core.jar /usr/share/groovy2/lib/hamcrest-core.jar
-/usr/share/java/ivy.jar /usr/share/groovy2/lib/ivy.jar
-/usr/share/java/jansi.jar /usr/share/groovy2/lib/jansi.jar
-/usr/share/java/jcommander.jar /usr/share/groovy2/lib/jcommander.jar
-/usr/share/java/jline2.jar /usr/share/groovy2/lib/jline2.jar
-/usr/share/java/jsp-api-2.1.jar /usr/share/groovy2/lib/jsp-api-2.1.jar
-/usr/share/java/jsr166y.jar /usr/share/groovy2/lib/jsr166y.jar
-/usr/share/java/junit4.jar /usr/share/groovy2/lib/junit4.jar
-/usr/share/java/qdox.jar /usr/share/groovy2/lib/qdox.jar
-/usr/share/java/servlet-api-2.5.jar /usr/share/groovy2/lib/servlet-api-2.5.jar
-/usr/share/java/testng.jar /usr/share/groovy2/lib/testng.jar
-/usr/share/java/xstream.jar /usr/share/groovy2/lib/xstream.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index ae70161..502cdb4 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,4 +1,3 @@
-org.codehaus.groovy * * s/.*/2.x/ * *
junit junit jar s/3\..*/3.x/ * *
junit junit jar s/4\..*/4.x/ * *
org.testng testng jar s/.*/6.x/ * *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index a745a03..f36ae96 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,7 +1,7 @@
#!/bin/sh -e
# called by uscan with '--upstream-version' <version> <file>
-TAR=../groovy2_$2+dfsg.orig.tar.xz
+TAR=../groovy_$2+dfsg.orig.tar.xz
DIR=groovy-$2
# clean up the upstream tarball
diff --git a/debian/patches/02_fix_start_script.diff b/debian/patches/02_fix_start_script.diff
index e62693f..7c9acdf 100644
--- a/debian/patches/02_fix_start_script.diff
+++ b/debian/patches/02_fix_start_script.diff
@@ -15,7 +15,7 @@ Last-Update: 2013-10-27
SCRIPT_PATH="$0"
+: ${JAVA_HOME:="/usr/lib/jvm/default-java"}
-+: ${GROOVY_HOME:="/usr/share/groovy2"}
++: ${GROOVY_HOME:="/usr/share/groovy"}
+
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
diff --git a/debian/rules b/debian/rules
index f613db8..99b6795 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,44 +27,44 @@ override_dh_auto_install:
# embeddable groovy-all jar with indy feature is not installed through maven
dh_install \
target/distributions/bin/groovy-$(VERSION)/embeddable/groovy-all-$(VERSION)-indy.jar \
- usr/share/groovy2/embeddable
+ usr/share/groovy/embeddable
# groovy core
- mh_installpom -o -v -pgroovy2 debian/poms/groovy.pom
- mh_installjar -pgroovy2 -l -s -j2.x debian/poms/groovy.pom target/libs/groovy-$(VERSION).jar
+ mh_installpom -o -v -pgroovy debian/poms/groovy.pom
+ mh_installjar -pgroovy -l -s debian/poms/groovy.pom target/libs/groovy-$(VERSION).jar
# groovy-all
- mh_installpom -o -v -pgroovy2 debian/poms/groovy-all.pom
- mh_installjar -pgroovy2 -l -s -j2.x debian/poms/groovy-all.pom \
+ mh_installpom -o -v -pgroovy debian/poms/groovy-all.pom
+ mh_installjar -pgroovy -l -s debian/poms/groovy-all.pom \
target/distributions/bin/groovy-$(VERSION)/embeddable/groovy-all-$(VERSION).jar
# all the remaining groovy modules
for MOD in $(MODULES); do \
- mh_installpom -o -v -pgroovy2 debian/poms/groovy-$$MOD.pom; \
- mh_installjar -pgroovy2 -j2.x debian/poms/groovy-$$MOD.pom \
+ mh_installpom -o -v -pgroovy debian/poms/groovy-$$MOD.pom; \
+ mh_installjar -pgroovy debian/poms/groovy-$$MOD.pom \
subprojects/groovy-$$MOD/target/libs/groovy-$$MOD-$(VERSION).jar; \
done
override_dh_installman:
dh_installman
- mv debian/groovy2/usr/share/man/man1/* debian/groovy2/usr/share/groovy2/man/man1/
- rm -rf debian/groovy2/usr/share/man
+ mv debian/groovy/usr/share/man/man1/* debian/groovy/usr/share/groovy/man/man1/
+ rm -rf debian/groovy/usr/share/man
override_dh_install:
dh_install
# fix zero-byte-file-in-doc-directory lintian warning
- -rm -f debian/groovy2-doc/usr/share/doc/groovy2/gapi/groovy.ico
+ -rm -f debian/groovy-doc/usr/share/doc/groovy/gapi/groovy.ico
override_dh_compress:
dh_compress
for cmd in groovy groovyc grape; do \
- dh_compress usr/share/groovy2/man/man1/$$cmd.1; \
+ dh_compress usr/share/groovy/man/man1/$$cmd.1; \
done
override_dh_link:
dh_link
- dh_link usr/share/java/groovy-all-2.x.jar usr/share/groovy2/embeddable/groovy-all-$(VERSION).jar
- dh_link usr/share/java/groovy-2.x.jar usr/share/groovy2/lib/groovy-$(VERSION).jar
+ dh_link usr/share/java/groovy-all.jar usr/share/groovy/embeddable/groovy-all-$(VERSION).jar
+ dh_link usr/share/java/groovy.jar usr/share/groovy/lib/groovy-$(VERSION).jar
for MOD in $(MODULES); do \
dh_link usr/share/maven-repo/org/codehaus/groovy/groovy-$$MOD/$(VERSION)/groovy-$$MOD-$(VERSION).jar \
- usr/share/groovy2/lib/groovy-$$MOD.jar; \
+ usr/share/groovy/lib/groovy-$$MOD.jar; \
done
get-orig-source:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy2.git
More information about the pkg-java-commits
mailing list