This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository libgetopt-java.
commit c2b098ffc3be54f0194a0ceec96a1182a6cdf07a Author: Markus Koschany <[email protected]> Date: Mon Apr 8 16:15:56 2013 +0000 - New upstream release 1.0.14. - Simplify debian/rules by using dh sequencer. - Remove pre-built class and html files. - Use javahelper and jh_maven_repo_helper plugin. - Remove dirs file. - Rename README.Debian-source to README.source. - Remove Niels Thykier and Michael Koch from Uploaders. - Add myself to Uploaders. - See also changelog 1.0.14+dfsg-1. --- debian/README.Debian-source | 6 --- debian/README.source | 7 ++++ debian/changelog | 38 +++++++++++++++++-- debian/compat | 2 +- debian/control | 47 ++++++++++++++--------- debian/copyright | 65 ++++++++++++++++++-------------- debian/dirs | 1 - debian/docs | 1 + debian/libgetopt-java.jlibs | 1 + debian/libgetopt-java.poms | 1 + debian/pom.xml | 2 +- debian/rules | 91 +++++++++++++++++++-------------------------- debian/watch | 5 ++- 13 files changed, 154 insertions(+), 113 deletions(-) diff --git a/debian/README.Debian-source b/debian/README.Debian-source deleted file mode 100644 index 78b9d3e..0000000 --- a/debian/README.Debian-source +++ /dev/null @@ -1,6 +0,0 @@ -Repackaged to remove pre-built class file and documenation. - -Steps to reproduce: - -rm getopt/*.html -rm getopt/*.class diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..72b9e58 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,7 @@ +libgetopt-java for Debian +=========================== + +Repackaged to remove pre-built class files and documentation. + +Please use debian/rules get-orig-source to obtain the original and dfsg free +sources. diff --git a/debian/changelog b/debian/changelog index d0b0078..c170a49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,38 @@ +libgetopt-java (1.0.14+dfsg-1) unstable; urgency=low + + * New upstream release. + - Repackage the tarball and remove pre-built class and html files. + * Bump compat level to 9 and require debhelper >=9. + * debian/control: + - Add myself to Uploaders. + - Remove Michael Koch from Uploaders because he is inactive. + (Closes: #654063) + - Remove Niels Thykier from Uploaders on his own request. + - Add versioned dependency for maven-repo-helper. + - Bump Standards-Version to 3.9.4, no changes necessary. + - Use canonical Vcs-URI. + - Move default-jdk and default-jdk-doc build dependencies to + Build-Depends-Indep because both are only needed for arch-independent + packages. + - libgetopt-java: Suggest libgetopt-java-doc instead of default-jdk-doc. + - libgetopt-java: Remove ${java:Depends} variable to avoid a dependency on + openjdk-6-jre-headless which is not desired. See also lintian tag + "needless-dependency-on-jre". + * debian/rules: + - Simplify debian/rules by using dh sequencer. + - Use javahelper and jh_maven_repo_helper plugin. + - Add get-orig-source target. + * Update debian/copyright to copyright format 1.0. + * Add libgetopt-java.jlibs and libgetopt-java.poms file. Use these files to + install the jar file and all maven related information. + * Update debian/pom.xml. + * Rename README.Debian-source to README.source and update the file. + * Drop dirs file. It is no longer needed. + * Install the README via docs file. + * Improve the watch file thus it can detect the latest upstream release. + + -- Markus Koschany <[email protected]> Mon, 08 Apr 2013 16:49:50 +0200 + libgetopt-java (1.0.13-4) unstable; urgency=low * Added build-arch and build-indep targets. @@ -144,6 +179,3 @@ lib-gnu.getopt-java (1.0.5-1) unstable; urgency=low -- Stephane Bortzmeyer <[email protected]> Fri, 25 Jun 1999 14:16:14 +0200 -Local variables: -mode: debian-changelog -End: diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 19b5cb5..5cfa976 100644 --- a/debian/control +++ b/debian/control @@ -2,35 +2,46 @@ Source: libgetopt-java Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Michael Koch <[email protected]>, Niels Thykier <[email protected]> -Build-Depends: debhelper (>= 8), default-jdk, default-jdk-doc, javahelper (>= 0.33~), - maven-repo-helper -Standards-Version: 3.9.2 +Uploaders: + Markus Koschany <[email protected]> +Build-Depends: + debhelper (>= 9), + javahelper (>= 0.33~), + maven-repo-helper (>= 1.6~) +Build-Depends-Indep: + default-jdk, + default-jdk-doc +Standards-Version: 3.9.4 Homepage: http://www.urbanophile.com/arenn/hacking/download.html -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgetopt-java -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgetopt-java +Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/libgetopt-java/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libgetopt-java/ Package: libgetopt-java Architecture: all -Depends: ${misc:Depends}, ${java:Depends} -Recommends: ${java:Recommends} -Suggests: default-jdk-doc +Depends: + ${misc:Depends} +Recommends: + ${java:Recommends} +Suggests: + libgetopt-java-doc Description: GNU getopt - Java port - The GNU Java getopt classes support short and long argument parsing - in a manner 100% compatible with the version of GNU getopt in glibc - 2.0.6 with a mostly compatible programmer's interface as well. Note that + The GNU Java getopt classes support short and long argument parsing + in a manner 100% compatible with the version of GNU getopt in glibc + 2.0.6 with a mostly compatible programmer's interface as well. Note that this is a port, not a new implementation. Package: libgetopt-java-doc Architecture: all Section: doc -Depends: ${misc:Depends}, ${java:Depends} -Recommends: ${java:Recommends} +Depends: + ${java:Depends}, + ${misc:Depends} +Recommends: + ${java:Recommends} Description: GNU getopt - Java port (doc) - The GNU Java getopt classes support short and long argument parsing - in a manner 100% compatible with the version of GNU getopt in glibc - 2.0.6 with a mostly compatible programmer's interface as well. Note that + The GNU Java getopt classes support short and long argument parsing + in a manner 100% compatible with the version of GNU getopt in glibc + 2.0.6 with a mostly compatible programmer's interface as well. Note that this is a port, not a new implementation. . This package contains the Java Programming API docs. - diff --git a/debian/copyright b/debian/copyright index 25c33e5..79e2193 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,28 +1,37 @@ -This package was debianized by Takashi Okamoto <[email protected]> on -Mon, 13 Aug 2001 01:05:51 +0900. - -It was downloaded from - http://www.urbanophile.com/arenn/hacking/download.html#getopt. - -Upstream Author: Aaron M. Renn <[email protected]> - -Copyright: (c) 2001-2009 Aaron M. Renn - -License: - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA - -On Debian systems the full text of the GNU Library Public License, can be -found in the file /usr/share/common-licenses/LGPL-2. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: GNU getopt - Java Port +Source: http://www.urbanophile.com/arenn/hacking/download.html + +Files: * +Copyright: 2001-2012, Aaron M. Renn <[email protected]> +License: LGPL-2 + +Files: debian/* +Copyright: 1999, Stephane Bortzmeyer <[email protected]> + 2001-2003, Takashi Okamoto <[email protected]> + 2005, Wolfgang Baer <[email protected]> + 2006, Arnaud Vandyck <[email protected]> + 2009, Michael Koch <[email protected]> + 2009,2011 Niels Thykier <[email protected]> + 2010, Gabriele Giacone <[email protected]> + 2011, Torsten Werner <[email protected]> + 2013, Markus Koschany <[email protected]> +License: LGPL-2 + +License: LGPL-2 + This library is free software; you can redistribute it and/or modify it under + the terms of the GNU Library General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) any + later version. + . + This library 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 Library General Public License for more + details. + . + You should have received a copy of the GNU Library General Public License + along with this library; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + . + On Debian systems the full text of the GNU Library Public License, can be + found in the file /usr/share/common-licenses/LGPL-2. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 13c9f03..0000000 --- a/debian/dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/java diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..e2e6be1 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +gnu/getopt/README diff --git a/debian/libgetopt-java.jlibs b/debian/libgetopt-java.jlibs new file mode 100644 index 0000000..c99d80c --- /dev/null +++ b/debian/libgetopt-java.jlibs @@ -0,0 +1 @@ +gnu-getopt.jar diff --git a/debian/libgetopt-java.poms b/debian/libgetopt-java.poms new file mode 100644 index 0000000..bcc9f85 --- /dev/null +++ b/debian/libgetopt-java.poms @@ -0,0 +1 @@ +debian/pom.xml --usj-name=gnu-getopt diff --git a/debian/pom.xml b/debian/pom.xml index 08f1ce4..3b0ef5c 100644 --- a/debian/pom.xml +++ b/debian/pom.xml @@ -3,5 +3,5 @@ <groupId>gnu-getopt</groupId> <artifactId>getopt</artifactId> <name>getopt</name> -<version>1.0.13</version> +<version>1.0.14</version> </project> diff --git a/debian/rules b/debian/rules index c90e710..4399f21 100755 --- a/debian/rules +++ b/debian/rules @@ -1,71 +1,56 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. - -# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DPATH := $(abspath $(dir $(MAKEFILE_LIST))) +DTYPE := +dfsg +PKG := libgetopt-java +VER ?= $(shell dpkg-parsechangelog -l$(DPATH)/changelog | perl -ne 'print $$1 if m{Version:\s*(\d[\d\.]+)}') + export LIBRARY=gnu-getopt.jar -export VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -f 2 -d " " | sed "s/-[^-]$$//") export JAVA_HOME=/usr/lib/jvm/default-java export JAVA=$(JAVA_HOME)/bin/java export JAR=$(JAVA_HOME)/bin/jar export JAVAC=$(JAVA_HOME)/bin/javac export CLASSPATH=$(JAVA_HOME)/jre/lib/rt.jar:. -build: build-arch build-indep - -build-arch: build-stamp -build-indep: build-stamp +%: + dh $@ --with javahelper --with jh_maven_repo_helper -build-stamp: - dh_testdir - mkdir classes +override_dh_auto_build: + mkdir -p $(CURDIR)/classes ${JAVAC} -target 1.3 -source 1.3 -d classes -classpath ${CLASSPATH} gnu/getopt/*.java - cp gnu/getopt/*.properties classes/gnu/getopt - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - rm -fr classes api - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - (cd classes; ${JAR} cvf ../gnu-getopt.jar gnu) + cp $(CURDIR)/gnu/getopt/*.properties $(CURDIR)/classes/gnu/getopt + cd $(CURDIR)/classes; ${JAR} cvf ../gnu-getopt.jar gnu javadoc -link /usr/share/doc/default-jdk-doc/api -d api/ gnu/getopt/*.java # Remove the javadoc of the example - [ ! -f api/GetoptDemo.html ] || rm -f api/GetoptDemo.html - + [ ! -f $(CURDIR)/api/GetoptDemo.html ] || rm -f $(CURDIR)/api/GetoptDemo.html -# Build architecture-independent files here. -binary-indep: build install - dh_testdir - dh_testroot - dh_installdocs gnu/getopt/README +override_dh_installexamples: dh_installexamples gnu/getopt/GetoptDemo.java - dh_installchangelogs gnu/getopt/ChangeLog - # maven - mh_installpom -plibgetopt-java $(CURDIR)/debian/pom.xml - mh_installjar -plibgetopt-java -ngnu-getopt -l $(CURDIR)/debian/pom.xml \ - $(CURDIR)/gnu-getopt.jar - jh_installjavadoc - jh_depends - dh_compress - dh_link - dh_installdeb - dh_gencontrol - dh_fixperms - dh_md5sums - dh_builddeb -# Build architecture-dependent files here. -binary-arch: build install +override_dh_installchangelogs: + dh_installchangelogs gnu/getopt/ChangeLog -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_clean: + dh_clean + rm -rf $(CURDIR)/classes $(CURDIR)/api + +.PHONY: get-orig-source +get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.gz + @ + +$(PKG)_$(VER)$(DTYPE).orig.tar.gz: + @echo "# Downloading..." + uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(DPATH) + @echo "# Extracting..." + mkdir $(PKG)-$(VER) \ + && tar xf $(PKG)_$(VER).orig.tar.* --directory $(PKG)-$(VER) --strip-components 0 \ + || $(RM) -r $(PKG)-$(VER) + @echo "# Clean-up..." + cd $(PKG)-$(VER) \ + && $(RM) -r -v \ + gnu/getopt/*.html \ + gnu/getopt/*.class + @echo "# Packing..." + tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.gz" "$(PKG)-$(VER)" \ + && $(RM) -r "$(PKG)-$(VER)" diff --git a/debian/watch b/debian/watch index 8c430bc..42fda7b 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,4 @@ version=3 -http://www.urbanophile.com/arenn/hacking/getopt/ \ - java-getopt-([\d.]+)\.tar\.gz +opts="dversionmangle=s/\+dfsg//" \ +http://www.urbanophile.com/arenn/hacking/download.html \ + getopt/java-getopt-([\d\.]*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libgetopt-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
