[pkg-java] r12108 - in trunk/libjlha-java/debian: . patches source

[Torsten Werner]

Author: twerner
Date: 2010-04-11 14:49:30 +0000 (Sun, 11 Apr 2010)
New Revision: 12108

Added:
   trunk/libjlha-java/debian/patches/series
   trunk/libjlha-java/debian/source/
   trunk/libjlha-java/debian/source/format
Removed:
   trunk/libjlha-java/debian/libjlha-java.dirs
Modified:
   trunk/libjlha-java/debian/
   trunk/libjlha-java/debian/changelog
   trunk/libjlha-java/debian/control
   trunk/libjlha-java/debian/rules
Log:
* Team upload.
* Remove PaulLiu from Uploaders.
* Replace references to classpath-doc by default-jdk-doc.
* Update Standards-Version: 3.8.4
* Add Vcs headers.
* Switch to source format 3.0.
* Clean up d/rules.


Property changes on: trunk/libjlha-java/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/libjlha-java/debian/changelog
===================================================================
--- trunk/libjlha-java/debian/changelog	2010-04-11 14:41:40 UTC (rev 12107)
+++ trunk/libjlha-java/debian/changelog	2010-04-11 14:49:30 UTC (rev 12108)
@@ -1,3 +1,15 @@
+libjlha-java (0.0.20050504-8) unstable; urgency=low
+
+  * Team upload.
+  * Remove PaulLiu from Uploaders.
+  * Replace references to classpath-doc by default-jdk-doc.
+  * Update Standards-Version: 3.8.4
+  * Add Vcs headers.
+  * Switch to source format 3.0.
+  * Clean up d/rules.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 11 Apr 2010 16:47:58 +0200
+
 libjlha-java (0.0.20050504-7) unstable; urgency=low
 
   * debian/control:

Modified: trunk/libjlha-java/debian/control
===================================================================
--- trunk/libjlha-java/debian/control	2010-04-11 14:41:40 UTC (rev 12107)
+++ trunk/libjlha-java/debian/control	2010-04-11 14:49:30 UTC (rev 12108)
@@ -2,11 +2,13 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>, Ying-Chun Liu (PaulLiu) <paulliu at debian.org>
+Uploaders: Michael Koch <konqueror at gmx.de>
 Build-Depends: cdbs (>= 0.4.36), debhelper (>= 5)
-Build-Depends-Indep: ant, default-jdk-builddep, classpath-doc
-Standards-Version: 3.8.2
+Build-Depends-Indep: ant, default-jdk-builddep, default-jdk-doc
+Standards-Version: 3.8.4
 Homepage: http://homepage1.nifty.com/dangan/Content/Program/Java/jLHA/LhaLibrary.html
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjlha-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjlha-java/
 
 Package: libjlha-java
 Architecture: all
@@ -22,7 +24,7 @@
 Package: libjlha-java-doc-ja
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, classpath-doc
+Depends: ${misc:Depends}, default-jdk-doc
 Suggests: libjlha-java
 Description: Japanese documentation for libjlha-java, the LHA library for Java
  This package is a library that supports reading and writing an archive file

Deleted: trunk/libjlha-java/debian/libjlha-java.dirs
===================================================================
--- trunk/libjlha-java/debian/libjlha-java.dirs	2010-04-11 14:41:40 UTC (rev 12107)
+++ trunk/libjlha-java/debian/libjlha-java.dirs	2010-04-11 14:49:30 UTC (rev 12108)
@@ -1 +0,0 @@
-usr/share/java

Added: trunk/libjlha-java/debian/patches/series
===================================================================
--- trunk/libjlha-java/debian/patches/series	                        (rev 0)
+++ trunk/libjlha-java/debian/patches/series	2010-04-11 14:49:30 UTC (rev 12108)
@@ -0,0 +1,3 @@
+01_AntBuildfiles.patch
+02_AccessingClassField.patch
+03_DateDeprecation.patch

Modified: trunk/libjlha-java/debian/rules
===================================================================
--- trunk/libjlha-java/debian/rules	2010-04-11 14:41:40 UTC (rev 12107)
+++ trunk/libjlha-java/debian/rules	2010-04-11 14:49:30 UTC (rev 12108)
@@ -1,13 +1,6 @@
 #!/usr/bin/make -f
-# debian/rules for jlha (uses cdbs).  
-  
-UPSTREAM_VERSION := $(shell dpkg-parsechangelog |\
-	egrep '^Version:' | cut -f2 -\d' ' | cut -f1 -d- )
 
-# Add here any variable or target overrides you need
-  
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
@@ -16,8 +9,8 @@
 
 install/libjlha-java::
 	install -m 644 target/jlha.jar \
-		$(CURDIR)/debian/libjlha-java/usr/share/java/jlha-$(UPSTREAM_VERSION).jar
-	dh_link /usr/share/java/jlha-$(UPSTREAM_VERSION).jar /usr/share/java/jlha.jar
+		$(CURDIR)/debian/libjlha-java/usr/share/java/jlha-$(DEB_UPSTREAM_VERSION).jar
+	dh_link /usr/share/java/jlha-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jlha.jar
 
 clean::
 	rm -f $(CURDIR)/gjdoc_rawcomment.cache

Added: trunk/libjlha-java/debian/source/format
===================================================================
--- trunk/libjlha-java/debian/source/format	                        (rev 0)
+++ trunk/libjlha-java/debian/source/format	2010-04-11 14:49:30 UTC (rev 12108)
@@ -0,0 +1 @@
+3.0 (quilt)