[plexus-i18n] 20/31: * Use Maven to build the package. * Update debian/copyright.
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Aug 30 08:16:50 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository plexus-i18n.
commit 04584cc386c1d409d10d8224097571bd5d364dd8
Author: Torsten Werner <twerner at debian.org>
Date: Fri Aug 26 14:01:43 2011 +0000
* Use Maven to build the package.
* Update debian/copyright.
---
debian/README.source | 9 ++
debian/build.properties | 3 -
debian/changelog | 4 +-
debian/components.xml | 9 --
debian/control | 14 ++--
debian/copyright | 95 +++++-----------------
debian/libplexus-i18n-java-doc.doc-base | 9 --
debian/libplexus-i18n-java-doc.doc-base.api | 10 +++
debian/libplexus-i18n-java-doc.docs | 1 -
debian/libplexus-i18n-java-doc.install | 2 +
debian/libplexus-i18n-java.poms | 27 +++++-
debian/maven.cleanIgnoreRules | 17 ++++
debian/maven.ignoreRules | 16 ++++
debian/maven.properties | 4 +
debian/maven.publishedRules | 19 +++++
debian/maven.rules | 19 +++++
debian/orig-tar.sh | 17 ++--
...ssing-dependency-plexus-container-default.patch | 25 ++++++
debian/patches/series | 1 +
debian/rules | 25 +-----
debian/watch | 6 +-
21 files changed, 191 insertions(+), 141 deletions(-)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..3af5336
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+Information about plexus-i18n
+------------------------------
+
+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.properties b/debian/build.properties
deleted file mode 100644
index 6b8a4ef..0000000
--- a/debian/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-javadoc.dir=build/api
-maven.test.skip=true
-build.javaVersion=1.5
diff --git a/debian/changelog b/debian/changelog
index e6d7b1d..8dbeb8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ plexus-i18n (1.0-beta-10-3) unstable; urgency=low
* Update Standards-Version: 3.9.1.
* Switch to debhelper level 7.
* Switch to source format 3.0.
+ * Use Maven to build the package.
+ * Update debian/copyright.
- -- Torsten Werner <twerner at debian.org> Fri, 26 Aug 2011 15:38:14 +0200
+ -- Torsten Werner <twerner at debian.org> Fri, 26 Aug 2011 15:49:20 +0200
plexus-i18n (1.0-beta-10-2) unstable; urgency=low
diff --git a/debian/components.xml b/debian/components.xml
deleted file mode 100644
index 3e0c7ba..0000000
--- a/debian/components.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component-set>
- <components>
- <component>
- <role>org.codehaus.plexus.i18n.I18N</role>
- <implementation>org.codehaus.plexus.i18n.DefaultI18N</implementation>
- <description></description>
- </component>
- </components>
-</component-set>
diff --git a/debian/control b/debian/control
index 6f619b0..2583b98 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,9 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
- libxalan2-java, libplexus-utils-java (>= 1:1.4.5), libplexus-containers-java,
- default-jdk-doc
-Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libplexus-maven-plugin-java, libplexus-utils-java, default-jdk-doc, libplexus-utils-java-doc,
+ libmaven-javadoc-plugin-java, libplexus-containers-java
Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-i18n
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-i18n/
@@ -14,7 +13,8 @@ Homepage: http://plexus.codehaus.org/
Package: libplexus-i18n-java
Architecture: all
-Depends: ${misc:Depends}, libplexus-utils-java, libplexus-containers-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
Suggests: libplexus-i18n-java-doc
Description: a component to support internationalization of applications using Plexus
Plexus I18n is a set of Plexus-components supporting internationalization of
@@ -23,11 +23,11 @@ Description: a component to support internationalization of applications using P
Package: libplexus-i18n-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}, default-jdk-doc, libplexus-containers-java-doc, libplexus-utils-java-doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
Suggests: libplexus-i18n-java
Description: API Documentation for plexus-i18n
Plexus I18n is a set of Plexus-components supporting internationalization of
Plexus-based applications.
.
This package contains the API documentation for plexus-i18n.
-
diff --git a/debian/copyright b/debian/copyright
index 3d29ca3..8ae16ca 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,75 +1,20 @@
-This package was debianized by Trygve Laugstol <trygvis at inamo.no>
-on 07-June-2007.
-
-The Debian packaging is Copyright (c) 2007 Trygve Laugstol and is licensed under
-the GNU General Public License version 2. On Debian systems, the complete text
-of the GNU General Public License version 2 can be found in
-'/usr/share/common-licenses/GPL-2'.
-
-
-plexus-i18n was downloaded from:
- http://svn.codehaus.org/plexus/plexus-components/trunk/plexus-i18n
-
-Upstream Authors:
- The Apache Software Foundation
- The Codehaus Foundation
- Daniel Rall <dlr at collab.net> or <dlr at finemaltcoding.com>
- Jason van Zyl <jason at zenplex.com>
-
-Copyright:
- Copyright (c) 2001-2007, Codehaus.org
-
-License:
- Licensed under the Apache License, Version 2.0 (the "License")
-
-The full text of the license can be found in
-`/usr/share/common-licenses/Apache-2.0'.
-
-
-Source files DefaultI18NTest.java and I18NTokenizerTest.java are
-licensed under version 1.1 of the license:
- The Apache Software License, Version 1.1
-
- Copyright (c) 2001 The Apache Software Foundation. All rights
- reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- 3. The end-user documentation included with the redistribution,
- if any, must include the following acknowledgment:
- "This product includes software developed by the
- Apache Software Foundation (http://www.codehaus.org/)."
- Alternately, this acknowledgment may appear in the software itself,
- if and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Apache" and "Apache Software Foundation" and
- "Apache Turbine" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact codehaus at codehaus.org.
-
- 5. Products derived from this software may not be called "Apache",
- "Apache Turbine", nor may "Apache" appear in their name, without
- prior written permission of the Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Plexus I18N Component
+Source: http://plexus.codehaus.org/
+
+Files: *
+Copyright: 2001-2007, Codehaus.org
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2007, Trygve Laugstol <trygvis at inamo.no>
+ 2011, Torsten Werner <Torsten Werner <twerner at debian.org>>
+License: GPL-2
+
+License: Apache-2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'.
+
+License: GPL-2
+ On Debian GNU/Linux system you can find the complete text of the
+ GLP-2 license in '/usr/share/common-licenses/GPL-2'.
diff --git a/debian/libplexus-i18n-java-doc.doc-base b/debian/libplexus-i18n-java-doc.doc-base
deleted file mode 100644
index 2cb3c27..0000000
--- a/debian/libplexus-i18n-java-doc.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: libplexus-i18n-java
-Title: API Javadoc for libplexus-i18n
-Author: plexus-i18n developers
-Abstract: This is the API Javadoc provided by the libplexus-i18n library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libplexus-i18n-java-doc/api/index.html
-Files: /usr/share/doc/libplexus-i18n-java-doc/api/*
diff --git a/debian/libplexus-i18n-java-doc.doc-base.api b/debian/libplexus-i18n-java-doc.doc-base.api
new file mode 100644
index 0000000..993f8e0
--- /dev/null
+++ b/debian/libplexus-i18n-java-doc.doc-base.api
@@ -0,0 +1,10 @@
+Document: libplexus-i18n-java
+Title: API Javadoc for Plexus I18N Component
+Author: Plexus I18N Component developers
+Abstract: This is the API Javadoc provided for the
+ libplexus-i18n-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libplexus-i18n-java/api/index.html
+Files: /usr/share/doc/libplexus-i18n-java/api/*
diff --git a/debian/libplexus-i18n-java-doc.docs b/debian/libplexus-i18n-java-doc.docs
deleted file mode 100644
index e5e6d3a..0000000
--- a/debian/libplexus-i18n-java-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-build/api
diff --git a/debian/libplexus-i18n-java-doc.install b/debian/libplexus-i18n-java-doc.install
new file mode 100644
index 0000000..5c88aec
--- /dev/null
+++ b/debian/libplexus-i18n-java-doc.install
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libplexus-i18n-java/api
+
diff --git a/debian/libplexus-i18n-java.poms b/debian/libplexus-i18n-java.poms
index 43e746b..31a0ccf 100644
--- a/debian/libplexus-i18n-java.poms
+++ b/debian/libplexus-i18n-java.poms
@@ -1 +1,26 @@
-pom.xml --no-parent
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM or
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar
+# it will be installed with mh_install.
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
+# temporarily for certain artifacts such as Javadoc jars.
+#
+pom.xml --no-parent --has-package-version
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
new file mode 100644
index 0000000..b47b61d
--- /dev/null
+++ b/debian/maven.cleanIgnoreRules
@@ -0,0 +1,17 @@
+# Maven clean ignore rules - ignore some Maven dependencies and plugins
+# during the clean phase of a Maven build
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM before mvn clean is called
+# junit junit jar s/3\\..*/3.x/
+
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..0088a40
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,16 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+# junit junit jar s/3\\..*/3.x/
+
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..7c29bd7
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 0000000..822f087
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1,19 @@
+# Maven published rules - additional rules to publish, to help
+# the packaging work of Debian maintainers using mh_make
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\\..*/3.x/
+
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..dd7c92d
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,19 @@
+# Maven rules - transform Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\\..*/3.x/
+
+org.codehaus.plexus plexus-i18n jar s/.*/debian/ * *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 11e04eb..ceab111 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,19 +1,16 @@
#!/bin/sh -e
-# $2 = version
+VERSION=$2
+TAR=../plexus-i18n_$VERSION.orig.tar.gz
+DIR=plexus-i18n-$VERSION
+TAG=$(echo "plexus-i18n-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-TAR=../plexus-i18n_$2.orig.tar.gz
-DIR=plexus-i18n-$2
-TAG=plexus-i18n-$2
-
-svn export http://svn.codehaus.org/plexus/plexus-components/tags/$TAG/ $DIR
-tar -c -z -f $TAR $DIR
+svn export http://svn.codehaus.org/plexus/plexus-components/tags/${TAG}/ $DIR
+GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
rm -rf $DIR ../$TAG
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
. .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
+ mv $TAR $origDir && echo "moved $TAR to $origDir"
fi
-
diff --git a/debian/patches/0001-add-missing-dependency-plexus-container-default.patch b/debian/patches/0001-add-missing-dependency-plexus-container-default.patch
new file mode 100644
index 0000000..95f02b9
--- /dev/null
+++ b/debian/patches/0001-add-missing-dependency-plexus-container-default.patch
@@ -0,0 +1,25 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Fri, 26 Aug 2011 15:55:08 +0200
+Subject: [PATCH] add missing dependency plexus-container-default
+
+---
+ pom.xml | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 78e7ea8..6cdf579 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -51,6 +51,11 @@
+ <artifactId>plexus-utils</artifactId>
+ <version>1.4.5</version>
+ </dependency>
++ <dependency>
++ <groupId>org.codehaus.plexus</groupId>
++ <artifactId>plexus-container-default</artifactId>
++ <version>1.0-beta-3.0.7</version>
++ </dependency>
+ </dependencies>
+
+ <scm>
+--
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d445c5c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-add-missing-dependency-plexus-container-default.patch
diff --git a/debian/rules b/debian/rules
index 7f682b9..b76c54a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,9 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/class/maven.mk
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
-DEB_JARS := ant-nodeps plexus-container-default \
- plexus-utils junit ant-junit
-DEB_ANT_BUILD_TARGET := package javadoc
-DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-API_DOCS := build/api
-
-makebuilddir/lib$(PACKAGE)-java::
- install -d build/classes/META-INF/plexus/
- install -m644 debian/components.xml build/classes/META-INF/plexus/
+JAVA_HOME := /usr/lib/jvm/default-java
get-orig-source:
- uscan --download-version $(VERSION) --force-download --rename
-
-binary-post-install/lib$(PACKAGE)-java::
- mh_installpoms -plib$(PACKAGE)-java
- mh_installjar -plib$(PACKAGE)-java pom.xml -l build/$(PACKAGE)-$(VERSION).jar
-
-clean::
- -rm -rf debian/tmp
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
diff --git a/debian/watch b/debian/watch
index 7c19baf..667dfd8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
-http://svn.codehaus.org/plexus/plexus-components/tags/ \
- plexus-i18n-(.*)/ debian debian/orig-tar.sh
-
+opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
+ http://svn.codehaus.org/plexus/plexus-components/tags/ \
+ plexus-i18n-(\d.*)/ debian debian/orig-tar.sh
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-i18n.git
More information about the pkg-java-commits
mailing list