The following commit has been merged in the master branch:
commit 93971314f276f3c09938c9dfbeb73fe76a2b8d8d
Author: Ludovic Claude <ludovic.cla...@laposte.net>
Date: Mon Jan 2 17:31:59 2012 +0100
Use Ant to build the package
diff --git a/debian/README.source b/debian/README.source
index e75416c..7493f2f 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,6 +4,3 @@ Information about plexus-components
This package was debianized using the mh_make command
from the maven-debian-helper package.
-The build system uses Maven but prevents it from downloading
-anything from the Internet, making the build compliant with
-the Debian policy.
diff --git a/debian/build-classpath b/debian/build-classpath
new file mode 100644
index 0000000..5bfa9ce
--- /dev/null
+++ b/debian/build-classpath
@@ -0,0 +1 @@
+/usr/share/java/ant-nodeps.jar
diff --git a/debian/build.properties b/debian/build.properties
new file mode 100644
index 0000000..4e12bf5
--- /dev/null
+++ b/debian/build.properties
@@ -0,0 +1,2 @@
+build.directory=target
+maven.test.skip=true
diff --git a/debian/control b/debian/control
index b6345b9..6723191 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovic.cla...@laposte.net>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>=
1.4)
+Build-Depends: debhelper (>= 7), default-jdk, maven-repo-helper (>= 1.5)
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-java/plexus-components.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/plexus-components.git
@@ -11,8 +11,7 @@ Homepage: http://plexus.codehaus.org/plexus-components
Package: libplexus-components-java
Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
-Recommends: ${maven:OptionalDepends}
+Depends: ${misc:Depends}
Description: Plexus Components parent POM
The Plexus project provides a full software stack for creating and executing
software projects.
diff --git a/debian/copyright b/debian/copyright
index 9862593..0019c8e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Copyright: 2001-2011, Codehaus
License: Apache-2.0
Files: debian/*
-Copyright: 2011, Ludovic Claude <ludovic.cla...@laposte.net>
+Copyright: 2012, Ludovic Claude <ludovic.cla...@laposte.net>
License: GPL-3+
License: Apache-2.0
@@ -16,6 +16,6 @@ License: Apache-2.0
License: GPL-3+
On Debian GNU/Linux system you can find the complete text of the
- BSD license in '/usr/share/common-licenses/GPL-3'
+ GPL 3 license in '/usr/share/common-licenses/GPL-3'
diff --git a/debian/maven.rules b/debian/maven.rules
index b62a1b2..ed1d47b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -20,4 +20,3 @@ junit junit jar s/3\..*/3.x/ * *
org.codehaus.plexus plexus-components pom s/1\..*/1.x/ * *
org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
org.codehaus.plexus plexus pom s/2\..*/2.x/ * *
-
diff --git a/debian/rules b/debian/rules
index 562f1f3..28d3fd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,10 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.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_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
+%:
+ dh $@ --with maven_repo_helper
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
--
plexus-components packaging
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
