[joptsimple] 02/02: Update to 5.0.4 - unreleased
Steffen Möller
moeller at moszumanska.debian.org
Wed Aug 30 20:48:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
moeller pushed a commit to branch master
in repository joptsimple.
commit d11ebf8b6bce5596d4790ae5267b8de54694ea7a
Author: Steffen Moeller <moeller at debian.org>
Date: Wed Aug 30 22:47:10 2017 +0200
Update to 5.0.4 - unreleased
---
debian/README.source | 9 ++++++
debian/changelog | 6 ++++
debian/compat | 2 +-
debian/control | 34 ++++++++++-------------
debian/maven.ignoreRules | 8 ++++--
debian/maven.properties | 2 +-
debian/maven.publishedRules | 1 +
debian/patches/maven-bundle-plugin_is_2.5.4.patch | 13 +++++++++
debian/patches/no-oss-parent.patch | 15 ++++++++++
debian/patches/no_gitexe.patch | 28 +++++++++++++++++++
debian/patches/series | 3 ++
debian/rules | 11 +++++---
debian/watch | 2 +-
13 files changed, 104 insertions(+), 30 deletions(-)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..131f9f9
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+Information about joptsimple
+----------------------------
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.
diff --git a/debian/changelog b/debian/changelog
index c2fb6f1..7fe1e3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+joptsimple (5.0.4-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Steffen Moeller <moeller at debian.org> Wed, 30 Aug 2017 21:40:11 +0200
+
joptsimple (4.9-1) UNRELEASED; urgency=medium
* New upstream snapshot.
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 1a17aad..4799d14 100644
--- a/debian/control
+++ b/debian/control
@@ -3,29 +3,20 @@ Section: java
Priority: optional
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,
- ant,
- debhelper (>= 9),
- default-jdk,
- maven-debian-helper
-Build-Depends-Indep: default-jdk-doc,
- libjoda-time-java,
- libmaven-javadoc-plugin-java,
- libmaven-bundle-plugin-java,
- libanimal-sniffer-java,
- libmaven-cobertura-plugin-java,
- libmaven-antrun-plugin-java,
- junit4
+ Stephen Nelson <stephen at eccostudio.com>,
+ Steffen Moeller <moeller at debian.org>
+Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.1)
+Build-Depends-Indep: libmaven-bundle-plugin-java (>= 2.5.4),
+ ant, junit4 (>= 4.12), libhamcrest-java, libjoda-time-java (>= 2.9.9)
Standards-Version: 4.1.0
-Vcs-Browser: https://anonscm.debian.org/git/pkg-java/joptsimple.git
Vcs-Git: https://anonscm.debian.org/git/pkg-java/joptsimple.git
-Homepage: http://pholser.github.com/jopt-simple
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/joptsimple.git
+Homepage: https://pholser.github.com/jopt-simple
Package: libjoptsimple-java
Architecture: all
-Depends: ${maven:Depends}, ${misc:Depends}
-Suggests: libjoptsimple-java-doc
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}, 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.
@@ -36,10 +27,13 @@ Description: Command line parsing java library
configuration and retrieval of options and their arguments simple and
expressive, without being overly clever.
+
Package: libjoptsimple-java-doc
-Section: doc
Architecture: all
-Depends: ${maven:DocDepends}, ${misc:Depends}
+Section: doc
+Depends: ${misc:Depends}
+Recommends: ${maven:DocDepends}, ${maven:DocOptionalDepends}
+Suggests: libjoptsimple-java
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/maven.ignoreRules b/debian/maven.ignoreRules
index 1a8ddf1..05b40f9 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,11 +1,13 @@
+org.apache.maven.plugins maven-antrun-plugin * * * *
org.apache.maven.plugins maven-pmd-plugin * * * *
-org.apache.maven.scm maven-scm-* * * * *
+org.apache.maven.plugins maven-project-info-reports-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.codehaus.mojo animal-sniffer-maven-plugin * * * *
org.codehaus.mojo cobertura-maven-plugin * * * *
org.codehaus.mojo findbugs-maven-plugin * * * *
org.codehaus.mojo javancss-maven-plugin * * * *
-org.codehaus.mojo animal-sniffer-maven-plugin * * * *
org.infinitest continuous-testing-toolkit * * * *
org.kathrynhuxtable.maven.wagon wagon-gitsite * * * *
org.pitest pitest-maven * * * *
-org.apache.maven.plugins maven-antrun-plugin * * * *
+org.apache.maven.scm maven-scm-* * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
index 11f9276..2a7ad30 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,4 +1,4 @@
# Include here properties to pass to Maven during the build.
-# For example:
+# project.build.sourceEncoding=UTF-8
maven.test.skip=true
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
index bab6595..ef9f128 100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@ -1,2 +1,3 @@
+net.sf.jopt-simple jopt-simple jar * * *
net.sf.jopt-simple jopt-simple jar s/.*/debian/ * *
diff --git a/debian/patches/maven-bundle-plugin_is_2.5.4.patch b/debian/patches/maven-bundle-plugin_is_2.5.4.patch
new file mode 100644
index 0000000..5318d5c
--- /dev/null
+++ b/debian/patches/maven-bundle-plugin_is_2.5.4.patch
@@ -0,0 +1,13 @@
+Index: joptsimple/pom.xml
+===================================================================
+--- joptsimple.orig/pom.xml
++++ joptsimple/pom.xml
+@@ -138,7 +138,7 @@
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+- <version>2.3.7</version>
++ <version>2.5.4</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
diff --git a/debian/patches/no-oss-parent.patch b/debian/patches/no-oss-parent.patch
new file mode 100644
index 0000000..f4241cd
--- /dev/null
+++ b/debian/patches/no-oss-parent.patch
@@ -0,0 +1,15 @@
+Index: joptsimple/pom.xml
+===================================================================
+--- joptsimple.orig/pom.xml
++++ joptsimple/pom.xml
+@@ -1,10 +1,5 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+- <parent>
+- <groupId>org.sonatype.oss</groupId>
+- <artifactId>oss-parent</artifactId>
+- <version>7</version>
+- </parent>
+ <groupId>net.sf.jopt-simple</groupId>
+ <artifactId>jopt-simple</artifactId>
+ <version>5.0.4</version>
diff --git a/debian/patches/no_gitexe.patch b/debian/patches/no_gitexe.patch
new file mode 100644
index 0000000..320ce6e
--- /dev/null
+++ b/debian/patches/no_gitexe.patch
@@ -0,0 +1,28 @@
+Index: joptsimple/pom.xml
+===================================================================
+--- joptsimple.orig/pom.xml
++++ joptsimple/pom.xml
+@@ -75,23 +75,6 @@
+ </dependency>
+ </dependencies>
+ <build>
+- <extensions>
+- <extension>
+- <groupId>org.apache.maven.scm</groupId>
+- <artifactId>maven-scm-provider-gitexe</artifactId>
+- <version>1.9.2</version>
+- </extension>
+- <extension>
+- <groupId>org.apache.maven.scm</groupId>
+- <artifactId>maven-scm-manager-plexus</artifactId>
+- <version>1.9.2</version>
+- </extension>
+- <extension>
+- <groupId>org.kathrynhuxtable.maven.wagon</groupId>
+- <artifactId>wagon-gitsite</artifactId>
+- <version>0.3.1</version>
+- </extension>
+- </extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..251d69a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+maven-bundle-plugin_is_2.5.4.patch
+no-oss-parent.patch
+no_gitexe.patch
diff --git a/debian/rules b/debian/rules
index 9022bd1..73adb4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,12 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+ dh $@
-JAVA_HOME := /usr/lib/jvm/default-java
+override_dh_auto_clean:
+ rm -rf debian/maven-repo target debian/maven.cleanIgnoreRules pom.xml.save
+ find . -name "*.class" -delete
get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --verbose
+ uscan --download-current-version --force-download --no-symlink
+
diff --git a/debian/watch b/debian/watch
index 7e40804..4331e4b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-https://github.com/pholser/jopt-simple/releases .*/jopt-simple-([\d\.]+).tar.gz debian
+https://github.com/jopt-simple/jopt-simple/tags .*/(?:.*?)([\d\.]+)\.tar\.gz
--
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