This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch experimental in repository felix-framework.
commit d615394b5b4beb771d6a382060ba6f1a4b5cec9c Author: Markus Koschany <[email protected]> Date: Mon Jul 14 11:53:08 2014 +0200 Imported Debian patch 4.4.0-1 --- debian/README.source | 18 ++++++ debian/changelog | 87 +++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 37 ++++++++++++ debian/copyright | 26 +++++++++ debian/libfelix-framework-java-doc.doc-base | 8 +++ debian/libfelix-framework-java-doc.install | 1 + debian/libfelix-framework-java.poms | 28 ++++++++++ debian/maven.cleanIgnoreRules | 17 ++++++ debian/maven.ignoreRules | 17 ++++++ debian/maven.properties | 3 + debian/maven.publishedRules | 19 +++++++ debian/maven.rules | 18 ++++++ debian/orig-tar.sh | 14 +++++ debian/patches/bootstrap_packaging_jar.diff | 18 ++++++ debian/patches/series | 2 + debian/rules | 14 +++++ debian/source/format | 1 + debian/watch | 2 + 19 files changed, 331 insertions(+) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..49b3097 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,18 @@ +Information about felix-framework +------------------------------ + +The build system uses Maven but prevents it from downloading +anything from the Internet, making the build compliant with +the Debian policy. + + +Bootstrapping felix-framework +------------------------------------ +Since libfelix-framework-java Build-Depends on libmaven-bundle-plugin-java +and libmaven-bundle-plugin-java also Build-Depends on libfelix-framework-java +we need a way to bootstrap this. + +To build felix-framework without bundle metadata : +1) d/control: Drop Build-Depends on libmaven-bundle-plugin-java +2) d/patches/series: Decomment bootstrap_packaging_jar.diff patch +3) d/maven.ignoreRules: Decomment maven-bundle-plugin dependency diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..587b3a2 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,87 @@ +felix-framework (4.4.0-1) unstable; urgency=medium + + * Team upload. + * Imported Upstream version 4.4.0. + * Drop 01-java8-compatibility.patch. Fixed upstream. + * Update debian/copyright to copyright format 1.0. + * Fix lintian warning "description-synopsis-starts-with-article". + + -- Markus Koschany <[email protected]> Mon, 14 Jul 2014 11:53:08 +0200 + +felix-framework (4.0.1-3) unstable; urgency=medium + + * Team upload. + * Added a patch to compile with OpenJDK 8 + * debian/control: + - Standards-Version updated to 3.9.5 (no changes) + - Use canonical URLs for the Vcs-* fields + - Removed Andres Mejia from the uploaders (Closes: #743537) + * Switch to debhelper level 9 + * Use XZ compression for the upstream tarball + * debian/watch: Changed the URL to find all versions + + -- Emmanuel Bourg <[email protected]> Wed, 09 Apr 2014 18:07:59 +0200 + +felix-framework (4.0.1-2) unstable; urgency=low + + * Team upload. + * Explicitly set encoding of Java files to fix FTBFS + with Java7. + * Add missing --java-lib to the poms file. + + -- Niels Thykier <[email protected]> Wed, 20 Jun 2012 18:31:28 +0200 + +felix-framework (4.0.1-1) unstable; urgency=low + + [ Andres Mejia ] + * Update to my @debian.org email. + + [ Damien Raude-Morvan ] + * New upstream release. + * Build-Depends on libosgi-core-java instead of libequinox-osgi-java. + * d/watch: fix for upstream tarball new name. + * d/patches/exclude_servletapi.diff: Dropped, not needed anymore. + * d/maven.ignoreRules: Ignore apache-rat-plugin instead of rat-maven- + plugin + + -- Damien Raude-Morvan <[email protected]> Sat, 05 Nov 2011 14:37:59 +0100 + +felix-framework (2.0.5-2) unstable; urgency=low + + * Bump Standards-Version to 3.9.2: no changes needed. + * Use Maven build-system, as upstream: + - d/{build.xml,MANIFEST.MF, default.properties, *.install, *.links}: Drop. + - d/control: Switch from debhelper to cdbs, add Build-Depends + on some Maven plugins. + - d/maven.rules,d/maven.ignoreRules: Add handling of pom.xml replace rules. + - d/rules: Everything is handled by maven.mk. + - d/README.source,d/patches/bootstrap.diff: Add a way to bootstrap without + maven-bundle-plugin. + * Install Javadoc API to /usr/share/doc/libfelix-framework-java/api/. + + -- Damien Raude-Morvan <[email protected]> Sat, 14 May 2011 19:22:28 +0200 + +felix-framework (2.0.5-1) unstable; urgency=low + + [ Andres Mejia ] + * Upload for Debian. (Closes: #610921) + * Add Debian Java team as maintainer, Yulia and myself as Uploaders. + * Bump to Standards-Version 3.9.1. + * Convert to pure dh with javahelper. + * Add VCS entries. + + [ Damien Raude-Morvan ] + * Add myself as Uploaders. + * d/copyright: Update to DEP-5 r166 format. + * d/control: Drop Depends: ${shlib:Depends} as useless for Java package. + * d/control: Drop Depends: default-jre-headless | java2-runtime-headless + as a Java library don't need to depends on runtime (Java Policy). + * d/control, d/rules: Use mh_clean and B-D on maven-repo-helper (>= 1.1) + + -- Damien Raude-Morvan <[email protected]> Mon, 24 Jan 2011 23:23:03 +0100 + +felix-framework (2.0.5-0ubuntu1) maverick; urgency=low + + * Initial release. (LP: #608699) + + -- Yulia Novozhilova <[email protected]> Tue, 20 Jul 2010 15:49:04 +0400 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..cd4fdc2 --- /dev/null +++ b/debian/control @@ -0,0 +1,37 @@ +Source: felix-framework +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Yulia Novozhilova <[email protected]>, + Damien Raude-Morvan <[email protected]> +Build-Depends: cdbs, + debhelper (>= 9), + default-jdk, + libmaven-bundle-plugin-java, + libmaven-javadoc-plugin-java, + libosgi-compendium-java, + libosgi-core-java, + maven-debian-helper (>= 1.4) +Standards-Version: 3.9.5 +Vcs-Git: git://anonscm.debian.org/pkg-java/felix-framework.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/felix-framework.git +Homepage: http://felix.apache.org/site/apache-felix-framework.html + +Package: libfelix-framework-java +Architecture: all +Depends: ${maven:Depends}, ${misc:Depends} +Recommends: ${maven:OptionalDepends} +Suggests: libfelix-framework-java-doc +Description: Felix Framework subproject + The Felix Framework subproject is an implementation + of the OSGi R4.2 core framework specification. + +Package: libfelix-framework-java-doc +Architecture: all +Section: doc +Depends: ${maven:DocDepends}, ${misc:Depends} +Recommends: ${maven:DocOptionalDepends} +Description: Javadoc API documentation for the Felix Framework subproject + The Felix Framework subproject is an implementation + of the OSGi R4.2 core framework specification. + This package contains Javadoc API documentation. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..dc7883c --- /dev/null +++ b/debian/copyright @@ -0,0 +1,26 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: felix-framework +Source: http://felix.apache.org/site/downloads.cgi + +Files: * +Copyright: 2010-2012, The Apache Software Foundation + 2011,2012, OSGi Alliance +License: Apache-2.0 + + +Files: debian/* +Copyright: 2008-2010, Yulia Novozhilova <[email protected]> + 2011, Damien Raude-Morvan <[email protected]> + 2012, Niels Thykier <[email protected]> + 2014, Emmanuel Bourg <[email protected]> + 2014, Markus Koschany <[email protected]> +License: GPL-2 + + +License: Apache-2.0 + On Debian systems, the complete text of the Apache License Version 2.0, + can be found in /usr/share/common-licenses/Apache-2.0. + +License: GPL-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. diff --git a/debian/libfelix-framework-java-doc.doc-base b/debian/libfelix-framework-java-doc.doc-base new file mode 100644 index 0000000..9dc66f8 --- /dev/null +++ b/debian/libfelix-framework-java-doc.doc-base @@ -0,0 +1,8 @@ +Document: felix-framework +Title: Apache Felix Framework +Author: The Apache Software Foundation +Section: Programming/Java + +Format: HTML +Index: /usr/share/doc/libfelix-framework-java/api/index.html +Files: /usr/share/doc/libfelix-framework-java/api/*.html diff --git a/debian/libfelix-framework-java-doc.install b/debian/libfelix-framework-java-doc.install new file mode 100644 index 0000000..f1832ee --- /dev/null +++ b/debian/libfelix-framework-java-doc.install @@ -0,0 +1 @@ +target/apidocs/* /usr/share/doc/libfelix-framework-java/api/ diff --git a/debian/libfelix-framework-java.poms b/debian/libfelix-framework-java.poms new file mode 100644 index 0000000..b68401f --- /dev/null +++ b/debian/libfelix-framework-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 --java-lib 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..a5b66e3 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,17 @@ +# 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/ + +org.apache.rat apache-rat-plugin * * * * diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..e50b495 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,3 @@ +# Include here properties to pass to Maven during the build. +maven.test.skip=true +project.build.sourceEncoding=UTF-8 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 new file mode 100644 index 0000000..0b5d5ef --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,18 @@ +# 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/ + diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..21c3227 --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +set -x + +# called by uscan with '--upstream-version' <version> <file> +package=`dpkg-parsechangelog | sed -n 's/^Source: //p'` +TAR=../"$package"_$2.orig.tar.xz +DIR=$package-$2.orig + + +tar xfz $3 +mv org.apache.felix.framework-$2 $DIR +XZ_OPT=--best tar -c -J -f $TAR $DIR +rm -rf $DIR $3 diff --git a/debian/patches/bootstrap_packaging_jar.diff b/debian/patches/bootstrap_packaging_jar.diff new file mode 100644 index 0000000..2604063 --- /dev/null +++ b/debian/patches/bootstrap_packaging_jar.diff @@ -0,0 +1,18 @@ +Description: pom.xml, change packaging type from bundle to jar. + Since this library is a dependency of maven-bundle-plugin + we should use default "jar" packaging type to allow a first bootstrap build. +Forwarded: not-needed +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2011-05-11 + +--- a/pom.xml ++++ b/pom.xml +@@ -24,7 +24,7 @@ + <relativePath>../pom/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> +- <packaging>bundle</packaging> ++ <packaging>jar</packaging> + <name>Apache Felix Framework</name> + <artifactId>org.apache.felix.framework</artifactId> + <version>2.0.5</version> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..f8b50dc --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +# Only for bootstrapping +#bootstrap_packaging_jar.diff diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..3c07322 --- /dev/null +++ b/debian/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/maven.mk + +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java + +get-orig-source: + uscan \ + --no-symlink \ + --upstream-version $(VERSION) \ + --download-version $(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 new file mode 100644 index 0000000..f54494c --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://archive.apache.org/dist/felix/ org.apache.felix.framework-(.+)-source-release\.tar\.gz debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/felix-framework.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
