[joptsimple] 03/03: Repackaging new upstream version 4.5 using Maven Helper.

Stephen Nelson stephenonelson-guest at moszumanska.debian.org
Fri Dec 6 20:25:38 UTC 2013 

This is an automated email from the git hooks/post-receive script.

stephenonelson-guest pushed a commit to branch master
in repository joptsimple.

commit 98f471dbc7ad65e0d24e84e7b32216525c7ce964
Author: Stephen Nelson <stephen at eccostudio.com>
Date:   Wed Dec 4 23:01:43 2013 +0000

    Repackaging new upstream version 4.5 using Maven Helper.
    
    - Modified to skip tests.
    - Install the docs in the correct location.
    - Depend on cdbs.
    - Updated copyright to machine readable format.
    - Build with Maven.
    - Add myself to uploaders.
    - Add Samuel Thibault to uploaders.
    - Change maintainer from Samuel Thibault to Debian Java maintainers
    - Updated package homepage
---
 debian/control                                     | 21 ++++--
 debian/copyright                                   | 75 +++++++++++-----------
 ...oc-base => libjoptsimple-java-doc.doc-base.api} |  4 +-
 debian/libjoptsimple-java-doc.docs                 |  1 -
 debian/libjoptsimple-java-doc.install              |  2 +
 debian/libjoptsimple-java.install                  |  1 -
 debian/libjoptsimple-java.poms                     | 28 ++++++++
 debian/maven.ignoreRules                           |  9 +++
 debian/maven.properties                            |  4 ++
 debian/maven.publishedRules                        |  2 +
 debian/maven.rules                                 |  7 ++
 debian/rules                                       | 51 ++-------------
 debian/source/format                               |  1 +
 13 files changed, 111 insertions(+), 95 deletions(-)

diff --git a/debian/control b/debian/control
index 0aad5c8..b05cd1b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,26 @@
 Source: joptsimple
 Section: java
 Priority: extra
-Maintainer: Samuel Thibault <sthibault at debian.org>
-Build-Depends: debhelper (>= 9)
-Build-Depends-Indep: default-jdk
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Samuel Thibault <sthibault at debian.org>,
+           Stephen Nelson <stephen at eccostudio.com>
+Build-Depends: cdbs,
+               debhelper (>= 9),
+               default-jdk,
+               maven-debian-helper
+Build-Depends-Indep: default-jdk-doc,
+                     libjoda-time-java,
+                     libmaven-javadoc-plugin-java,
+                     junit4
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/joptsimple.git;a=summary
 Vcs-Git: git://anonscm.debian.org/pkg-java/joptsimple.git
-Homepage: http://jopt-simple.sourceforge.net
+Homepage: http://pholser.github.com/jopt-simple 
 
 Package: libjoptsimple-java
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
+Suggests: libjoptsimple-java-doc
 Description: Command line parsing java library
  JOpt Simple is a Java library for parsing command line options, such as
  those you might pass to an invocation of javac.
@@ -25,7 +34,7 @@ Description: Command line parsing java library
 Package: libjoptsimple-java-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
 Description: Command line parsing java library - Documentation
  JOpt Simple is a Java library for parsing command line options, such as
  those you might pass to an invocation of javac.
diff --git a/debian/copyright b/debian/copyright
index d1dbb53..a81dd0f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,39 +1,36 @@
-This package was debianized by Samuel Thibault <sthibault at debian.org> on
-Tue, 01 Sep 2009 15:53:03 +0200.
-
-It was downloaded from http://jopt-simple.sourceforge.net/
-
-Upstream Author:
-
-
-Copyright:
-
-    Copyright (c) 2004-2009 Paul R. Holser, Jr.
-
-License:
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-The Debian packaging is:
-
-    Copyright (C) 2009 Samuel Thibault <sthibault at debian.org>
-
-and is licensed under the GPL version 3, 
-see `/usr/share/common-licenses/GPL-3'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: JOpt Simple
+Source: http://pholser.github.com/jopt-simple
+
+Files: *
+Copyright: 2004-2013, Paul R. Holser, Jr. <pholser at alumni.rice.edu>
+License: MIT
+
+Files: debian/*
+Copyright: 2009-2013, Samuel Thibault <sthibault at debian.org>, 2013, Stephen Nelson <stephen at eccostudio.com>
+License: GPL-3
+
+License: GPL-3
+  On Debian systems, the full text of the GNU General Public
+  License version 2 can be found in the file
+  `/usr/share/common-licenses/GPL-3'.
+
+License: MIT
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+  .
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/debian/libjoptsimple-java-doc.doc-base b/debian/libjoptsimple-java-doc.doc-base.api
similarity index 73%
rename from debian/libjoptsimple-java-doc.doc-base
rename to debian/libjoptsimple-java-doc.doc-base.api
index 11b3bc1..5fca3da 100644
--- a/debian/libjoptsimple-java-doc.doc-base
+++ b/debian/libjoptsimple-java-doc.doc-base.api
@@ -7,5 +7,5 @@ Abstract: JOpt Simple is a Java library for parsing command line options,
 Section: Programming/Java
 
 Format: HTML
-Index: /usr/share/doc/libjoptsimple-java-doc/api/index.html
-Files: /usr/share/doc/libjoptsimple-java-doc/api/*.html
+Index: /usr/share/doc/libjoptsimple-java/api/index.html
+Files: /usr/share/doc/libjoptsimple-java/api/*
diff --git a/debian/libjoptsimple-java-doc.docs b/debian/libjoptsimple-java-doc.docs
deleted file mode 100644
index eedd89b..0000000
--- a/debian/libjoptsimple-java-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-api
diff --git a/debian/libjoptsimple-java-doc.install b/debian/libjoptsimple-java-doc.install
new file mode 100644
index 0000000..fe8877f
--- /dev/null
+++ b/debian/libjoptsimple-java-doc.install
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libjoptsimple-java/api
+
diff --git a/debian/libjoptsimple-java.install b/debian/libjoptsimple-java.install
deleted file mode 100644
index 682da3b..0000000
--- a/debian/libjoptsimple-java.install
+++ /dev/null
@@ -1 +0,0 @@
-joptsimple-*.jar /usr/share/java
diff --git a/debian/libjoptsimple-java.poms b/debian/libjoptsimple-java.poms
new file mode 100644
index 0000000..8aeb211
--- /dev/null
+++ b/debian/libjoptsimple-java.poms
@@ -0,0 +1,28 @@
+# 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 --no-parent --has-package-version --java-lib --usj-name=joptsimple
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..d5028e5
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,9 @@
+
+org.apache.maven.plugins maven-pmd-plugin * * * *
+org.codehaus.mojo cobertura-maven-plugin * * * *
+org.codehaus.mojo findbugs-maven-plugin * * * *
+org.codehaus.mojo javancss-maven-plugin * * * *
+org.infinitest continuous-testing-toolkit * * * *
+org.kathrynhuxtable.maven.wagon wagon-gitsite * * * *
+org.pitest pitest-maven * * * *
+org.apache.maven.plugins maven-antrun-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..11f9276
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+maven.test.skip=true
+
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 0000000..bab6595
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1,2 @@
+
+net.sf.jopt-simple jopt-simple jar s/.*/debian/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..654aa35
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,7 @@
+
+joda-time joda-time jar s/.*/debian/ * *
+junit junit jar s/4\..*/4.x/ * *
+net.sf.jopt-simple jopt-simple jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-manager-plexus jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-gitexe jar s/.*/debian/ * *
+s/ant/org.apache.ant/ * * s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
index 7e1342d..b76c54a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,50 +1,9 @@
 #!/usr/bin/make -f
 
-JAVAC=javac
-JAVADOC=javadoc
-JAR=jar
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
 
-JAVACLASSES=/usr/share/java
+JAVA_HOME := /usr/lib/jvm/default-java
 
-JAVAFLAGS=
-
-JARFILE=joptsimple-3.1.jar
-
-build: build-indep
-build-arch:
-build-indep: build-stamp
-build-stamp:
-	dh_testdir
-
-	$(JAVAC) $(JAVAFLAGS) `find . -name \*.java`
-	$(JAVADOC) -d api joptsimple
-	$(JAR) c `find . -name \*.class -o -name \*.xml -o -name \*.MF` > $(JARFILE)
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	rm -f `find . -name \*.class`
-	rm -f $(JARFILE)
-	rm -fr api
-
-	dh_clean
-
-binary-indep: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_install
-	dh_link /usr/share/java/$(JARFILE) /usr/share/java/joptsimple.jar
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build build-indep build-arch clean binary-indep binary-arch binary install
+get-orig-source:
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/joptsimple.git

More information about the pkg-java-commits mailing list