[serp] 01/01: Updated package to build Maven pom file.

Stephen Nelson stephenonelson-guest at alioth.debian.org
Tue Aug 27 23:08:06 UTC 2013


This is an automated email from the git hooks/post-receive script.

stephenonelson-guest pushed a commit to branch maven-build
in repository serp.

commit d93081fa93736d2fd8a9c20688325f9727beb1ca
Author: Stephen Nelson <stephen at eccostudio.com>
Date:   Wed Aug 28 00:04:46 2013 +0100

    Updated package to build Maven pom file.
    
    Switched the build from Ant to Maven to publish pom and upstream provides pom.xml.
    Updated standards version to 3.9.4.
    Updated Vcs-* fields to use canonical form of urls.
    Added Stephen Nelson to list of uploaders.
    Updated copyright to 1.0 format and updated deprecated BSD license.
---
 debian/README.source                 |    9 +++++++
 debian/changelog                     |   11 ++++++++
 debian/clean                         |    1 -
 debian/control                       |   11 ++++----
 debian/copyright                     |   47 ++++++++++++++++++++++++++--------
 debian/libserp-java-doc.doc-base.api |   10 ++++++++
 debian/libserp-java-doc.install      |    2 ++
 debian/libserp-java-doc.javadoc      |    1 -
 debian/libserp-java.jlibs            |    1 -
 debian/libserp-java.poms             |   28 ++++++++++++++++++++
 debian/maven.cleanIgnoreRules        |    1 +
 debian/maven.ignoreRules             |    6 +++++
 debian/maven.properties              |    4 +++
 debian/maven.publishedRules          |    1 +
 debian/maven.rules                   |    3 +++
 debian/rules                         |   20 +++------------
 16 files changed, 121 insertions(+), 35 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..c872da1
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+Information about serp
+------------------------------
+
+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/changelog b/debian/changelog
index 5ce845d..abe221c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+serp (1.14.1-2) unstable; urgency=low
+
+  * Switched from Ant to Maven build to publish pom.
+  * Updated Standards-Version to 3.9.4.
+  * Use canonical form of Vcs-* fields.
+  * Added Stephen Nelson to list of uploaders.
+  * Updated copyright to 1.0 format.
+  * Updated copyright license to BSD-3-clause from BSD.
+
+ -- Stephen Nelson <stephen at eccostudio.com>  Tue, 27 Aug 2013 22:35:31 +0100
+
 serp (1.14.1-1) unstable; urgency=low
 
   * Initial release. (Closes: #582782).
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index c37284a..0000000
--- a/debian/clean
+++ /dev/null
@@ -1 +0,0 @@
-serp.jar
diff --git a/debian/control b/debian/control
index ea5e5ff..b5a9707 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
 Source: serp
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Miguel Landaeta <miguel at miguel.cc>
+Uploaders: Miguel Landaeta <miguel at miguel.cc>, Stephen Nelson <stephen at eccostudio.com>
 Section: java
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50), default-jdk, javahelper
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50), cdbs, default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends-Indep: libmaven-javadoc-plugin-java, junit (>= 3.8.1)
+Standards-Version: 3.9.4
 Homepage: http://serp.sourceforge.net/
-Vcs-Git: git://git.debian.org/git/pkg-java/serp.git
-Vcs-Browser: http://git.debian.org/?p=pkg-java/serp.git
+Vcs-Git: git://anonscm.debian.org/pkg-java/serp.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/serp.git
 
 Package: libserp-java
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index bfe3ef1..24093ba 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,40 @@
-The sources were downloaded from upstream CVS repository.
-The information about how to access it is available at:
-http://sourceforge.net/projects/serp/develop.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Serp
+Upstream-Authors:
+    A. Abram White
+Source: http://serp.sourceforge.net
 
 Files: *
-Copyright: © 2002-2010, A. Abram White
-License: BSD
- The full text of the BSD license is distributed in
- /usr/share/common-licenses/BSD on Debian systems.
+Copyright: 2002-2013, A. Abram White
+License: BSD-3-clause
 
 Files: debian/*
-Copyright: © 2010 Miguel Landaeta <miguel at miguel.cc>
-License: BSD
- The full text of the BSD license is distributed in
- /usr/share/common-licenses/BSD on Debian systems.
+Copyright: 2010, Miguel Landaeta <miguel at miguel.cc>
+License: BSD-3-clause
+
+License: BSD-3-clause
+ Copyright (c) 2002-2007, A. Abram White
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without 
+ modification, are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice, this 
+   list of conditions and the following disclaimer.
+ * 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.
+ * Neither the name of 'serp' nor the names of its contributors may
+   be used to endorse or promote products derived from this software without 
+   specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS 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 COPYRIGHT OWNER OR 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.
diff --git a/debian/libserp-java-doc.doc-base.api b/debian/libserp-java-doc.doc-base.api
new file mode 100644
index 0000000..df50e6f
--- /dev/null
+++ b/debian/libserp-java-doc.doc-base.api
@@ -0,0 +1,10 @@
+Document: libserp-java
+Title: API Javadoc for Serp
+Author: Serp developers
+Abstract: This is the API Javadoc provided for the
+ libserp-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libserp-java/api/index.html
+Files: /usr/share/doc/libserp-java/api/*
diff --git a/debian/libserp-java-doc.install b/debian/libserp-java-doc.install
new file mode 100644
index 0000000..87c2276
--- /dev/null
+++ b/debian/libserp-java-doc.install
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libserp-java/api
+
diff --git a/debian/libserp-java-doc.javadoc b/debian/libserp-java-doc.javadoc
deleted file mode 100644
index 7b1f16b..0000000
--- a/debian/libserp-java-doc.javadoc
+++ /dev/null
@@ -1 +0,0 @@
-internal /usr/share/doc/libserp-java/api
diff --git a/debian/libserp-java.jlibs b/debian/libserp-java.jlibs
deleted file mode 100644
index c37284a..0000000
--- a/debian/libserp-java.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-serp.jar
diff --git a/debian/libserp-java.poms b/debian/libserp-java.poms
new file mode 100644
index 0000000..1d885c3
--- /dev/null
+++ b/debian/libserp-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 --has-package-version --java-lib
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/maven.cleanIgnoreRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..74b33b9
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,6 @@
+
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-pmd-plugin * * * *
+org.apache.maven.plugins maven-project-info-reports-plugin * * * *
+org.codehaus.mojo jxr-maven-plugin * * * *
+org.codehaus.mojo surefire-report-maven-plugin * * * *
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..f37e36e
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1 @@
+net.sourceforge.serp serp jar s/.*/debian/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..d2b6c95
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,3 @@
+
+junit junit jar s/3\..*/3.x/ * *
+net.sourceforge.serp serp jar s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
index 20dfbc4..b76c54a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,9 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/default-java
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
 
-%:
-	dh --with javahelper $@
-
-override_jh_build:
-	jh_build serp.jar src/main
-
-override_dh_auto_test:
-	echo TODO
+JAVA_HOME := /usr/lib/jvm/default-java
 
 get-orig-source:
-	cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
-	uscan \
-		--verbose \
-		--no-symlink \
-		--destdir $(CURDIR)      \
-		--watchfile debian/watch \
-		--force-download
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

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



More information about the pkg-java-commits mailing list