[args4j] 02/02: New upstream release (2.0.25)
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Thu Oct 24 14:03:30 UTC 2013
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository args4j.
commit a30d8701b59552c8821e1b6d6e4a2889d7a70671
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Oct 24 16:00:43 2013 +0200
New upstream release (2.0.25)
---
debian/changelog | 5 ++++-
debian/control | 4 +++-
debian/libargs4j-java.poms | 4 +++-
debian/maven.cleanIgnoreRules | 1 -
debian/maven.ignoreRules | 2 +-
debian/maven.rules | 1 +
debian/patches/01-change-packaging-to-jar.patch | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
8 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5413000..d849205 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-args4j (2.0.16-3) UNRELEASED; urgency=low
+args4j (2.0.25-1) unstable; urgency=low
* Team upload.
+ * New upstream release
+ - New build dependency on libmockito-java
+ - Added a patch to change the packaging from bundle to jar
* debian/control:
- Use canonical URLs for the Vcs-* fields
- Removed the deprecated DM-Upload-Allowed flag
diff --git a/debian/control b/debian/control
index 3d108d1..d196fe0 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends-Indep: ant,
libmaven-compiler-plugin-java (>= 2.0.2),
libmaven-install-plugin-java,
libmaven-jar-plugin-java (>= 2.2),
- libmaven-javadoc-plugin-java
+ libmaven-javadoc-plugin-java,
+ libmockito-java
Standards-Version: 3.9.4
Vcs-Git: git://anonscm.debian.org/pkg-java/args4j.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/args4j.git
@@ -21,6 +22,7 @@ Package: libargs4j-java
Architecture: all
Depends: ${maven:Depends}, ${misc:Depends}
Recommends: ${maven:OptionalDepends}
+Breaks: libjenkins-remoting-java (<= 2.23-1)
Description: Java command line arguments parser
args4j is a small Java class library that makes it easy to parse
command line options/arguments in your CUI application.
diff --git a/debian/libargs4j-java.poms b/debian/libargs4j-java.poms
index 140faf0..9ab1351 100644
--- a/debian/libargs4j-java.poms
+++ b/debian/libargs4j-java.poms
@@ -25,6 +25,8 @@
# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
# Empty by default. [mh_install]
#
-pom.xml --has-package-version
+pom.xml --no-parent --has-package-version
args4j/pom.xml --has-package-version --java-lib
args4j-tools/pom.xml --has-package-version --java-lib
+args4j-maven-plugin/pom.xml --ignore
+args4j-maven-plugin-example/pom.xml --ignore
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
index b8f28c3..77af890 100644
--- a/debian/maven.cleanIgnoreRules
+++ b/debian/maven.cleanIgnoreRules
@@ -15,4 +15,3 @@
# junit junit jar s/3\\..*/3.x/
org.apache.maven.plugins maven-changes-plugin * * * *
-org.jvnet.wagon-svn wagon-svn * * * *
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index b8f28c3..4a7c1ae 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -15,4 +15,4 @@
# junit junit jar s/3\\..*/3.x/
org.apache.maven.plugins maven-changes-plugin * * * *
-org.jvnet.wagon-svn wagon-svn * * * *
+org.apache.felix maven-bundle-plugin * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 5a05d95..10828bd 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -18,3 +18,4 @@
junit junit jar s/3\..*/3.x/ * *
s/ant/org.apache.ant/ * * s/.*/debian/ * *
+org.mockito s/mockito-all/mockito-core * s/.*/debian/ * *
diff --git a/debian/patches/01-change-packaging-to-jar.patch b/debian/patches/01-change-packaging-to-jar.patch
new file mode 100644
index 0000000..09c0f08
--- /dev/null
+++ b/debian/patches/01-change-packaging-to-jar.patch
@@ -0,0 +1,22 @@
+--- a/args4j-tools/pom.xml
++++ b/args4j-tools/pom.xml
+@@ -11,7 +11,7 @@
+ <name>args4j-tools</name>
+ <description>development-time tool for generating additional artifacits</description>
+
+- <packaging>bundle</packaging>
++ <packaging>jar</packaging>
+
+ <properties>
+ <mainClass>org.kohsuke.args4j.apt.Main</mainClass>
+--- a/args4j/pom.xml
++++ b/args4j/pom.xml
+@@ -9,7 +9,7 @@
+ <artifactId>args4j</artifactId>
+ <name>args4j</name>
+
+- <packaging>bundle</packaging>
++ <packaging>jar</packaging>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9e463b9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-change-packaging-to-jar.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git
More information about the pkg-java-commits
mailing list