[SCM] Exec Maven Plugin branch, master, updated. debian/1.1.1+dfsg-3-6-gef1e3f7
Andres Mejia
amejia004 at gmail.com
Sat Feb 16 18:31:14 UTC 2013
The following commit has been merged in the master branch:
commit abae7cd98e3ce39713253656e2c19d612d95d72f
Author: Andres Mejia <amejia004 at gmail.com>
Date: Sat Feb 16 12:56:57 2013 -0500
Recreate packaging using mh_make.
Also update Standards-Version: 3.9.4, rename package
libmaven-exec-plugin-java to libexec-maven-plugin-java, and
provide a javadoc package.
diff --git a/debian/README.source b/debian/README.source
index 30c71d7..9c7e0ec 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,5 +1,5 @@
Information about exec-maven-plugin
------------------------------------
+------------------------------
This package was debianized using the mh_make command
from the maven-debian-helper package.
@@ -7,9 +7,3 @@ 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.
-
-The following binary files have been removed from upstream tarball:
-
-src/test/repository/commons-io/commons-io/commons-io/1.1/commons-io-1.1.jar
-src/test/repository/commons-io/commons-io/1.1/commons-io-1.1.jar
-
diff --git a/debian/changelog b/debian/changelog
index 7537f3c..627782b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+exec-maven-plugin (1.1.1+dfsg-4) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Recreate packaging using mh_make.
+ * Update Standards-Version: 3.9.4.
+ * Rename package libmaven-exec-plugin-java to libexec-maven-plugin-java.
+ * Provide a javadoc package.
+
+ -- Andres Mejia <amejia at debian.org> Sat, 16 Feb 2013 12:50:33 -0500
+
exec-maven-plugin (1.1.1+dfsg-3) unstable; urgency=low
* Team upload.
diff --git a/debian/control b/debian/control
index f207eb5..62c990d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,20 +3,45 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Gabriele Giacone <1o5g4r8o at gmail.com>
-Build-Depends: debhelper (>= 7), cdbs
-Build-Depends-Indep: default-jdk, maven-debian-helper, libmaven2-core-java,
- libplexus-container-default-java, libplexus-utils-java, libmaven-plugin-testing-java,
- libmaven-plugin-tools-java
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends-Indep: libmaven2-core-java,
+ libplexus-containers1.5-java (>= 1.0-alpha-9), libplexus-utils-java,
+ libmaven-plugin-testing-java, default-jdk-doc, libmaven2-core-java-doc,
+ libplexus-containers1.5-java-doc, libplexus-utils-java-doc,
+ libmaven-javadoc-plugin-java
+Standards-Version: 3.9.4
Vcs-Git: git://git.debian.org/git/pkg-java/exec-maven-plugin.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/exec-maven-plugin.git;a=summary
Homepage: http://mojo.codehaus.org/exec-maven-plugin
-Package: libmaven-exec-plugin-java
+Package: libexec-maven-plugin-java
Architecture: all
Depends: ${misc:Depends}, ${maven:Depends}
Recommends: ${maven:OptionalDepends}
-Description: Maven Exec Plugin
- The plugin provides 2 goals to help execute system and Java programs:
- exec:exec, execute programs and Java programs in a separate process and
- exec:java, execute Java programs in the same VM.
+Suggests: libexec-maven-plugin-java-doc
+Provides: libmaven-exec-plugin-java
+Replaces: libmaven-exec-plugin-java
+Conflicts: libmaven-exec-plugin-java
+Description: Exec Maven Plugin
+ A plugin to allow execution of system and Java programs
+
+Package: libexec-maven-plugin-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libexec-maven-plugin-java
+Description: Documentation for Exec Maven Plugin
+ A plugin to allow execution of system and Java programs
+ .
+ This package contains the API documentation of libexec-maven-plugin-java.
+
+Package: libmaven-exec-plugin-java
+Priority: extra
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}
+Description: Exec Maven Plugin (transitional package)
+ A plugin to allow execution of system and Java programs
+ .
+ This is a dummy transitional package. It may be safely removed.
diff --git a/debian/copyright b/debian/copyright
index 0696e78..706e780 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,5 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Exec Maven Plugin
-Maintainer: The Codehaus <http://codehaus.org>
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Exec Maven Plugin
Source: http://mojo.codehaus.org/exec-maven-plugin
Files: *
@@ -18,4 +17,3 @@ License: Apache-2.0
License: GPL-3
On Debian GNU/Linux system you can find the complete text of the
GPL-3 license in '/usr/share/common-licenses/GPL-3'
-
diff --git a/debian/libexec-maven-plugin-java-doc.doc-base.api b/debian/libexec-maven-plugin-java-doc.doc-base.api
new file mode 100644
index 0000000..aaedc76
--- /dev/null
+++ b/debian/libexec-maven-plugin-java-doc.doc-base.api
@@ -0,0 +1,10 @@
+Document: libexec-maven-plugin-java
+Title: API Javadoc for Exec Maven Plugin
+Author: Exec Maven Plugin developers
+Abstract: This is the API Javadoc provided for the
+ libexec-maven-plugin-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libexec-maven-plugin-java/api/index.html
+Files: /usr/share/doc/libexec-maven-plugin-java/api/*
diff --git a/debian/libexec-maven-plugin-java-doc.install b/debian/libexec-maven-plugin-java-doc.install
new file mode 100644
index 0000000..fc8ee22
--- /dev/null
+++ b/debian/libexec-maven-plugin-java-doc.install
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libexec-maven-plugin-java/api
+
diff --git a/debian/libexec-maven-plugin-java.poms b/debian/libexec-maven-plugin-java.poms
new file mode 100644
index 0000000..8545d14
--- /dev/null
+++ b/debian/libexec-maven-plugin-java.poms
@@ -0,0 +1,28 @@
+# 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 and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --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. [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. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml --no-parent
diff --git a/debian/libmaven-exec-plugin-java.poms b/debian/libmaven-exec-plugin-java.poms
deleted file mode 100644
index 43e746b..0000000
--- a/debian/libmaven-exec-plugin-java.poms
+++ /dev/null
@@ -1 +0,0 @@
-pom.xml --no-parent
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
new file mode 100644
index 0000000..d9825b6
--- /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..33577e8
--- /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.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 0000000..77aa245
--- /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
index 631740a..0a722c2 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,3 +1,21 @@
+# 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-container-default jar s/1\.0-alpha.*/1.0-alpha/ *
s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ *
s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 20c2290..e06bc85 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -3,8 +3,7 @@
VERSION=$2
TAR=../exec-maven-plugin_$VERSION.orig.tar.gz
DIR=exec-maven-plugin-$VERSION
-TAG=$(echo "exec-maven-plugin-$VERSION" \
- | sed -re 's/~(alpha|beta)/-\1-/' -e 's/\+dfsg//')
+TAG=$(echo "exec-maven-plugin-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
svn export http://svn.codehaus.org/mojo/tags/${TAG}/ $DIR
GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
diff --git a/debian/patches/00EnabledTests b/debian/patches/00EnabledTests
deleted file mode 100644
index 08aa649..0000000
--- a/debian/patches/00EnabledTests
+++ /dev/null
@@ -1,187 +0,0 @@
-Description: Patches to execute build test using Debian maven repo
-Author: Gabriele Giacone <1o5g4r8o at gmail.com>
-
---- exec-maven-plugin-1.1.1.orig/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java
-+++ exec-maven-plugin-1.1.1/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java
-@@ -260,7 +260,7 @@ public class ExecJavaMojoTest
- ArtifactRepositoryLayout localRepositoryLayout =
- (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
-
-- String path = "src/test/repository";
-+ String path = "debian/maven-repo";
-
- ArtifactRepository localRepository = new DefaultArtifactRepository( "local", "file://" +
- new File( path ).getAbsolutePath(), localRepositoryLayout );
---- exec-maven-plugin-1.1.1.orig/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java
-+++ exec-maven-plugin-1.1.1/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java
-@@ -243,7 +243,7 @@ public class ExecMojoTest
- ArtifactRepositoryLayout localRepositoryLayout =
- (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
-
-- String path = "src/test/repository";
-+ String path = "debian/maven-repo";
-
- ArtifactRepository localRepository = new DefaultArtifactRepository( "local", "file://" +
- new File( path ).getAbsolutePath(), localRepositoryLayout );
---- exec-maven-plugin-1.1.1.orig/src/test/projects/project12/pom.xml
-+++ exec-maven-plugin-1.1.1/src/test/projects/project12/pom.xml
-@@ -32,12 +32,12 @@
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
-- <version>1.1</version>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
-- <version>1.0.4</version>
-+ <version>debian</version>
- </dependency>
- </dependencies>
-
---- exec-maven-plugin-1.1.1.orig/src/test/projects/project13/pom.xml
-+++ exec-maven-plugin-1.1.1/src/test/projects/project13/pom.xml
-@@ -34,17 +34,17 @@
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
-- <version>1.1</version>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
-- <version>1.0.4</version>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
-- <version>3.8.1</version>
-+ <version>debian</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
---- exec-maven-plugin-1.1.1.orig/src/test/projects/project2/pom.xml
-+++ exec-maven-plugin-1.1.1/src/test/projects/project2/pom.xml
-@@ -12,18 +12,18 @@
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
-- <version>1.2.9</version>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
-- <version>1.1</version>
-+ <version>debian</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
-- <version>3.8.1</version>
-+ <version>debian</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
---- exec-maven-plugin-1.1.1.orig/src/test/projects/project1/pom.xml
-+++ exec-maven-plugin-1.1.1/src/test/projects/project1/pom.xml
-@@ -32,12 +32,12 @@
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
-- <version>1.1</version>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
-- <version>1.0.4</version>
-+ <version>debian</version>
- </dependency>
- </dependencies>
-
---- exec-maven-plugin-1.1.1.orig/src/test/projects/project6/pom.xml
-+++ exec-maven-plugin-1.1.1/src/test/projects/project6/pom.xml
-@@ -10,7 +10,7 @@
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
-- <version>3.8.1</version>
-+ <version>debian</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
---- exec-maven-plugin-1.1.1.orig/src/test/projects/project6/project5lib/pom.xml
-+++ exec-maven-plugin-1.1.1/src/test/projects/project6/project5lib/pom.xml
-@@ -15,18 +15,18 @@
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
-- <version>1.2.9</version>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
-- <version>1.1</version>
-+ <version>debian</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
-- <version>3.8.1</version>
-+ <version>debian</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
---- exec-maven-plugin-1.1.1.orig/src/test/projects/project3/pom.xml
-+++ exec-maven-plugin-1.1.1/src/test/projects/project3/pom.xml
-@@ -32,17 +32,17 @@
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
-- <version>1.1</version>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
-- <version>1.0.4</version>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
-- <version>1.0.1</version>
-+ <version>debian</version>
- </dependency>
- </dependencies>
-
---- exec-maven-plugin-1.1.1.orig/src/test/projects/project14/pom.xml
-+++ exec-maven-plugin-1.1.1/src/test/projects/project14/pom.xml
-@@ -34,17 +34,17 @@
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
-- <version>1.1</version>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
-- <version>1.0.4</version>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
-- <version>3.8.1</version>
-+ <version>debian</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cfd5eeb..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-00EnabledTests
diff --git a/debian/rules b/debian/rules
index a6d30c7..b76c54a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,4 +6,4 @@ include /usr/share/cdbs/1/class/maven.mk
JAVA_HOME := /usr/lib/jvm/default-java
get-orig-source:
- uscan --force-download --rename
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
diff --git a/debian/watch b/debian/watch
index 72b4b93..7f5b057 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,4 @@
version=3
-opts="uversionmangle=s/-(alpha|beta)-/~$1/,\
-dversionmangle=s/\+dfsg//" \
+opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
http://svn.codehaus.org/mojo/tags/ \
exec-maven-plugin-(\d.*)/ debian debian/orig-tar.sh
--
Exec Maven Plugin
More information about the pkg-java-commits
mailing list