[icu4j-4.2] 01/01: Simplifications and upload to unstable

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Sun Mar 27 22:50:20 UTC 2016


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 f92754627349b6c6be49d003659ca8156627a8c4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Mar 28 00:25:45 2016 +0200

    Simplifications and upload to unstable
---
 debian/.gitignore             |  4 --
 debian/NEWS                   |  7 ----
 debian/README.Debian          |  2 +-
 debian/build.xml              | 42 -------------------
 debian/changelog              |  5 ++-
 debian/control                |  5 +--
 debian/copyright-old.txt      | 95 -------------------------------------------
 debian/libicu4j-4.2-java.docs |  2 -
 debian/libicu4j-4.2-java.poms |  2 +-
 debian/maven.rules            |  1 +
 debian/rules                  | 17 +-------
 11 files changed, 9 insertions(+), 173 deletions(-)

diff --git a/debian/.gitignore b/debian/.gitignore
deleted file mode 100644
index 3bb84a4..0000000
--- a/debian/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.mh/
-*.log
-debhelper-build-stamp
-libicu4j-4.2-java/
diff --git a/debian/NEWS b/debian/NEWS
deleted file mode 100644
index d4ea249..0000000
--- a/debian/NEWS
+++ /dev/null
@@ -1,7 +0,0 @@
-icu4j (3.8.1-1) hardy; urgency=low
-
-  * The package has been modified to use the eclipse-compatible version of this
-    library.  There should be no noticible change for other programs that use
-    this library.
-
- -- Nathan Summers <rock at gimp.org>  Thu, 25 Sep 2008 18:53:40 -0400
diff --git a/debian/README.Debian b/debian/README.Debian
index ad14dad..6683239 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,5 +1,5 @@
 icu4j-4.2 for Debian
-----------------
+--------------------
 
 icu4j-4.2 is the clone of src:icu4j/4.2.1.1 for compatibility of lucene2. Once
 lucene2 is updated to use a later version of icu4j, or lucene2 is removed, this
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 16e121d..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="icu-deb" default="build-jars">
-  <property name="source" value="1.5" />
-  <property name="target" value="1.5" />
-  <property name="debug" value="true" />
-  <property name="optimize" value="true" />
-  <!-- Locations are relative to the debian dir. -->
-  <property name="output.dir" value=".." />
-  <property name="source.base.dir" location="../eclipseProjects/plugins" />
-
-  <target name="init">
-    <mkdir dir="${output.dir}" />
-  </target>
-  <target name="build-jars">
-    <antcall target="build-jar">
-      <param name="build.part" value="com.ibm.icu.base" />
-    </antcall>
-    <antcall target="build-jar">
-      <param name="build.part" value="com.ibm.icu" />
-    </antcall>
-  </target>
-
-  <target name="build-jar" depends="init">
-    <mkdir dir="${output.dir}/" />
-    <javac srcdir="${source.base.dir}/${build.part}/src/" destdir="${source.base.dir}/${build.part}/"
-	   optimize="${optimize}" debug="${debug}" source="${source}" target="${target}"
-	   fork="yes" />
-    <move todir="${source.base.dir}/${build.part}">
-      <fileset dir="${source.base.dir}/${build.part}/src">
-	<exclude name="**/*.java" />
-      </fileset>
-    </move>
-    <jar destfile="${output.dir}/${build.part}.jar"
-	 manifest="${source.base.dir}/${build.part}/META-INF/MANIFEST.MF"
-	 >
-      <fileset dir="${source.base.dir}/${build.part}" >
-	<exclude name="**/.*/**" />
-	<exclude name="**/src/**" />
-      </fileset>
-    </jar>
-  </target>
-</project>
diff --git a/debian/changelog b/debian/changelog
index baf342d..c9a283f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-icu4j-4.2 (4.2.1.1-4) UNRELEASED; urgency=medium
+icu4j-4.2 (4.2.1.1-4) unstable; urgency=medium
 
-  [ tony mancill ]
   * Team upload.
+
+  [ tony mancill ]
   * Remove Niels Thykier from Uploaders
 
   [ Kai-Chung Yan ]
diff --git a/debian/control b/debian/control
index 219d470..c924988 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,12 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Andreas Tille <tille at debian.org>,
            Steffen Moeller <moeller at debian.org>,
            Kai-Chung Yan <seamlikok at gmail.com>
-Standards-Version: 3.9.7
-Build-Depends: ant (>= 1.7.0),
+Build-Depends: ant,
                debhelper (>= 9),
                default-jdk,
-               javahelper,
                maven-repo-helper (>= 1.6~),
                unzip
+Standards-Version: 3.9.7
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/icu4j-4.2.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/icu4j-4.2.git
 Homepage: http://www.icu-project.org
diff --git a/debian/copyright-old.txt b/debian/copyright-old.txt
deleted file mode 100644
index 7cbe3e1..0000000
--- a/debian/copyright-old.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-This package was debianized by Steffen Moeller <steffen_moeller at gmx.de> on
-Fri,  5 May 2006 19:49:26 +0200.
-
-It was downloaded from http://download.icu-project.org/files/icu4j/3.8.1/icu4j-3_8_1-src.jar
-
-Copyright Holder: IBM and contributors
-
-License:
-
-ICU4J license - ICU4J 1.8.1 and later
-
-   COPYRIGHT AND PERMISSION NOTICE
-
-   Copyright (c) 1995-2007 International Business Machines Corporation
-   and others
-
-   All rights reserved.
-
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-   "Software"), to deal in the Software without restriction, including
-   without limitation the rights to use, copy, modify, merge, publish,
-   distribute, and/or sell copies of the Software, and to permit persons
-   to whom the Software is furnished to do so, provided that the above
-   copyright notice(s) and this permission notice appear in all copies of
-   the Software and that both the above copyright notice(s) and this
-   permission notice appear in supporting documentation.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-   OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-   HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
-   SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-   RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-   CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-   CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-   Except as contained in this notice, the name of a copyright holder
-   shall not be used in advertising or otherwise to promote the sale, use
-   or other dealings in this Software without prior written authorization
-   of the copyright holder.
-     _________________________________________________________________
-
-   All trademarks and registered trademarks mentioned herein are the
-   property of their respective owners.
-
-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
-
-    Unicode Data Files include all data files under the directories
-http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
-http://www.unicode.org/cldr/data/ . Unicode Software includes any source code
-published in the Unicode Standard or under the directories
-http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
-http://www.unicode.org/cldr/data/.
-
-    NOTICE TO USER: Carefully read the following legal agreement. BY
-DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES
-("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND
-AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU
-DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES
-OR SOFTWARE.
-
-    COPYRIGHT AND PERMISSION NOTICE
-
-    Copyright © 1991-2006 Unicode, Inc. All rights reserved. Distributed under
-the Terms of Use in http://www.unicode.org/copyright.html.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-of the Unicode data files and any associated documentation (the "Data Files") or
-Unicode software and any associated documentation (the "Software") to deal in
-the Data Files or Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, and/or sell copies of
-the Data Files or Software, and to permit persons to whom the Data Files or
-Software are furnished to do so, provided that (a) the above copyright notice(s)
-and this permission notice appear with all copies of the Data Files or Software,
-(b) both the above copyright notice(s) and this permission notice appear in
-associated documentation, and (c) there is clear notice in each modified Data
-File or in the Software as well as in the documentation associated with the Data
-File(s) or Software that the data or software has been modified.
-
-    THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD
-PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
-SOFTWARE.
-
-    Except as contained in this notice, the name of a copyright holder shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in these Data Files or Software without prior written authorization of the
-copyright holder.
diff --git a/debian/libicu4j-4.2-java.docs b/debian/libicu4j-4.2-java.docs
deleted file mode 100644
index 98631b6..0000000
--- a/debian/libicu4j-4.2-java.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-APIChangeReport.html
-readme.html
\ No newline at end of file
diff --git a/debian/libicu4j-4.2-java.poms b/debian/libicu4j-4.2-java.poms
index c29df0d..b4d252c 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.pom          --artifact=icu4j.jar          --java-lib --no-usj-versionless
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..03d54d7
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1 @@
+com.ibm.icu * * * * *
diff --git a/debian/rules b/debian/rules
index 00344cd..48a13fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpkg/pkg-info.mk
-
 export JAVA_HOME := /usr/lib/jvm/default-java
 
 %:
@@ -10,18 +8,5 @@ export JAVA_HOME := /usr/lib/jvm/default-java
 override_dh_auto_build:
 	dh_auto_build -- jar
 
-override_dh_install:
-	dh_install
-	jh_installjavadoc
-
-override_mh_install:
-	mh_install
-	rm -r -f debian/libicu4j-4.2-java/usr/share/maven-repo/com/ibm/icu/icu4j/debian
-	rm -r -f debian/libicu4j-4.2-java/usr/share/maven-repo/com/ibm/icu/icu4j-charsets/debian
-
-override_dh_auto_clean:
-	dh_auto_clean
-	jh_clean
-
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
+	uscan --download-current-version --force-download

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



More information about the pkg-java-commits mailing list