This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-filtering.
commit 0795af6bb213f1f71e667c91d9099c2c19f48b6f Author: Torsten Werner <[email protected]> Date: Sun Dec 7 22:34:10 2008 +0000 many fixes --- debian/changelog | 2 +- debian/control | 9 ++++--- debian/copyright | 6 ++--- debian/patches/pom.diff | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 12 ++++----- 6 files changed, 89 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 098d4dc..e3224ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ maven-filtering (1.0~beta-2-1) unstable; urgency=low UNRELEASED - * Initial release. (Closes: #xxxxxx) + * Initial release. (Closes: #508102) -- Torsten Werner <[email protected]> Thu, 04 Dec 2008 19:29:26 +0100 diff --git a/debian/control b/debian/control index 52de59c..a91f09d 100644 --- a/debian/control +++ b/debian/control @@ -3,16 +3,19 @@ Section: devel Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> -Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs, quilt, maven-ant-helper +Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs, quilt, maven-ant-helper, + libplexus-containers-java, libplexus-interpolation-java, libplexus-utils-java, + maven2 Standards-Version: 3.8.0 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/plugins/maven-compiler-plugin/ +Homepage: http://maven.apache.org/shared/maven-filtering/ Package: libmaven-filtering-java Architecture: all Section: devel -Depends: ${misc:Depends}, default-jre | java2-runtime +Depends: ${misc:Depends}, default-jre | java2-runtime, libplexus-containers-java, + libplexus-interpolation-java, libplexus-utils-java Description: Maven Filtering Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, diff --git a/debian/copyright b/debian/copyright index 067ec48..30274c1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,3 @@ -FIXME This package was debianized by Torsten Werner <[email protected]>. The Debian packaging is Copyright (c) 2008 Torsten Werner and is @@ -6,9 +5,10 @@ licensed under the GNU General Public License version 3. On Debian systems, the complete text of the GNU General Public License can be found in '/usr/share/common-licenses/GPL'. -The package was downloaded from <http://maven.apache.org>. +The package was downloaded from +<http://maven.apache.org/shared/maven-filtering>. -Copyright: 2006-2007 The Apache Software Foundation. +Copyright: 2008 The Apache Software Foundation. License: diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff new file mode 100644 index 0000000..2c4d236 --- /dev/null +++ b/debian/patches/pom.diff @@ -0,0 +1,72 @@ +Index: maven-filtering-1.0~beta-2/pom.xml +=================================================================== +--- maven-filtering-1.0~beta-2.orig/pom.xml 2008-12-07 23:28:08.000000000 +0100 ++++ maven-filtering-1.0~beta-2/pom.xml 2008-12-07 21:58:16.000000000 +0100 +@@ -18,11 +18,13 @@ + under the License. + --> + <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> ++ <!-- + <parent> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-shared-components</artifactId> + <version>10</version> + </parent> ++ --> + + <prerequisites> + <maven>2.0.6</maven> +@@ -58,9 +60,9 @@ + </pluginManagement> + <plugins> + <plugin> +- <groupId>org.codehaus.plexus</groupId> +- <artifactId>plexus-maven-plugin</artifactId> +- <version>1.3.4</version> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-plugin-plugin</artifactId> ++ <version>2.4.3</version> + <executions> + <execution> + <goals> +@@ -76,8 +78,11 @@ + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> +- <version>2.0.6</version> ++ <version>2.0.9</version> ++ <scope>system</scope> ++ <systemPath>/usr/share/java/maven2.jar</systemPath> + </dependency> ++ <!-- + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> +@@ -103,20 +108,25 @@ + <artifactId>maven-settings</artifactId> + <version>2.0.6</version> + </dependency> ++ --> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> +- <version>1.0-alpha-9-stable-1</version> ++ <version>1.0-beta2</version> ++ <scope>system</scope> ++ <systemPath>/usr/share/java/plexus-container-default-1.0.jar</systemPath> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>1.5.6</version> ++ <scope>system</scope> ++ <systemPath>/usr/share/java/plexus-utils-1.5.6.jar</systemPath> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-interpolation</artifactId> +- <version>1.6</version> ++ <version>1.7</version> + </dependency> + </dependencies> + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7740e23 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +pom.diff diff --git a/debian/rules b/debian/rules index 11511be..6714986 100755 --- a/debian/rules +++ b/debian/rules @@ -5,9 +5,9 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ') -VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/') +VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/' | sed 's/~/-/') JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := maven2 plexus-compiler-api plexus-compiler-manager \ +DEB_JARS := maven2 plexus-container-default-1.0 plexus-interpolation \ plexus-utils DEB_ANT_BUILD_TARGET := package #javadoc DEB_ANT_BUILDFILE := debian/build.xml @@ -17,9 +17,9 @@ API_DOCS := build/api get-orig-source: uscan --force-download -REPO := /usr/share/maven-repo -PLUGINS := $(REPO)/org/apache/maven/plugins +REPO := /usr/share/maven-repo +DEST := $(REPO)/org/apache/maven/shared binary-post-install/lib$(PACKAGE)-java:: - dh_install target/*.jar $(PLUGINS)/$(PACKAGE)/$(VERSION)/ - install -m644 pom.xml $(DEB_DESTDIR)$(PLUGINS)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).pom + dh_install target/*.jar $(DEST)/$(PACKAGE)/$(VERSION)/ + install -m644 pom.xml $(DEB_DESTDIR)$(DEST)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).pom -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-filtering.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
