[icu4j-4.2] 29/32: Fix JAR name; Remove icu4j-localespi

[Kai-Chung Yan]

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

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

commit e290029c174f45f0c52eb6be3f6a708e2d7b9cad
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Thu Mar 24 16:16:40 2016 +0800

    Fix JAR name; Remove icu4j-localespi
---
 debian/.gitignore                                | 4 ++++
 debian/{icu4j-charset.pom => icu4j-charsets.pom} | 2 +-
 debian/icu4j-localespi.pom                       | 9 ---------
 debian/libicu4j-4.2-java.poms                    | 3 +--
 debian/rules                                     | 2 --
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..3bb84a4
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,4 @@
+.mh/
+*.log
+debhelper-build-stamp
+libicu4j-4.2-java/
diff --git a/debian/icu4j-charset.pom b/debian/icu4j-charsets.pom
similarity index 89%
rename from debian/icu4j-charset.pom
rename to debian/icu4j-charsets.pom
index 4301587..3ed9daf 100644
--- a/debian/icu4j-charset.pom
+++ b/debian/icu4j-charsets.pom
@@ -4,6 +4,6 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.ibm.icu</groupId>
-  <artifactId>icu4j-charset</artifactId>
+  <artifactId>icu4j-charsets</artifactId>
   <version>4.2.1.1</version>
 </project>
diff --git a/debian/icu4j-localespi.pom b/debian/icu4j-localespi.pom
deleted file mode 100644
index 84675c8..0000000
--- a/debian/icu4j-localespi.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.ibm.icu</groupId>
-  <artifactId>icu4j-localespi</artifactId>
-  <version>4.2.1.1</version>
-</project>
diff --git a/debian/libicu4j-4.2-java.poms b/debian/libicu4j-4.2-java.poms
index 358caee..c29df0d 100644
--- a/debian/libicu4j-4.2-java.poms
+++ b/debian/libicu4j-4.2-java.poms
@@ -1,3 +1,2 @@
-debian/icu4j-charset.pom --artifact=icu4j-charset.jar --java-lib --no-usj-versionless
-debian/icu4j-localespi.pom --artifact=icu4j-localespi.jar --java-lib --no-usj-versionless
+debian/icu4j-charsets.pom --artifact=icu4j-charsets.jar --java-lib --no-usj-versionless
 debian/icu4j.pom --artifact=icu4j.jar --java-lib --no-usj-versionless
diff --git a/debian/rules b/debian/rules
index c67f360..acb7e66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@ include /usr/share/dpkg/pkg-info.mk
 
 export JAVA_HOME := /usr/lib/jvm/default-java
 
-UPSTREAM_TAR = icu4j-$(subst .,_,$(DEB_UPSTREAM_VERSION)).tgz
-
 %:
 	dh $@ --buildsystem=ant --with=maven-repo-helper
 

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