Author: drazzib
Date: 2011-12-04 00:59:13 +0000 (Sun, 04 Dec 2011)
New Revision: 15489

Removed:
   trunk/apache-pom/debian/README.source
Modified:
   trunk/apache-pom/debian/changelog
   trunk/apache-pom/debian/control
   trunk/apache-pom/debian/rules
Log:
* Only use maven_repo_helper and debhelper to install POM:
  - Drop Build-Depends on cdbs and ant.
* Remove d/README.source.

Deleted: trunk/apache-pom/debian/README.source
===================================================================
--- trunk/apache-pom/debian/README.source       2011-12-03 02:02:28 UTC (rev 
15488)
+++ trunk/apache-pom/debian/README.source       2011-12-04 00:59:13 UTC (rev 
15489)
@@ -1,6 +0,0 @@
-Information about apache-pom
-------------------------------
-
-This package was debianized using the mh_make command
-from the maven-debian-helper package.
-

Modified: trunk/apache-pom/debian/changelog
===================================================================
--- trunk/apache-pom/debian/changelog   2011-12-03 02:02:28 UTC (rev 15488)
+++ trunk/apache-pom/debian/changelog   2011-12-04 00:59:13 UTC (rev 15489)
@@ -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 <draz...@debian.org>  Sun, 04 Dec 2011 01:54:48 +0100
+
 apache-pom (10-1) unstable; urgency=low
 
   * Initial release (Closes: #644558)

Modified: trunk/apache-pom/debian/control
===================================================================
--- trunk/apache-pom/debian/control     2011-12-03 02:02:28 UTC (rev 15488)
+++ trunk/apache-pom/debian/control     2011-12-04 00:59:13 UTC (rev 15489)
@@ -4,12 +4,7 @@
 Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.cla...@laposte.net>,
            Damien Raude-Morvan <draz...@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

Modified: trunk/apache-pom/debian/rules
===================================================================
--- trunk/apache-pom/debian/rules       2011-12-03 02:02:28 UTC (rev 15488)
+++ trunk/apache-pom/debian/rules       2011-12-04 00:59:13 UTC (rev 15489)
@@ -1,19 +1,11 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+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/-[^-]*$$//')
 
-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)
-
 get-orig-source:
        uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download 
--rename
 
-binary-post-install/libapache-pom-java::
-       mh_install -plibapache-pom-java
+%:
+       dh $@ --with maven_repo_helper
 
-clean::
-       -mh_clean
-


_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to