This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository args4j.
commit fcf11dbdc8cbc4973508c6b5ea3a69dc9e51a961 Author: Emmanuel Bourg <[email protected]> Date: Sat Feb 6 14:47:12 2016 +0100 Enabled the OSGi metadata --- debian/changelog | 1 + debian/control | 1 + debian/maven.ignoreRules | 1 - debian/patches/01-change-packaging-to-jar.patch | 25 ------------------------- debian/patches/series | 1 - 5 files changed, 2 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0b9e11f..beb89fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ args4j (2.32-2) UNRELEASED; urgency=medium * Team upload. + * Enabled the OSGi metadata * Standards-Version updated to 3.9.7 (no changes) -- Emmanuel Bourg <[email protected]> Sat, 06 Feb 2016 14:37:31 +0100 diff --git a/debian/control b/debian/control index 977dc50..8f50c59 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper Build-Depends-Indep: default-jdk-doc, junit4, libmaven-javadoc-plugin-java, + libmaven-bundle-plugin-java, libmaven-shade-plugin-java, libmockito-java Standards-Version: 3.9.7 diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index cf69e82..0cc67d7 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -16,5 +16,4 @@ org.apache.maven.plugins maven-changes-plugin * * * * org.apache.maven.plugins maven-project-info-reports-plugin * * * * -org.apache.felix maven-bundle-plugin * * * * ant * * * * * diff --git a/debian/patches/01-change-packaging-to-jar.patch b/debian/patches/01-change-packaging-to-jar.patch deleted file mode 100644 index 19956b0..0000000 --- a/debian/patches/01-change-packaging-to-jar.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Changes the packaging to "jar" to avoid a dependency on bnd -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- 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 deleted file mode 100644 index 9e463b9..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01-change-packaging-to-jar.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
