[pkg-java] r13712 - trunk/plexus-cdc/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-05-29 11:37:30 +0000 (Sun, 29 May 2011)
New Revision: 13712

Removed:
   trunk/plexus-cdc/debian/README.source
Modified:
   trunk/plexus-cdc/debian/changelog
   trunk/plexus-cdc/debian/compat
   trunk/plexus-cdc/debian/control
   trunk/plexus-cdc/debian/rules
Log:
* Bump Standards-Version to 3.9.2: no changes needed.
* Fix FTBFS: remove version param (deprecated in debian-ant-helper)
  and use POM version (Closes: #628361).
* Use mh_clean in clean rule.
* Bump to debhelper 7 compat level.

Deleted: trunk/plexus-cdc/debian/README.source
===================================================================
--- trunk/plexus-cdc/debian/README.source	2011-05-29 11:37:17 UTC (rev 13711)
+++ trunk/plexus-cdc/debian/README.source	2011-05-29 11:37:30 UTC (rev 13712)
@@ -1,6 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-

Modified: trunk/plexus-cdc/debian/changelog
===================================================================
--- trunk/plexus-cdc/debian/changelog	2011-05-29 11:37:17 UTC (rev 13711)
+++ trunk/plexus-cdc/debian/changelog	2011-05-29 11:37:30 UTC (rev 13712)
@@ -1,10 +1,17 @@
 plexus-cdc (1.0~alpha14-6) unstable; urgency=low
 
-  * UNRELEASED
+  [ Torsten Werner ]
   * Switch to source format 3.0.
 
- -- Torsten Werner <twerner at debian.org>  Wed, 05 May 2010 07:34:10 +0200
+  [ Damien Raude-Morvan ]
+  * Bump Standards-Version to 3.9.2: no changes needed.
+  * Fix FTBFS: remove version param (deprecated in debian-ant-helper)
+    and use POM version (Closes: #628361).
+  * Use mh_clean in clean rule.
+  * Bump to debhelper 7 compat level.
 
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 29 May 2011 13:26:19 +0200
+
 plexus-cdc (1.0~alpha14-5) unstable; urgency=low
 
   * Bump Standards-Version to 3.8.4, no change

Modified: trunk/plexus-cdc/debian/compat
===================================================================
--- trunk/plexus-cdc/debian/compat	2011-05-29 11:37:17 UTC (rev 13711)
+++ trunk/plexus-cdc/debian/compat	2011-05-29 11:37:30 UTC (rev 13712)
@@ -1 +1 @@
-5
+7

Modified: trunk/plexus-cdc/debian/control
===================================================================
--- trunk/plexus-cdc/debian/control	2011-05-29 11:37:17 UTC (rev 13711)
+++ trunk/plexus-cdc/debian/control	2011-05-29 11:37:30 UTC (rev 13712)
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk
+Build-Depends: debhelper (>= 7), cdbs, default-jdk
 Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
  libplexus-containers-java, libplexus-utils-java,
  libslf4j-java, libjdom1-java, libqdox-java (>= 1.11)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-cdc
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-cdc/
 Homepage: http://plexus.codehaus.org/guides/quick-start/component-descriptor-creator.html

Modified: trunk/plexus-cdc/debian/rules
===================================================================
--- trunk/plexus-cdc/debian/rules	2011-05-29 11:37:17 UTC (rev 13711)
+++ trunk/plexus-cdc/debian/rules	2011-05-29 11:37:30 UTC (rev 13712)
@@ -2,15 +2,14 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
+VERSION              := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -s "s/~alpha/-alpha-/")
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := ant-nodeps slf4j-api qdox jdom1 plexus-container-default plexus-utils
 DEB_ANT_BUILD_TARGET := package #javadoc
 DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE)
 API_DOCS             := target/api
 
 binary-post-install/lib$(PACKAGE)-java::
@@ -18,7 +17,7 @@
 	mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar
 
 clean::
-	-rm -rf debian/tmp
+	mh_clean
 
 get-orig-source:
 	sh -e debian/orig-tar.sh