This is an automated email from the git hooks/post-receive script. grinorcole-guest pushed a commit to branch master in repository maven-osgi.
commit 87a1f46f9adcfb936521480b27e37fc096e41fef Author: Christopher Hoskin <[email protected]> Date: Mon Feb 8 21:35:51 2016 +0000 Import debian folder, originally created by mh_make and customised outside of git --- debian/README.source | 9 +++++++ debian/changelog | 5 ++++ debian/compat | 1 + debian/control | 31 +++++++++++++++++++++++++ debian/copyright | 17 ++++++++++++++ debian/libmaven-osgi-java-doc.doc-base.api | 10 ++++++++ debian/libmaven-osgi-java-doc.install | 2 ++ debian/libmaven-osgi-java-doc.lintian-overrides | 2 ++ debian/libmaven-osgi-java.classpath | 1 + debian/libmaven-osgi-java.lintian-overrides | 2 ++ debian/libmaven-osgi-java.poms | 28 ++++++++++++++++++++++ debian/maven.cleanIgnoreRules | 1 + debian/maven.ignoreRules | 2 ++ debian/maven.properties | 4 ++++ debian/maven.publishedRules | 3 +++ debian/maven.rules | 8 +++++++ debian/orig-tar.sh | 20 ++++++++++++++++ debian/patches/bnd.patch | 16 +++++++++++++ debian/patches/series | 1 + debian/rules | 8 +++++++ debian/source/format | 1 + debian/tests/Ptest.java | 23 ++++++++++++++++++ debian/tests/control | 2 ++ debian/tests/smoke | 22 ++++++++++++++++++ debian/watch | 4 ++++ 25 files changed, 223 insertions(+) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..0b9df0c --- /dev/null +++ b/debian/README.source @@ -0,0 +1,9 @@ +Information about maven-osgi +---------------------------- + +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 new file mode 100644 index 0000000..9e660da --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +maven-osgi (0.2.0-1) unstable; urgency=medium + + * Initial release (Closes: #814066) + + -- Christopher Hoskin <[email protected]> Mon, 08 Feb 2016 07:29:33 +0000 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..88579fd --- /dev/null +++ b/debian/control @@ -0,0 +1,31 @@ +Source: maven-osgi +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Christopher Hoskin <[email protected]> +Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5) +Build-Depends-Indep: libplexus-maven-plugin-java, bnd (>= 2.4.1), libmaven2-core-java, libmaven-plugin-testing-java, + default-jdk-doc, libmaven2-core-java-doc, libmaven-javadoc-plugin-java, javahelper +Standards-Version: 3.9.6 +Vcs-Git: https://anonscm.debian.org/pkg-java/maven-osgi.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-osgi.git +Homepage: http://maven.apache.org/shared/maven-osgi/ + +Package: libmaven-osgi-java +Architecture: all +Depends: ${misc:Depends}, ${maven:Depends} +Suggests: ${maven:OptionalDepends}, libmaven-osgi-java-doc +Description: Maven-OSGi integration library + maven-osgi provides a helper class with functions for deriving OSGi bundle + names and versions from a Maven artifact. + +Package: libmaven-osgi-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Recommends: ${maven:DocDepends}, ${maven:DocOptionalDepends} +Suggests: libmaven-osgi-java +Description: Documentation for Maven OSGi integration library + Library for Maven-OSGi integration + . + This package contains the API documentation of libmaven-osgi-java diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..f99fa96 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,17 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Maven OSGi integration +Source: http://maven.apache.org/shared/maven-osgi/ + +Files: * +Copyright: 2007, Apache Software Foundation +License: Apache-2.0 + +Files: debian/* +Copyright: 2016, Christopher Hoskin <[email protected]> +License: Apache-2.0 + +License: Apache-2.0 + On Debian systems, the full text of the Apache-2.0 license + can be found in the file '/usr/share/common-licenses/Apache-2.0' + + diff --git a/debian/libmaven-osgi-java-doc.doc-base.api b/debian/libmaven-osgi-java-doc.doc-base.api new file mode 100644 index 0000000..35a9223 --- /dev/null +++ b/debian/libmaven-osgi-java-doc.doc-base.api @@ -0,0 +1,10 @@ +Document: libmaven-osgi-java +Title: API Javadoc for Maven OSGi integration +Author: Maven OSGi integration developers +Abstract: This is the API Javadoc provided for the + libmaven-osgi-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libmaven-osgi-java/api/index.html +Files: /usr/share/doc/libmaven-osgi-java/api/* diff --git a/debian/libmaven-osgi-java-doc.install b/debian/libmaven-osgi-java-doc.install new file mode 100644 index 0000000..381c789 --- /dev/null +++ b/debian/libmaven-osgi-java-doc.install @@ -0,0 +1,2 @@ +target/apidocs/* usr/share/doc/libmaven-osgi-java/api + diff --git a/debian/libmaven-osgi-java-doc.lintian-overrides b/debian/libmaven-osgi-java-doc.lintian-overrides new file mode 100644 index 0000000..334b958 --- /dev/null +++ b/debian/libmaven-osgi-java-doc.lintian-overrides @@ -0,0 +1,2 @@ +# Upstream provides no changelog +libmaven-osgi-java-doc: no-upstream-changelog diff --git a/debian/libmaven-osgi-java.classpath b/debian/libmaven-osgi-java.classpath new file mode 100644 index 0000000..20d4ae1 --- /dev/null +++ b/debian/libmaven-osgi-java.classpath @@ -0,0 +1 @@ +usr/share/java/maven-osgi.jar /usr/share/java/maven-artifact.jar /usr/share/java/bndlib.jar diff --git a/debian/libmaven-osgi-java.lintian-overrides b/debian/libmaven-osgi-java.lintian-overrides new file mode 100644 index 0000000..9a1084e --- /dev/null +++ b/debian/libmaven-osgi-java.lintian-overrides @@ -0,0 +1,2 @@ +# Upstream provides no changelog +libmaven-osgi-java: no-upstream-changelog diff --git a/debian/libmaven-osgi-java.poms b/debian/libmaven-osgi-java.poms new file mode 100644 index 0000000..5ad70f2 --- /dev/null +++ b/debian/libmaven-osgi-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 --has-package-version 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..a059d02 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,2 @@ + +org.apache.maven.plugins maven-release-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..53575bc --- /dev/null +++ b/debian/maven.publishedRules @@ -0,0 +1,3 @@ + +org.apache.maven.shared maven-osgi jar * * * +org.apache.maven.shared maven-osgi jar s/.*/debian/ * * diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..6cc71e5 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,8 @@ + +org.apache.maven.shared maven-osgi jar * * * +org.apache.maven.shared maven-osgi jar s/.*/debian/ * * +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/ * * +s/biz.aQute/biz.aQute.bnd/ * * s/.*/debian/ * * diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..7f6fc4a --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,20 @@ +#!/bin/sh -e +# +# Removes unwanted content from the upstream sources. +# Called by uscan with '--upstream-version' <version> <file> +# + +VERSION=$2 +TAR=../maven-osgi_$VERSION.orig.tar.xz +DIR=maven-osgi-$VERSION +TAG=$(echo "maven-osgi-$VERSION" | sed -re's/~(alpha|beta|rc)/-\1-/') + +svn export http://svn.apache.org/repos/asf/maven/shared/tags/${TAG}/ $DIR +XZ_OPT=--best tar -c -J -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" +fi diff --git a/debian/patches/bnd.patch b/debian/patches/bnd.patch new file mode 100644 index 0000000..a6e25af --- /dev/null +++ b/debian/patches/bnd.patch @@ -0,0 +1,16 @@ +Description: Change package name for bnd 2.4.1 +Author: Christopher Hoskin <[email protected]> +Forwarded: not-needed +Last-Update: 2016-02-06 + +--- a/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java ++++ b/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java +@@ -32,7 +32,7 @@ + + import org.apache.maven.artifact.Artifact; + +-import aQute.lib.osgi.Analyzer; ++import aQute.bnd.osgi.Analyzer; + + /** + * Default implementation of {@link Maven2OsgiConverter} diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..9946417 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +bnd.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..c0bacdc --- /dev/null +++ b/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +export CLASSPATH= + +%: + dh $@ --buildsystem=maven --with javahelper + +get-orig-source: + uscan --download-current-version --force-download --no-symlink 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/tests/Ptest.java b/debian/tests/Ptest.java new file mode 100644 index 0000000..db24da0 --- /dev/null +++ b/debian/tests/Ptest.java @@ -0,0 +1,23 @@ +import org.apache.maven.shared.osgi.*; + +public class Ptest { + + public static void main(String[] args) { + // Prints "Hello, World" to the terminal window. + Maven2OsgiConverterTest tests = new Maven2OsgiConverterTest(); + System.out.println("Test GetBundleSymbolicName"); + tests.testGetBundleSymbolicName(); + System.out.println("Test GetBundleFileName"); + tests.testGetBundleFileName(); + System.out.println("Test GetVersion"); + tests.testGetVersion(); + System.out.println("Test ConvertVersionToOsgi"); + tests.testConvertVersionToOsgi(); + System.out.println("Tests Complete"); + } + +} + + + + diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..9a4ff68 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,2 @@ +Tests: smoke +Depends: @, openjdk-8-jdk, libmaven-plugin-testing-java, libplexus-containers-java, java-wrappers, junit diff --git a/debian/tests/smoke b/debian/tests/smoke new file mode 100755 index 0000000..bee9490 --- /dev/null +++ b/debian/tests/smoke @@ -0,0 +1,22 @@ +#!/bin/sh +. /usr/lib/java-wrappers/java-wrappers.sh +set -e + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM + +cp -r src $WORKDIR +cp debian/tests/Ptest.java $WORKDIR +cd $WORKDIR + +find_jars maven-plugin-testing-harness +find_jars plexus-container-default +find_jars junit + +find_jar_classpath maven-osgi + +echo $WORKDIR +echo $JAVA_CLASSPATH + +javac -cp $JAVA_CLASSPATH Ptest.java src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java +java -cp ".:src/test/java/:$JAVA_CLASSPATH" Ptest diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..e7f17d1 --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=3 +opts="uversionmangle=s/-(alpha|beta|rc)(-)?/~$1$2/" \ + http://svn.apache.org/repos/asf/maven/shared/tags/ \ + maven-osgi-(\d.*)/ debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-osgi.git _______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
