[icu4j-4.2] 01/01: Avoid conflicts with libicu4j-java (Closes: #820999)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository icu4j-4.2.

commit a05c64e5be78ad8db230874e276b026c45f3e96e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Apr 24 22:55:11 2016 +0200

    Avoid conflicts with libicu4j-java (Closes: #820999)
---
 debian/changelog              | 7 +++++++
 debian/libicu4j-4.2-java.poms | 4 ++--
 debian/maven.rules            | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index caa20fe..89c4873 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+icu4j-4.2 (4.2.1.1-5) unstable; urgency=medium
+
+  * Team upload.
+  * Avoid conflicts with libicu4j-java (Closes: #820999)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 24 Apr 2016 20:38:02 +0200
+
 icu4j-4.2 (4.2.1.1-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/libicu4j-4.2-java.poms b/debian/libicu4j-4.2-java.poms
index b4d252c..ba5e2c6 100644
--- a/debian/libicu4j-4.2-java.poms
+++ b/debian/libicu4j-4.2-java.poms
@@ -1,2 +1,2 @@
-debian/icu4j-charsets.pom --artifact=icu4j-charsets.jar --java-lib --no-usj-versionless
-debian/icu4j.pom          --artifact=icu4j.jar          --java-lib --no-usj-versionless
+debian/icu4j-charsets.pom --artifact=icu4j-charsets.jar --java-lib --no-usj-versionless -e4.2.x -j4.2.1.1
+debian/icu4j.pom          --artifact=icu4j.jar          --java-lib --no-usj-versionless -e4.2.x -j4.2.1.1
diff --git a/debian/maven.rules b/debian/maven.rules
index 03d54d7..bd35ec0 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1 +1 @@
-com.ibm.icu * * * * *
+com.ibm.icu * * s/.*/4.2.x/ * *

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