This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository jdeb.
commit 47f2081c2197c5d0ad415ef6dcbd38b47c07a4a1 Author: tony mancill <[email protected]> Date: Fri Nov 15 21:17:44 2013 -0800 Imported Debian patch 1.0.2~git20130829-2 --- debian/changelog | 18 ++++++++++++++++++ debian/control | 4 ++-- debian/maven.properties | 1 + debian/patches/01_fix_testcase_bouncycastle.patch | 14 ++++++++++++++ debian/patches/series | 1 + debian/rules | 2 ++ debian/watch | 2 ++ 7 files changed, 40 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5812a3c..e292e0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +jdeb (1.0.2~git20130829-2) unstable; urgency=low + + * Team upload. + + [ Emmanuel Bourg ] + * Added a watch file + * Install the upstream changelog + + [ tony mancill ] + * Apply patch from Andreas Moog + - Add Build-Depends on libmaven-plugin-tools-java to fix FTBFS + (Closes: #724097) (LP: #1249778) + - debian/patches/01_fix_testcase_bouncycastle.patch: + Update testcase to work with bouncycastle 1.49 + * Re-enabled test failures while building + + -- tony mancill <[email protected]> Fri, 15 Nov 2013 21:17:44 -0800 + jdeb (1.0.2~git20130829-1) unstable; urgency=low * Initial release (Closes: #721249). diff --git a/debian/control b/debian/control index 07910b0..65a0e94 100644 --- a/debian/control +++ b/debian/control @@ -2,10 +2,10 @@ Source: jdeb Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Steffen Moeller <[email protected]> +Uploaders: Steffen Moeller <[email protected]>, Emmanuel Bourg <[email protected]> Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.5) Build-Depends-Indep: libmaven-invoker-plugin-java, libmaven-shade-plugin-java, ant, libbcpg-java, - libcommons-compress-java, libcommons-io-java, libmaven2-core-java, libplexus-utils-java + libcommons-compress-java, libcommons-io-java, libmaven2-core-java, libplexus-utils-java, libmaven-plugin-tools-java Standards-Version: 3.9.4 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jdeb Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jdeb diff --git a/debian/maven.properties b/debian/maven.properties index 7c29bd7..cfdec07 100644 --- a/debian/maven.properties +++ b/debian/maven.properties @@ -2,3 +2,4 @@ # For example: # maven.test.skip=true +#maven.test.failure.ignore=true diff --git a/debian/patches/01_fix_testcase_bouncycastle.patch b/debian/patches/01_fix_testcase_bouncycastle.patch new file mode 100644 index 0000000..3fcc096 --- /dev/null +++ b/debian/patches/01_fix_testcase_bouncycastle.patch @@ -0,0 +1,14 @@ +Description: Update testcase to work with bouncycastle 1.49 +Author: Andreas Moog <[email protected]> + +--- jdeb-1.0.2~git20130829.orig/src/test/java/org/vafer/jdeb/signing/PGPSignerTestCase.java ++++ jdeb-1.0.2~git20130829/src/test/java/org/vafer/jdeb/signing/PGPSignerTestCase.java +@@ -42,7 +42,7 @@ public final class PGPSignerTestCase ext + "\n" + + "TEST3\n" + + "-----BEGIN PGP SIGNATURE-----\n" + +- "Version: BCPG v1.48\n" + ++ "Version: BCPG v1.49\n" + + "\n" + + "iEYEARECABAFAkax1rgJEHM9pIAuB02PAABIJgCghFmoCJCZ0CGiqgVLGGPd/Yh5\n" + + "FQQAnRVqvI2ij45JQSHYJBblZ0Vv2meN\n" + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..09c095e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01_fix_testcase_bouncycastle.patch diff --git a/debian/rules b/debian/rules index b76c54a..41e84a0 100755 --- a/debian/rules +++ b/debian/rules @@ -5,5 +5,7 @@ include /usr/share/cdbs/1/class/maven.mk JAVA_HOME := /usr/lib/jvm/default-java +DEB_INSTALL_CHANGELOGS_ALL := HISTORY.md + get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..c1f4984 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://github.com/tcurdt/jdeb/releases .*/jdeb-([\d\.]+).tar.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jdeb.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
