[maven-clean-plugin] 11/32: UNRELEASED * Use Maven to build the package. * Switch to debhelper 7. * Update Standard-Version: 3.9.1. * Add a documentation package. * Switch to source format 3.0. * Convert d/copyright to dep5 format.

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Jul 18 07:06:03 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-clean-plugin.

commit dd2da3ae09c68f5ff4b631f745f37ffe071c269a
Author: Torsten Werner <twerner at debian.org>
Date:   Thu Aug 18 20:21:25 2011 +0000

    UNRELEASED
    * Use Maven to build the package.
    * Switch to debhelper 7.
    * Update Standard-Version: 3.9.1.
    * Add a documentation package.
    * Switch to source format 3.0.
    * Convert d/copyright to dep5 format.
---
 debian/README.source                               |  9 +++++
 debian/build.properties                            |  4 ---
 debian/changelog                                   | 12 +++++++
 debian/compat                                      |  2 +-
 debian/control                                     | 42 ++++++++++++++++++----
 debian/copyright                                   | 42 +++++++---------------
 debian/libmaven-clean-plugin-java-doc.doc-base.api | 10 ++++++
 debian/libmaven-clean-plugin-java-doc.install      |  2 ++
 debian/libmaven-clean-plugin-java.poms             | 27 +++++++++++++-
 debian/maven-settings.xml                          |  9 -----
 debian/maven.cleanIgnoreRules                      | 17 +++++++++
 debian/maven.ignoreRules                           | 16 +++++++++
 debian/maven.properties                            |  4 +++
 debian/maven.publishedRules                        | 19 ++++++++++
 debian/maven.rules                                 | 26 +++++++++++---
 debian/orig-tar.sh                                 | 14 ++++----
 debian/rules                                       | 18 ++--------
 debian/source/format                               |  1 +
 debian/watch                                       |  3 +-
 19 files changed, 198 insertions(+), 79 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..6b0297d
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+Information about maven-clean-plugin
+------------------------------
+
+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 087f536..0000000
--- a/debian/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-javadoc.dir=target/api
-build.directory=target
-maven.test.skip=true
-maven.generate.target=plugin:descriptor
diff --git a/debian/changelog b/debian/changelog
index b03659b..3e1bebc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+maven-clean-plugin (2.3-4) unstable; urgency=low
+
+  UNRELEASED
+  * Use Maven to build the package.
+  * Switch to debhelper 7.
+  * Update Standard-Version: 3.9.1.
+  * Add a documentation package.
+  * Switch to source format 3.0.
+  * Convert d/copyright to dep5 format.
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 18 Aug 2011 22:20:51 +0200
+
 maven-clean-plugin (2.3-3) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 8087a7c..cdb17bb 100644
--- a/debian/control
+++ b/debian/control
@@ -3,19 +3,20 @@ 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: debhelper (>= 5), cdbs, default-jdk
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
- junit, libmaven-plugin-tools-java, libplexus-velocity-java, velocity,
- libmaven-file-management-java, libplexus-containers-java,
- libplexus-interpolation-java
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libmaven-file-management-java, libmaven2-core-java, libplexus-utils-java,  
+ libmaven-plugin-testing-java, default-jdk-doc, libmaven2-core-java-doc,  
+ libplexus-utils-java-doc, libmaven-javadoc-plugin-java 
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-clean-plugin
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-clean-plugin/
 Homepage: http://maven.apache.org/plugins/maven-clean-plugin/
 
 Package: libmaven-clean-plugin-java
 Architecture: all
-Depends: ${misc:Depends}, libmaven-file-management-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libmaven-clean-plugin-java-doc
 Description: Maven clean plugin
  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,
@@ -34,3 +35,30 @@ Description: Maven clean plugin
  .
  This package ships the maven clean plugin which is used to remove files
  generated at build-time in a project's directory.
+
+Package: libmaven-clean-plugin-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libmaven-clean-plugin-java
+Description: Maven clean plugin - API documentation
+ 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,
+ reporting and documentation from a central piece of information.
+ .
+ Maven's primary goal is to allow a developer to comprehend the complete
+ state of a development effort in the shortest period of time. In order to
+ attain this goal there are several areas of concern that Maven attempts
+ to deal with:
+ .
+    * Making the build process easy
+    * Providing a uniform build system
+    * Providing quality project information
+    * Providing guidelines for best practices development
+    * Allowing transparent migration to new features
+ .
+ This package ships the maven clean plugin which is used to remove files
+ generated at build-time in a project's directory.
+ .
+ This package contains the API documentation of libmaven-clean-plugin-java.
diff --git a/debian/copyright b/debian/copyright
index 8d8a653..34cc17c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,32 +1,16 @@
-This package was debianized by Torsten Werner <twerner at debian.org>.
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Maven Clean Plugin
+Maintainer:  Jesse McConnell as  
+Source: http://maven.apache.org/plugins/maven-clean-plugin/
 
-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-3'.
+Files: *
+Copyright: 2001-2011, The Apache Software Foundation.
+License: Apache-2.0
 
-The package was downloaded from <http://maven.apache.org>.
+Files: debian/*
+Copyright: 2008-2011, Torsten Werner <twerner at debian.org>
+License: Apache-2.0
 
-Copyright: 2007 The Apache Software Foundation.
-
-License:
-
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
- 
-    http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-
-The full text of the license can be found in
-`/usr/share/common-licenes/Apache-2.0'.
+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'
diff --git a/debian/libmaven-clean-plugin-java-doc.doc-base.api b/debian/libmaven-clean-plugin-java-doc.doc-base.api
new file mode 100644
index 0000000..7ca596f
--- /dev/null
+++ b/debian/libmaven-clean-plugin-java-doc.doc-base.api
@@ -0,0 +1,10 @@
+Document: libmaven-clean-plugin-java
+Title: API Javadoc for Maven Clean Plugin
+Author: Maven Clean Plugin developers
+Abstract: This is the API Javadoc provided for the
+ libmaven-clean-plugin-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libmaven-clean-plugin-java/api/index.html
+Files: /usr/share/doc/libmaven-clean-plugin-java/api/*
diff --git a/debian/libmaven-clean-plugin-java-doc.install b/debian/libmaven-clean-plugin-java-doc.install
new file mode 100644
index 0000000..24936a1
--- /dev/null
+++ b/debian/libmaven-clean-plugin-java-doc.install
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libmaven-clean-plugin-java/api
+
diff --git a/debian/libmaven-clean-plugin-java.poms b/debian/libmaven-clean-plugin-java.poms
index 43e746b..31a0ccf 100644
--- a/debian/libmaven-clean-plugin-java.poms
+++ b/debian/libmaven-clean-plugin-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-settings.xml b/debian/maven-settings.xml
deleted file mode 100644
index 01f8769..0000000
--- a/debian/maven-settings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
-  This is a minimal settings.xml that switches maven to offline mode
-  and uses the Debian repo as the local repo.
--->
-
-<settings>
-  <localRepository>/usr/share/maven-repo</localRepository>
-  <offline>true</offline>
-</settings>
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
index 5cc6c9b..60324f7 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,4 +1,22 @@
-# keep the version for all Maven plugins as versionless plugins don't work
-* * maven-plugin *
-junit junit jar s/3\..*/3.x/
-s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness
+# 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/
+
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ * *
+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-test-tools * s/.*/debian/ * *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 74f9b7b..dbd44bd 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,16 +1,16 @@
 #!/bin/sh -e
 
-TAR=../maven-clean-plugin_$2.orig.tar.gz
-DIR=maven-clean-plugin-$2
-TAG=maven-clean-plugin-$2
+VERSION=$2
+TAR=../maven-clean-plugin_$VERSION.orig.tar.gz
+DIR=maven-clean-plugin-$VERSION
+TAG=$(echo "maven-clean-plugin-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
 
-svn export http://svn.apache.org/repos/asf/maven/plugins/tags/$TAG $DIR
-tar -c -z -f $TAR $DIR
+svn export http://svn.apache.org/repos/asf/maven/plugins/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/rules b/debian/rules
index 3b8d326..687680b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +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/default-java
-DEB_JARS             := ant-nodeps maven-core maven-model maven-plugin-api maven-project file-management plexus-utils plexus-container-default-alpha
-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             := target/api
 
 get-orig-source:
-	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar
-
-clean::
-	-rm -rf debian/tmp
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
index bcdc5a9..a022450 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
+opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
 http://svn.apache.org/repos/asf/maven/plugins/tags/ \
-  maven-clean-plugin-(.*)/ debian debian/orig-tar.sh
+  maven-clean-plugin-(\d.*)/ debian debian/orig-tar.sh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-clean-plugin.git



More information about the pkg-java-commits mailing list