[maven-filtering] 06/32: * New version
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Jul 17 15:57:10 UTC 2017
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 cc85eea8778dc60e06230788344cc5fdccf27204
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date: Tue Jul 7 23:48:59 2009 +0000
* New version
---
debian/ant.properties | 4 --
debian/build.properties | 3 ++
debian/build.xml | 24 ------------
debian/changelog | 12 ++++++
debian/components.xml | 12 +++---
debian/control | 15 ++++----
debian/copyright | 2 +-
debian/libmaven-filtering-java.poms | 1 +
debian/maven.rules | 3 ++
debian/patches/pom.diff | 75 -------------------------------------
debian/patches/series | 1 -
debian/rules | 33 ++++++++--------
12 files changed, 52 insertions(+), 133 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index bcb4166..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-javadoc.dir=build/api
-build.directory=target
-build.outputDirectory=target/classes
-maven.test.skip=true
diff --git a/debian/build.properties b/debian/build.properties
new file mode 100644
index 0000000..231acb2
--- /dev/null
+++ b/debian/build.properties
@@ -0,0 +1,3 @@
+javadoc.dir=target/api
+build.directory=target
+maven.test.skip=true
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 3257414..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="pkg-java" default="package" basedir="..">
-
- <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/>
- <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-
- <target name="clean">
- <ant target="clean" antfile="${maven.build.xml}" dir="."/>
- </target>
-
- <target name="package">
- <ant target="package" antfile="${maven.build.xml}" dir=".">
- <property name="artifactId" value="maven-filtering"/>
- </ant>
- </target>
-
- <target name="javadoc">
- <javadoc destdir="${javadoc.dir}">
- <packageset dir="src/main/java/"/>
- </javadoc>
- </target>
-
-</project>
diff --git a/debian/changelog b/debian/changelog
index 715647e..f69fc51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+maven-filtering (1.0~beta-2-2) unstable; urgency=low
+
+ * Change section to java, bump up Standards-Version to 3.8.1
+ * Add the Maven POM to the package,
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Remove the patch for the POM as it's no longer needed, as well as
+ the dependency on Quilt
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Thu, 14 May 2009 21:42:10 +0100
+
maven-filtering (1.0~beta-2-1) unstable; urgency=low
* Initial release. (Closes: #508102)
diff --git a/debian/components.xml b/debian/components.xml
index 5b21847..e3aa77a 100644
--- a/debian/components.xml
+++ b/debian/components.xml
@@ -1,12 +1,6 @@
<component-set>
<components>
<component>
- <role>org.apache.maven.shared.filtering.MavenFileFilter</role>
- <role-hint>default</role-hint>
- <implementation>org.apache.maven.shared.filtering.DefaultMavenFileFilter</implementation>
- <description></description>
- </component>
- <component>
<role>org.apache.maven.shared.filtering.MavenResourcesFiltering</role>
<role-hint>default</role-hint>
<implementation>org.apache.maven.shared.filtering.DefaultMavenResourcesFiltering</implementation>
@@ -19,5 +13,11 @@
</requirement>
</requirements>
</component>
+ <component>
+ <role>org.apache.maven.shared.filtering.MavenFileFilter</role>
+ <role-hint>default</role-hint>
+ <implementation>org.apache.maven.shared.filtering.DefaultMavenFileFilter</implementation>
+ <description></description>
+ </component>
</components>
</component-set>
diff --git a/debian/control b/debian/control
index a91f09d..4c4913d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,21 @@
Source: maven-filtering
-Section: devel
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>
-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
+Build-Depends: default-jdk, debhelper (>= 5), cdbs
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
+ junit,
+ libmaven2-core-java, libplexus-container-default-java,
+ libplexus-interpolation-java, libplexus-utils-java,
+Standards-Version: 3.8.1
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/shared/maven-filtering/
Package: libmaven-filtering-java
Architecture: all
-Section: devel
-Depends: ${misc:Depends}, default-jre | java2-runtime, libplexus-containers-java,
+Depends: ${misc:Depends}, libmaven2-core-java, libplexus-container-default-java,
libplexus-interpolation-java, libplexus-utils-java
Description: Maven Filtering
Maven is a software project management and comprehension tool. Based on the
diff --git a/debian/copyright b/debian/copyright
index 30274c1..1097655 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ This package was debianized by Torsten Werner <twerner at debian.org>.
The Debian packaging is Copyright (c) 2008 Torsten Werner and is
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'.
+found in '/usr/share/common-licenses/GPL-3'.
The package was downloaded from
<http://maven.apache.org/shared/maven-filtering>.
diff --git a/debian/libmaven-filtering-java.poms b/debian/libmaven-filtering-java.poms
new file mode 100644
index 0000000..43e746b
--- /dev/null
+++ b/debian/libmaven-filtering-java.poms
@@ -0,0 +1 @@
+pom.xml --no-parent
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..6cc1dba
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,3 @@
+junit junit jar s/3\..*/3.x/
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/
+
diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
deleted file mode 100644
index 84cf79e..0000000
--- a/debian/patches/pom.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: maven-filtering-1.0~beta-2/pom.xml
-===================================================================
---- maven-filtering-1.0~beta-2.orig/pom.xml 2008-10-03 23:49:43.000000000 +0200
-+++ maven-filtering-1.0~beta-2/pom.xml 2008-12-08 21:53:25.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>
-@@ -57,6 +59,7 @@
- </plugins>
- </pluginManagement>
- <plugins>
-+ <!--
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
-@@ -69,6 +72,7 @@
- </execution>
- </executions>
- </plugin>
-+ -->
- </plugins>
- </build>
-
-@@ -76,8 +80,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 +110,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
deleted file mode 100644
index 7740e23..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-pom.diff
diff --git a/debian/rules b/debian/rules
index 3243923..ca2b7eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,29 +2,32 @@
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 := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/' | sed 's/~/-/')
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := maven2 plexus-container-default-1.0 plexus-interpolation \
- plexus-utils
+DEB_JARS := ant-nodeps maven-core maven-project maven-model \
+ plexus-container-default-alpha plexus-interpolation plexus-utils junit
DEB_ANT_BUILD_TARGET := package #javadoc
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dversion=$(VERSION)
-API_DOCS := build/api
+DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml
+DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+API_DOCS := target/api
get-orig-source:
- uscan --force-download
-
-REPO := /usr/share/maven-repo
-DEST := $(REPO)/org/apache/maven/shared
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
makebuilddir/lib$(PACKAGE)-java::
install -d target/classes/META-INF/plexus/
install -m644 debian/components.xml target/classes/META-INF/plexus/
binary-post-install/lib$(PACKAGE)-java::
- dh_install target/*.jar $(DEST)/$(PACKAGE)/$(VERSION)/
- install -m644 pom.xml $(DEB_DESTDIR)$(DEST)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).pom
- dh_link $(DEST)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).jar /usr/share/java/$(PACKAGE).jar
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar
+
+clean::
+ -rm -rf debian/tmp
+
+# Extract generated plexus components.xml files from a standard Maven build
+copy-plexus-components: target/classes/META-INF/plexus/components.xml
+ cp target/classes/META-INF/plexus/components.xml debian/components.xml
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-filtering.git
More information about the pkg-java-commits
mailing list