This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jtidy.
commit ac254223049c59ae960834b29d4c389f98ca236a Author: Ludovic Claude <ludovic.cla...@laposte.net> Date: Tue Apr 17 22:34:17 2012 +0000 remove patch to force version in POM as it did not apply cleanly and use option in maven.mk instead --- debian/changelog | 2 ++ debian/patches/0001-improve-pom-version.patch | 29 --------------------------- debian/patches/series | 1 - debian/rules | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5aa9194..2094379 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ jtidy (7+svn20110807-4) unstable; urgency=low - update Standard-Version to 3.9.3, no changes - remove Michael Koch from the list of uploaders (closes: #654040) + * remove patch to force version in POM as it did not + apply cleanly and use option in maven.mk instead -- Ludovic Claude <ludovic.cla...@laposte.net> Wed, 18 Apr 2012 00:04:05 +0200 diff --git a/debian/patches/0001-improve-pom-version.patch b/debian/patches/0001-improve-pom-version.patch deleted file mode 100644 index 063dc8f..0000000 --- a/debian/patches/0001-improve-pom-version.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Date: Sun, 7 Aug 2011 01:06:04 +0200 -Subject: [PATCH] improve pom version - ---- - pom.xml | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 00841c0..a523206 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -5,7 +5,7 @@ - <groupId>net.sf.jtidy</groupId> - <artifactId>jtidy</artifactId> - <name>JTidy</name> -- <version>8.0-SNAPSHOT</version> -+ <version>8.0-alpha-20110807</version> - <description> - JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty printer. Like its non-Java cousin, JTidy can be - used as a tool for cleaning up malformed and faulty HTML. In addition, JTidy provides a DOM interface to the -@@ -284,4 +284,4 @@ - <url>scp://shell.sourceforge.net/home/groups/j/jt/jtidy/htdocs/</url> - </site> - </distributionManagement> --</project> -\ No newline at end of file -+</project> --- diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 795693c..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-improve-pom-version.patch diff --git a/debian/rules b/debian/rules index c9523a8..e7df169 100755 --- a/debian/rules +++ b/debian/rules @@ -4,4 +4,4 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/maven.mk JAVA_HOME := /usr/lib/jvm/default-java - +DEB_PATCHPOMS_ARGS := --set-version=$(DEB_UPSTREAM_VERSION) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jtidy.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits