[SCM] felix-framework packaging branch, master, updated. debian/4.0.1-1-1-g9d6b0f8

[Niels Thykier]

The following commit has been merged in the master branch:
commit 9d6b0f8d2ad9b7aad62d1594fb158aa23747265d
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Jun 20 18:30:15 2012 +0200

    Fix FTBFS with Java7 and add missing --java-lib
    
    The maven helper decided to refresh the comments of various files
    and add two new ones.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index ac8e1bf..c0d3b3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+felix-framework (4.0.1-2) UNRELEASED; 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 <niels at thykier.net>  Wed, 20 Jun 2012 18:26:33 +0200
+
 felix-framework (4.0.1-1) unstable; urgency=low
 
   [ Andres Mejia ]
diff --git a/debian/libfelix-framework-java.poms b/debian/libfelix-framework-java.poms
index 43e746b..b68401f 100644
--- a/debian/libfelix-framework-java.poms
+++ b/debian/libfelix-framework-java.poms
@@ -1 +1,28 @@
-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 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.ignoreRules b/debian/maven.cleanIgnoreRules
similarity index 73%
copy from debian/maven.ignoreRules
copy to debian/maven.cleanIgnoreRules
index b8391b6..d9825b6 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.cleanIgnoreRules
@@ -1,4 +1,5 @@
-# Maven ignore rules - ignore some Maven dependencies and plugins
+# 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
@@ -11,10 +12,6 @@
 # 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/
+# from the POM before mvn clean is called
+#   junit junit jar s/3\..*/3.x/
 
-# Only for bootstrapping
-#org.apache.felix maven-bundle-plugin * * * *
-
-org.apache.rat apache-rat-plugin * * * *
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index b8391b6..a5b66e3 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -12,9 +12,6 @@
 # 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/
-
-# Only for bootstrapping
-#org.apache.felix maven-bundle-plugin * * * *
+#   junit junit jar s/3\..*/3.x/
 
 org.apache.rat apache-rat-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
index 49c1900..e50b495 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,2 +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.rules b/debian/maven.publishedRules
similarity index 83%
copy from debian/maven.rules
copy to debian/maven.publishedRules
index ce4a3fd..77aa245 100644
--- a/debian/maven.rules
+++ b/debian/maven.publishedRules
@@ -1,4 +1,5 @@
-# Maven rules - transform Maven dependencies and plugins
+# 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
@@ -14,4 +15,5 @@
 # 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/
+#   junit junit jar s/3\..*/3.x/
+
diff --git a/debian/maven.rules b/debian/maven.rules
index ce4a3fd..0b5d5ef 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -14,4 +14,5 @@
 # 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/
+#   junit junit jar s/3\..*/3.x/
+

-- 
felix-framework packaging