[apache-pom] 05/20: * Only use maven_repo_helper and debhelper to install POM: - Drop Build-Depends on cdbs and ant. * Remove d/README.source.

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository apache-pom.

commit baa23300566da93c0aa8394f7d3f53ea2f94558d
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sun Dec 4 00:59:13 2011 +0000

    * Only use maven_repo_helper and debhelper to install POM:
      - Drop Build-Depends on cdbs and ant.
    * Remove d/README.source.
---
 debian/README.source |  6 ------
 debian/changelog     |  8 ++++++++
 debian/control       |  7 +------
 debian/rules         | 16 ++++------------
 4 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index be66def..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-Information about apache-pom
-------------------------------
-
-This package was debianized using the mh_make command
-from the maven-debian-helper package.
-
diff --git a/debian/changelog b/debian/changelog
index c4a1aaa..de0f8fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apache-pom (10-2) unstable; urgency=low
+
+  * Only use maven_repo_helper and debhelper to install POM:
+    - Drop Build-Depends on cdbs and ant.
+  * Remove d/README.source.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 04 Dec 2011 01:54:48 +0100
+
 apache-pom (10-1) unstable; urgency=low
 
   * Initial release (Closes: #644558)
diff --git a/debian/control b/debian/control
index c17cfd9..59069b3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>,
            Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: ant-optional,
-               cdbs,
-               debhelper (>= 7),
-               default-jdk,
-               maven-ant-helper (>> 6.7)
-Build-Depends-Indep: maven-repo-helper (>= 1.7)
+Build-Depends: debhelper (>= 7), default-jdk, maven-repo-helper (>= 1.7)
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/apache-pom
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/apache-pom
diff --git a/debian/rules b/debian/rules
index acdbd64..fda5457 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,11 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps   ant-junit  
-DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE)
+DEB_SOURCE_PACKAGE   := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
+DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//')
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
 
-binary-post-install/libapache-pom-java::
-	mh_install -plibapache-pom-java
-
-clean::
-	-mh_clean
+%:
+	dh $@ --with maven_repo_helper
 

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