[plexus-cdc] 18/27: * 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.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository plexus-cdc.

commit 66e4c7cfcbc2334895c39696f62630a5cd0db27a
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sun May 29 11:37:30 2011 +0000

    * 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.
---
 debian/README.source |  6 ------
 debian/changelog     | 11 +++++++++--
 debian/compat        |  2 +-
 debian/control       |  4 ++--
 debian/rules         |  7 +++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 7df3fd2..0000000
--- a/debian/README.source
+++ /dev/null
@@ -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.
-
diff --git a/debian/changelog b/debian/changelog
index 9c4cec3..29092ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
 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
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index b7d8a84..8560cfd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: java
 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
diff --git a/debian/rules b/debian/rules
index e674773..88283cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ binary-post-install/lib$(PACKAGE)-java::
 	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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-cdc.git