[jnr-netdb] 10/10: New upstream release (1.1.6)

Tue Oct 4 08:11:10 UTC 2016

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

ebourg-guest pushed a commit to branch master
in repository jnr-netdb.

commit 818a4389d503844b9457b5ccee8c6eac7389446c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 4 10:08:31 2016 +0200

    New upstream release (1.1.6)
---
 debian/changelog              |  5 +++--
 debian/libjnr-netdb-java.poms | 16 +++++++++-------
 debian/maven.cleanIgnoreRules | 17 -----------------
 debian/maven.publishedRules   | 19 -------------------
 4 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e40476..9a3a926 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-jnr-netdb (1.1.4-3) UNRELEASED; urgency=medium
+jnr-netdb (1.1.6-1) unstable; urgency=medium
 
   * Team upload.
+  * New upstream release
   * Removed the unused dependency on libasm4-java
   * Replaced jaffl.jar with jnr-ffi.jar in the Class-Path of the manifest
   * Build with the DH sequencer instead of CDBS
@@ -9,7 +10,7 @@ jnr-netdb (1.1.4-3) UNRELEASED; urgency=medium
   * debian/copyright: Added the Files-Excluded field to filter the tarball
   * debian/watch: Adjusted the regexp to catch the latest 1.1.6 release
 
- -- Emmanuel Bourg <ebourg at apache.org>  Mon, 03 Oct 2016 17:59:00 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 04 Oct 2016 10:04:07 +0200
 
 jnr-netdb (1.1.4-2) unstable; urgency=medium
 
diff --git a/debian/libjnr-netdb-java.poms b/debian/libjnr-netdb-java.poms
index 8772c80..64b1188 100644
--- a/debian/libjnr-netdb-java.poms
+++ b/debian/libjnr-netdb-java.poms
@@ -2,7 +2,9 @@
 # Format of this file is:
 # <path to pom file> [option]*
 # where option can be:
-#   --ignore: ignore this POM or
+#   --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
@@ -11,16 +13,16 @@
 #   --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
+#      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.
+#   --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.
-#   --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.
+#   --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 --no-parent
+pom.xml --no-parent --has-package-version --java-lib
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
deleted file mode 100644
index b47b61d..0000000
--- a/debian/maven.cleanIgnoreRules
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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.publishedRules b/debian/maven.publishedRules
deleted file mode 100644
index 822f087..0000000
--- a/debian/maven.publishedRules
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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/
-

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

