[pkg-java] r16506 - trunk/libgetopt-java/debian
Markus Koschany
apo-guest at alioth.debian.org
Mon Apr 8 16:15:56 UTC 2013
Author: apo-guest
Date: 2013-04-08 16:15:56 +0000 (Mon, 08 Apr 2013)
New Revision: 16506
Added:
trunk/libgetopt-java/debian/README.source
trunk/libgetopt-java/debian/docs
trunk/libgetopt-java/debian/libgetopt-java.jlibs
trunk/libgetopt-java/debian/libgetopt-java.poms
Removed:
trunk/libgetopt-java/debian/README.Debian-source
trunk/libgetopt-java/debian/dirs
Modified:
trunk/libgetopt-java/debian/changelog
trunk/libgetopt-java/debian/compat
trunk/libgetopt-java/debian/control
trunk/libgetopt-java/debian/copyright
trunk/libgetopt-java/debian/pom.xml
trunk/libgetopt-java/debian/rules
trunk/libgetopt-java/debian/watch
Log:
- 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.
Deleted: trunk/libgetopt-java/debian/README.Debian-source
===================================================================
--- trunk/libgetopt-java/debian/README.Debian-source 2013-04-08 07:37:45 UTC (rev 16505)
+++ trunk/libgetopt-java/debian/README.Debian-source 2013-04-08 16:15:56 UTC (rev 16506)
@@ -1,6 +0,0 @@
-Repackaged to remove pre-built class file and documenation.
-
-Steps to reproduce:
-
-rm getopt/*.html
-rm getopt/*.class
Added: trunk/libgetopt-java/debian/README.source
===================================================================
--- trunk/libgetopt-java/debian/README.source (rev 0)
+++ trunk/libgetopt-java/debian/README.source 2013-04-08 16:15:56 UTC (rev 16506)
@@ -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.
Modified: trunk/libgetopt-java/debian/changelog
===================================================================
--- trunk/libgetopt-java/debian/changelog 2013-04-08 07:37:45 UTC (rev 16505)
+++ trunk/libgetopt-java/debian/changelog 2013-04-08 16:15:56 UTC (rev 16506)
@@ -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 <apo at gambaru.de> 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 @@
-- Stephane Bortzmeyer <bortzmeyer at debian.org> Fri, 25 Jun 1999 14:16:14 +0200
-Local variables:
-mode: debian-changelog
-End:
Modified: trunk/libgetopt-java/debian/compat
===================================================================
--- trunk/libgetopt-java/debian/compat 2013-04-08 07:37:45 UTC (rev 16505)
+++ trunk/libgetopt-java/debian/compat 2013-04-08 16:15:56 UTC (rev 16506)
@@ -1 +1 @@
-8
+9
Modified: trunk/libgetopt-java/debian/control
===================================================================
--- trunk/libgetopt-java/debian/control 2013-04-08 07:37:45 UTC (rev 16505)
+++ trunk/libgetopt-java/debian/control 2013-04-08 16:15:56 UTC (rev 16506)
@@ -2,35 +2,46 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>, Niels Thykier <niels at thykier.net>
-Build-Depends: debhelper (>= 8), default-jdk, default-jdk-doc, javahelper (>= 0.33~),
- maven-repo-helper
-Standards-Version: 3.9.2
+Uploaders:
+ Markus Koschany <apo at gambaru.de>
+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.
-
Modified: trunk/libgetopt-java/debian/copyright
===================================================================
--- trunk/libgetopt-java/debian/copyright 2013-04-08 07:37:45 UTC (rev 16505)
+++ trunk/libgetopt-java/debian/copyright 2013-04-08 16:15:56 UTC (rev 16506)
@@ -1,28 +1,37 @@
-This package was debianized by Takashi Okamoto <tora at debian.org> on
-Mon, 13 Aug 2001 01:05:51 +0900.
+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
-It was downloaded from
- http://www.urbanophile.com/arenn/hacking/download.html#getopt.
+Files: *
+Copyright: 2001-2012, Aaron M. Renn <arenn at urbanophile.com>
+License: LGPL-2
-Upstream Author: Aaron M. Renn <arenn at urbanophile.com>
+Files: debian/*
+Copyright: 1999, Stephane Bortzmeyer <bortzmeyer at debian.org>
+ 2001-2003, Takashi Okamoto <tora at debian.org>
+ 2005, Wolfgang Baer <WBaer at gmx.de>
+ 2006, Arnaud Vandyck <avdyk at debian.org>
+ 2009, Michael Koch <konqueror at gmx.de>
+ 2009,2011 Niels Thykier <niels at thykier.net>
+ 2010, Gabriele Giacone <1o5g4r8o at gmail.com>
+ 2011, Torsten Werner <twerner at debian.org>
+ 2013, Markus Koschany <apo at gambaru.de>
+License: LGPL-2
-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.
+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.
Deleted: trunk/libgetopt-java/debian/dirs
===================================================================
--- trunk/libgetopt-java/debian/dirs 2013-04-08 07:37:45 UTC (rev 16505)
+++ trunk/libgetopt-java/debian/dirs 2013-04-08 16:15:56 UTC (rev 16506)
@@ -1 +0,0 @@
-usr/share/java
Added: trunk/libgetopt-java/debian/docs
===================================================================
--- trunk/libgetopt-java/debian/docs (rev 0)
+++ trunk/libgetopt-java/debian/docs 2013-04-08 16:15:56 UTC (rev 16506)
@@ -0,0 +1 @@
+gnu/getopt/README
Added: trunk/libgetopt-java/debian/libgetopt-java.jlibs
===================================================================
--- trunk/libgetopt-java/debian/libgetopt-java.jlibs (rev 0)
+++ trunk/libgetopt-java/debian/libgetopt-java.jlibs 2013-04-08 16:15:56 UTC (rev 16506)
@@ -0,0 +1 @@
+gnu-getopt.jar
Added: trunk/libgetopt-java/debian/libgetopt-java.poms
===================================================================
--- trunk/libgetopt-java/debian/libgetopt-java.poms (rev 0)
+++ trunk/libgetopt-java/debian/libgetopt-java.poms 2013-04-08 16:15:56 UTC (rev 16506)
@@ -0,0 +1 @@
+debian/pom.xml --usj-name=gnu-getopt
Modified: trunk/libgetopt-java/debian/pom.xml
===================================================================
--- trunk/libgetopt-java/debian/pom.xml 2013-04-08 07:37:45 UTC (rev 16505)
+++ trunk/libgetopt-java/debian/pom.xml 2013-04-08 16:15:56 UTC (rev 16506)
@@ -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>
Modified: trunk/libgetopt-java/debian/rules
===================================================================
--- trunk/libgetopt-java/debian/rules 2013-04-08 07:37:45 UTC (rev 16505)
+++ trunk/libgetopt-java/debian/rules 2013-04-08 16:15:56 UTC (rev 16506)
@@ -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
+%:
+ dh $@ --with javahelper --with jh_maven_repo_helper
-build-arch: build-stamp
-build-indep: build-stamp
-
-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
+
+override_dh_installchangelogs:
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_clean:
+ dh_clean
+ rm -rf $(CURDIR)/classes $(CURDIR)/api
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.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)"
Modified: trunk/libgetopt-java/debian/watch
===================================================================
--- trunk/libgetopt-java/debian/watch 2013-04-08 07:37:45 UTC (rev 16505)
+++ trunk/libgetopt-java/debian/watch 2013-04-08 16:15:56 UTC (rev 16506)
@@ -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)))
More information about the pkg-java-commits
mailing list