[pkg-java] r13716 - in trunk/maven-filtering/debian: . source

[Damien Raude-Morvan]

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

Added:
   trunk/maven-filtering/debian/source/
   trunk/maven-filtering/debian/source/format
Modified:
   trunk/maven-filtering/debian/changelog
   trunk/maven-filtering/debian/compat
   trunk/maven-filtering/debian/control
   trunk/maven-filtering/debian/rules
Log:
* Add myself to Uploaders.
* 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: #628343).
* Use mh_clean in clean rule.
* Bump to debhelper 7 compat level.
* Switch to source format 3.0 (quilt).

Modified: trunk/maven-filtering/debian/changelog
===================================================================
--- trunk/maven-filtering/debian/changelog	2011-05-29 11:37:48 UTC (rev 13715)
+++ trunk/maven-filtering/debian/changelog	2011-05-29 11:37:55 UTC (rev 13716)
@@ -1,3 +1,15 @@
+maven-filtering (1.0~beta-2-5) unstable; urgency=low
+
+  * Add myself to Uploaders.
+  * 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: #628343).
+  * Use mh_clean in clean rule.
+  * Bump to debhelper 7 compat level.
+  * Switch to source format 3.0 (quilt).
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 29 May 2011 13:33:44 +0200
+
 maven-filtering (1.0~beta-2-4) unstable; urgency=low
 
   * Bump up Standards-Version to 3.8.3

Modified: trunk/maven-filtering/debian/compat
===================================================================
--- trunk/maven-filtering/debian/compat	2011-05-29 11:37:48 UTC (rev 13715)
+++ trunk/maven-filtering/debian/compat	2011-05-29 11:37:55 UTC (rev 13716)
@@ -1 +1 @@
-5
+7

Modified: trunk/maven-filtering/debian/control
===================================================================
--- trunk/maven-filtering/debian/control	2011-05-29 11:37:48 UTC (rev 13715)
+++ trunk/maven-filtering/debian/control	2011-05-29 11:37:55 UTC (rev 13716)
@@ -2,13 +2,13 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: default-jdk, debhelper (>= 5), cdbs
+Uploaders: Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: default-jdk, debhelper (>= 7), cdbs
 Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
  junit,
  libmaven2-core-java, libplexus-container-default-java, 
  libplexus-interpolation-java (>= 1.6), libplexus-utils-java (>= 1.5.6),
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-filtering
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-filtering/
 Homepage: http://maven.apache.org/shared/maven-filtering/
@@ -33,5 +33,5 @@
     * Providing guidelines for best practices development
     * Allowing transparent migration to new features
  .
- This packages provides a shared component for all Maven plugins which needs to
+ This package provides a shared component for all Maven plugins which needs to
  filter resources.

Modified: trunk/maven-filtering/debian/rules
===================================================================
--- trunk/maven-filtering/debian/rules	2011-05-29 11:37:48 UTC (rev 13715)
+++ trunk/maven-filtering/debian/rules	2011-05-29 11:37:55 UTC (rev 13716)
@@ -4,13 +4,13 @@
 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/~/-/")
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := ant-nodeps maven-core maven-project maven-model \
   plexus-container-default-alpha plexus-interpolation plexus-utils junit
 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:
@@ -25,7 +25,7 @@
 	mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar
 
 clean::
-	-rm -rf debian/tmp
+	mh_clean
 
 # Extract generated plexus components.xml files from a standard Maven build
 copy-plexus-components: target/classes/META-INF/plexus/components.xml

Added: trunk/maven-filtering/debian/source/format
===================================================================
--- trunk/maven-filtering/debian/source/format	                        (rev 0)
+++ trunk/maven-filtering/debian/source/format	2011-05-29 11:37:55 UTC (rev 13716)
@@ -0,0 +1 @@
+3.0 (quilt)