[pkg-java] r10693 - trunk/checkstyle/debian

[Michael Koch]

Author: mkoch
Date: 2009-09-28 18:27:48 +0000 (Mon, 28 Sep 2009)
New Revision: 10693

Modified:
   trunk/checkstyle/debian/changelog
   trunk/checkstyle/debian/control
   trunk/checkstyle/debian/rules
   trunk/checkstyle/debian/watch
Log:
checkstyle (5.0+dfsg-1) UNRELEASED; urgency=low

  * New upstream version.
  * Reworked Build-Depends.
  * Cleaned up debian/rules.
  * Remove automatic update feature from watch file.

 -- Michael Koch <konqueror at gmx.de>  Sun, 27 Sep 2009 11:25:29 +0200



Modified: trunk/checkstyle/debian/changelog
===================================================================
--- trunk/checkstyle/debian/changelog	2009-09-28 18:03:54 UTC (rev 10692)
+++ trunk/checkstyle/debian/changelog	2009-09-28 18:27:48 UTC (rev 10693)
@@ -1,3 +1,12 @@
+checkstyle (5.0+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+  * Reworked Build-Depends.
+  * Cleaned up debian/rules.
+  * Remove automatic update feature from watch file.
+
+ -- Michael Koch <konqueror at gmx.de>  Sun, 27 Sep 2009 11:25:29 +0200
+
 checkstyle (4.4+dfsg-4) unstable; urgency=low
 
   [ Dominik Smatana ]

Modified: trunk/checkstyle/debian/control
===================================================================
--- trunk/checkstyle/debian/control	2009-09-28 18:03:54 UTC (rev 10692)
+++ trunk/checkstyle/debian/control	2009-09-28 18:27:48 UTC (rev 10693)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Dominik Smatana <dominik.smatana at gmail.com>, Michael Koch <konqueror at gmx.de>, Paul Cager <paul-debian at home.paulcager.org> 
-Build-Depends: cdbs, debhelper (>= 5), ant
-Build-Depends-Indep: default-jdk-builddep, ant-optional, junit (>= 3.8.1), libcommons-beanutils-java (>= 1.5), libcommons-collections-java (>= 2.1), libcommons-logging-java (>= 1.0.3), libregexp-java, antlr (>= 2.7.6), libcommons-cli-java, velocity, libjdom1-java, tofrodos
+Build-Depends: cdbs, debhelper (>= 7), ant-optional, default-jdk
+Build-Depends-Indep: junit (>= 3.8.1), libcommons-beanutils-java (>= 1.5), libcommons-collections-java (>= 2.1), libcommons-logging-java (>= 1.0.3), libregexp-java, antlr (>= 2.7.6), libcommons-cli-java, velocity, libjdom1-java, tofrodos
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/checkstyle
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/checkstyle

Modified: trunk/checkstyle/debian/rules
===================================================================
--- trunk/checkstyle/debian/rules	2009-09-28 18:03:54 UTC (rev 10692)
+++ trunk/checkstyle/debian/rules	2009-09-28 18:27:48 UTC (rev 10693)
@@ -10,14 +10,13 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME	     := /usr/lib/jvm/default-java/
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := junit commons-beanutils commons-collections commons-logging regexp antlr commons-cli $(ANT_HOME)/lib/ant-nodeps.jar velocity jdom1 xercesImpl logkit log4j-1.2
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+.*//')
+
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := junit commons-beanutils commons-collections commons-logging regexp antlr commons-cli $(ANT_HOME)/lib/ant-nodeps.jar velocity jdom1 xercesImpl logkit log4j-1.2
 DOWNLOAD             := http://heanet.dl.sourceforge.net/sourceforge/checkstyle/checkstyle-src-$(VERSION).tar.gz
-#DEB_ANT_ARGS := -verbose
 DEB_ANT_BUILD_TARGET := build.bindist #compile.checkstyle #javadoc
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
 
 get-orig-source:
 	echo "Getting $(DOWNLOAD)"

Modified: trunk/checkstyle/debian/watch
===================================================================
--- trunk/checkstyle/debian/watch	2009-09-28 18:03:54 UTC (rev 10692)
+++ trunk/checkstyle/debian/watch	2009-09-28 18:27:48 UTC (rev 10693)
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\+dfsg\d*$// \
-	http://sf.net/checkstyle/checkstyle-src-([\d+\.]+)\.tar\.gz debian uupdate
+	http://sf.net/checkstyle/checkstyle-src-([\d+\.]+)\.tar\.gz