[pkg-java] r13861 - trunk/plexus-component-metadata/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-07-19 18:16:41 +0000 (Tue, 19 Jul 2011)
New Revision: 13861

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

Deleted: trunk/plexus-component-metadata/debian/README.source
===================================================================
--- trunk/plexus-component-metadata/debian/README.source	2011-07-18 23:27:28 UTC (rev 13860)
+++ trunk/plexus-component-metadata/debian/README.source	2011-07-19 18:16:41 UTC (rev 13861)
@@ -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-component-metadata/debian/changelog
===================================================================
--- trunk/plexus-component-metadata/debian/changelog	2011-07-18 23:27:28 UTC (rev 13860)
+++ trunk/plexus-component-metadata/debian/changelog	2011-07-19 18:16:41 UTC (rev 13861)
@@ -1,3 +1,12 @@
+plexus-component-metadata (1.0~beta3.0.7-5) unstable; urgency=low
+
+  * Bump Standards-Version to 3.9.2: no changes needed.
+  * Use mh_clean in clean rule.
+  * Fix FTBFS: remove version param (deprecated in debian-ant-helper)
+    and use POM version (Closes: #634602).
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 19 Jul 2011 20:05:18 +0200
+
 plexus-component-metadata (1.0~beta3.0.7-4) unstable; urgency=low
 
   [ Torsten Werner ]

Modified: trunk/plexus-component-metadata/debian/control
===================================================================
--- trunk/plexus-component-metadata/debian/control	2011-07-18 23:27:28 UTC (rev 13860)
+++ trunk/plexus-component-metadata/debian/control	2011-07-19 18:16:41 UTC (rev 13861)
@@ -8,7 +8,7 @@
  junit, libmaven-plugin-tools-java, libplexus-velocity-java, velocity,
  libplexus-containers-java, libplexus-utils-java, libqdox-java, 
  libjdom1-java, libmaven2-core-java, libplexus-cli-java, libcommons-cli-java, libasm3-java
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-component-metadata
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-component-metadata/
 Homepage: http://plexus.codehaus.org

Modified: trunk/plexus-component-metadata/debian/rules
===================================================================
--- trunk/plexus-component-metadata/debian/rules	2011-07-18 23:27:28 UTC (rev 13860)
+++ trunk/plexus-component-metadata/debian/rules	2011-07-19 18:16:41 UTC (rev 13861)
@@ -4,14 +4,14 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
+VERSION              := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -s "s/~beta/-beta-/")
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := ant-nodeps plexus-container-default plexus-component-annotations plexus-classworlds plexus-utils \
  maven-core maven-plugin-api maven-project maven-model maven-artifact maven-artifact-manager \
  qdox jdom1 plexus-cli commons-cli asm3 asm3-core
 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
 
 get-orig-source:
@@ -22,4 +22,4 @@
 	mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar
 
 clean::
-	-rm -rf debian/tmp
+	mh_clean