[pkg-java] r14618 - trunk/icu4j/debian

[Torsten Werner]

Author: twerner
Date: 2011-08-30 19:40:30 +0000 (Tue, 30 Aug 2011)
New Revision: 14618

Modified:
   trunk/icu4j/debian/
   trunk/icu4j/debian/changelog
   trunk/icu4j/debian/control
   trunk/icu4j/debian/rules
Log:
* Switch to cdbs.
* Set svn-buildpackage property mergeWithUpstream.
* Remove Java runtime from Depends.
* Update Standards-Version: 3.9.1.


Property changes on: trunk/icu4j/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/icu4j/debian/changelog
===================================================================
--- trunk/icu4j/debian/changelog	2011-08-30 19:26:16 UTC (rev 14617)
+++ trunk/icu4j/debian/changelog	2011-08-30 19:40:30 UTC (rev 14618)
@@ -4,8 +4,12 @@
   * Newer but not newest upstream version.
   * Change debian/watch to download from upstream's svn repo.
   * Remove old patch that is no longer needed.
+  * Switch to cdbs.
+  * Set svn-buildpackage property mergeWithUpstream.
+  * Remove Java runtime from Depends.
+  * Update Standards-Version: 3.9.1.
 
- -- Torsten Werner <twerner at debian.org>  Tue, 30 Aug 2011 21:23:56 +0200
+ -- Torsten Werner <twerner at debian.org>  Tue, 30 Aug 2011 21:37:31 +0200
 
 icu4j (4.0.1.1-1) unstable; urgency=low
 

Modified: trunk/icu4j/debian/control
===================================================================
--- trunk/icu4j/debian/control	2011-08-30 19:26:16 UTC (rev 14617)
+++ trunk/icu4j/debian/control	2011-08-30 19:40:30 UTC (rev 14618)
@@ -5,18 +5,16 @@
 Uploaders: Andreas Tille <tille at debian.org>,
  Steffen Moeller <moeller at debian.org>,
  Niels Thykier <niels at thykier.net>
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Build-Depends: debhelper (>= 7), ant (>= 1.7.0), default-jdk, unzip,
- javahelper
+ javahelper, cdbs
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/icu4j
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/icu4j/
 Homepage: http://www.icu-project.org/
 
 Package: libicu4j-java
 Architecture: all
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless |
- java5-runtime-headless | java6-runtime-headless,
- ${misc:Depends}
+Depends: ${misc:Depends}
 Description: Library for unicode support and internalisation
  ICU is a mature, widely used set of C/C++ and Java libraries for
  Unicode support, software internationalization and globalization

Modified: trunk/icu4j/debian/rules
===================================================================
--- trunk/icu4j/debian/rules	2011-08-30 19:26:16 UTC (rev 14617)
+++ trunk/icu4j/debian/rules	2011-08-30 19:40:30 UTC (rev 14618)
@@ -1,45 +1,20 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME:=/usr/lib/jvm/default-java/
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
 
-build: build-stamp
+export JAVA_HOME := /usr/lib/jvm/default-java/
 
-build-stamp:
-	dh_testdir
-	ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 \
-	   eclipseProjects eclipseCoreProject eclipseWrapperProject
+DEB_ANT_CLEAN_TARGET := normSrc clean
+DEB_ANT_BUILD_TARGET := eclipseProjects eclipseCoreProject eclipseWrapperProject
+
+build/libicu4j-java:: stamp-extra-build
+stamp-extra-build:
 	ant -f debian/build.xml build-jars
 	touch $@
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	if [ -f build.xml ] ; then ant normSrc && ant clean ; fi
-	rm -f *.jar
-	dh_clean
-
-binary-arch:
-
-binary-indep: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_prep
+install/libicu4j-java::
 	jh_installlibs -plibicu4j-java com.ibm.icu.jar com.ibm.icu.base.jar
-	dh_installchangelogs
-	dh_installdocs
-	dh_install
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install
-
 get-orig-source:
-	uscan --download-version 4.2.1.1 --force-download
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download