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

Torsten Werner twerner at alioth.debian.org
Sun Apr 11 14:41:43 UTC 2010


Author: twerner
Date: 2010-04-11 14:41:40 +0000 (Sun, 11 Apr 2010)
New Revision: 12107

Added:
   trunk/libjlha-java/
   trunk/libjlha-java/debian/
   trunk/libjlha-java/debian/README.Debian
   trunk/libjlha-java/debian/build.xml
   trunk/libjlha-java/debian/changelog
   trunk/libjlha-java/debian/compat
   trunk/libjlha-java/debian/control
   trunk/libjlha-java/debian/copyright
   trunk/libjlha-java/debian/libjlha-java-doc-ja.doc-base
   trunk/libjlha-java/debian/libjlha-java-doc-ja.docs
   trunk/libjlha-java/debian/libjlha-java.dirs
   trunk/libjlha-java/debian/patches/
   trunk/libjlha-java/debian/patches/01_AntBuildfiles.patch
   trunk/libjlha-java/debian/patches/02_AccessingClassField.patch
   trunk/libjlha-java/debian/patches/03_DateDeprecation.patch
   trunk/libjlha-java/debian/rules
   trunk/libjlha-java/debian/watch
Log:
import existing package libjlha-java


Added: trunk/libjlha-java/debian/README.Debian
===================================================================
--- trunk/libjlha-java/debian/README.Debian	                        (rev 0)
+++ trunk/libjlha-java/debian/README.Debian	2010-04-11 14:41:40 UTC (rev 12107)
@@ -0,0 +1,18 @@
+jlha for Debian
+---------------
+
+jLHA is a library written in Java that supports reading and writing the 
+contents of LHA archives. It attempts to use the same interface as 
+the java.util.zip package.
+
+The documents which are written by the author in Japanese can be found at:
+http://homepage1.nifty.com/dangan/Content/Program/Java/jLHA/LhaLibrary.html
+http://homepage1.nifty.com/dangan/Content/Program/Java/jLHA/Notes/Notes.html
+http://homepage1.nifty.com/dangan/Content/Program/Java/jLHA/LhaBenchmark.html
+
+In English, please read:
+http://homepage1.nifty.com/dangan/en/Content/Program/Java/jLHA/LhaLibrary.html
+http://homepage1.nifty.com/dangan/en/Content/Program/Java/jLHA/Notes/Notes.html
+http://homepage1.nifty.com/dangan/en/Content/Program/Java/jLHA/LhaBenchmark.html
+
+ -- Ying-Chun Liu (PaulLiu) <paulliu at debian.org>, Fri, 21 Apr 2006 18:29:36 +0800

Added: trunk/libjlha-java/debian/build.xml
===================================================================
--- trunk/libjlha-java/debian/build.xml	                        (rev 0)
+++ trunk/libjlha-java/debian/build.xml	2010-04-11 14:41:40 UTC (rev 12107)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="jLHA" default="compile" basedir="..">
+
+<!-- ========== Component Declarations ==================================== -->
+
+  <!-- The name of this component -->
+  <property name="component.name" value="jlha"/>
+
+  <!-- The base directory for compilation targets -->
+  <property name="build.home" value="${basedir}/target"/>
+
+  <!-- The base directory for component sources -->
+  <property name="source.home" value="${basedir}"/>
+
+  <property name="link.url" value="file:///usr/share/doc/classpath-doc/api/"/>
+ 
+<!-- ========== Compiler Defaults ========================================= -->
+
+
+  <!-- Should Java compilations set the 'debug' compiler option? -->
+  <property name="compile.debug" value="false"/>
+
+  <!-- Should Java compilations set the 'deprecation' compiler option? -->
+  <property name="compile.deprecation" value="false"/>
+
+  <!-- Should Java compilations set the 'optimize' compiler option? -->
+  <property name="compile.optimize" value="true"/>
+  
+  <property name="compile.nowarn" value="yes"/>
+
+<!-- ========== Executable Targets ======================================== -->
+ 
+  <target name="prepare" description="Prepare build directory">
+    <mkdir dir="${build.home}"/>
+    <mkdir dir="${build.home}/classes"/>    
+    <mkdir dir="${build.home}/docs"/>
+    <mkdir dir="${build.home}/docs/api"/>
+  </target>
+
+  <target name="compile" depends="prepare">
+    <ant antfile="compile.xml"
+    	target="compileRelease">
+	    <property name="dest.dir" value="${build.home}/classes" />
+	    <property name="javac.target" value="1.5" />
+	    <property name="javac.source" value="1.5" />
+	    <property name="src.encoding" value="iso-8859-1"/>
+	    <property name="compile.nowarn" value="${compile.nowarn}" />
+    </ant>
+    <copy todir="${build.home}/classes/jp/gr/java_conf/dangan/util/lha/resources">
+    	<fileset dir="${source.home}/jp/gr/java_conf/dangan/util/lha/resources" />
+    </copy>    
+    <jar jarfile="${build.home}/${component.name}.jar"
+         basedir="${build.home}/classes">
+    </jar>
+  </target>
+
+  <target name="clean"
+   description="Clean build and distribution directories">
+    <delete dir="${build.home}"/>
+  </target>
+
+  <target name="all" depends="clean,compile,javadoc"
+   description="Clean and compile all components"/>
+
+  <target name="javadoc" depends="prepare"
+   description="Create component Javadoc documentation">    
+  	<ant antfile="javadoc.xml"
+  	     target="javadoc">
+  	     <property name="dest.dir" value="${build.home}/docs/api"/>
+  	     <property name="link.url" value="${link.url}"/>
+  	     <property name="link.offline" value="true"/>
+  	     <property name="packagelist.loc" value="/usr/share/doc/classpath-doc/api" />
+  	     <property name="src.encoding" value="iso-8859-1" />
+  	</ant>
+  </target>
+
+</project>

Added: trunk/libjlha-java/debian/changelog
===================================================================
--- trunk/libjlha-java/debian/changelog	                        (rev 0)
+++ trunk/libjlha-java/debian/changelog	2010-04-11 14:41:40 UTC (rev 12107)
@@ -0,0 +1,59 @@
+libjlha-java (0.0.20050504-7) unstable; urgency=low
+
+  * debian/control:
+    - Bump Standards-Version to 3.8.2
+    - Use Homepage field instead of the pseudo field in long description
+    - Update my E-mail address
+    - Change build depends on default-jdk-builddep instead of gcj
+    - Change depends on default-jre-headless instead of gcj
+    - Add misc:Depends
+  * debian/rules:
+    - Build depends on default-jdk-builddep
+  * debian/copyright:
+    - Refine the format of copyright file
+    - Use GPL-2 instead of GPL
+
+ -- Ying-Chun Liu (PaulLiu) <paulliu at debian.org>  Sun, 26 Jul 2009 00:50:23 +0800
+
+libjlha-java (0.0.20050504-6) unstable; urgency=low
+
+  * Change compliance level from 1.4 to 1.5 (Closes: #393152)
+  * Bump debhelper compat level to 5
+
+ -- Ying-Chun Liu (PaulLiu) <grandpaul at gmail.com>  Tue, 31 Oct 2006 13:24:13 +0800
+
+libjlha-java (0.0.20050504-5) unstable; urgency=low
+
+  * Fix packagelist.loc property in the patch of javadoc.xml
+  * Add link.offline property into javadoc.xml
+
+ -- Ying-Chun Liu (PaulLiu) <grandpaul at gmail.com>  Tue, 18 Jul 2006 09:05:17 +0800
+
+libjlha-java (0.0.20050504-4) unstable; urgency=low
+
+  * Add offline classpath-doc link reference
+  * Using compile.xml and javadoc.xml by build.xml
+  * Rephrasing some sentences in README.Debian
+
+ -- Ying-Chun Liu (PaulLiu) <grandpaul at gmail.com>  Fri, 23 Jun 2006 02:08:25 +0800
+
+libjlha-java (0.0.20050504-3) unstable; urgency=low
+
+  * Remove ANT_HOME, ANT_ARGS, DEB_JARS variables from debian/rule
+  * Build depends on java-gcj-compat-dev instead of kaffe
+  * This package is now maintained by the Debian Java group
+
+ -- Ying-Chun Liu (PaulLiu) <grandpaul at gmail.com>  Mon, 19 Jun 2006 11:10:28 +0800
+
+libjlha-java (0.0.20050504-2) unstable; urgency=low
+
+  * Fix some warnings: Deprecation, Accessing Class Field
+  * Remove the online link javadoc generation
+
+ -- Ying-Chun Liu (PaulLiu) <grandpaul at gmail.com>  Sat, 10 Jun 2006 16:52:28 +0800
+
+libjlha-java (0.0.20050504-1) unstable; urgency=low
+
+  * Initial release (Closes: #367375)
+
+ -- Ying-Chun Liu (PaulLiu) <grandpaul at gmail.com>  Mon,  5 Jun 2006 15:39:06 +0800

Added: trunk/libjlha-java/debian/compat
===================================================================
--- trunk/libjlha-java/debian/compat	                        (rev 0)
+++ trunk/libjlha-java/debian/compat	2010-04-11 14:41:40 UTC (rev 12107)
@@ -0,0 +1 @@
+5

Added: trunk/libjlha-java/debian/control
===================================================================
--- trunk/libjlha-java/debian/control	                        (rev 0)
+++ trunk/libjlha-java/debian/control	2010-04-11 14:41:40 UTC (rev 12107)
@@ -0,0 +1,33 @@
+Source: libjlha-java
+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>
+Build-Depends: cdbs (>= 0.4.36), debhelper (>= 5)
+Build-Depends-Indep: ant, default-jdk-builddep, classpath-doc
+Standards-Version: 3.8.2
+Homepage: http://homepage1.nifty.com/dangan/Content/Program/Java/jLHA/LhaLibrary.html
+
+Package: libjlha-java
+Architecture: all
+Section: java
+Depends: ${misc:Depends}, default-jre-headless | java-runtime-headless | java2-runtime-headless
+Suggests: java-virtual-machine, libjlha-java-doc-ja
+Description: LHA compress/decompress library for Java
+ This package is a library that supports reading and writing an archive file
+ that created by LHA. This package has interfaces like the java.util.zip
+ package. Many Java programmers can operate easily an archive file that
+ created by LHA.
+
+Package: libjlha-java-doc-ja
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, classpath-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
+ that created by LHA. This package has interfaces like the java.util.zip
+ package. Many Java programmers can operate easily an archive file that
+ created by LHA.
+ .
+ This package includes the API javadoc written in Japanese.

Added: trunk/libjlha-java/debian/copyright
===================================================================
--- trunk/libjlha-java/debian/copyright	                        (rev 0)
+++ trunk/libjlha-java/debian/copyright	2010-04-11 14:41:40 UTC (rev 12107)
@@ -0,0 +1,79 @@
+This package was debianized by Ying-Chun Liu (PaulLiu) <paulliu at debian.org> 
+on Fri, 21 Apr 2006 18:29:36 +0800.
+
+It was downloaded from
+ http://homepage1.nifty.com/dangan/Content/Program/Java/jLHA/LhaLibrary.html
+
+Upstream Author: 
+
+    Michel Ishizuka <cqw10305 at nifty.com>
+
+Copyright:
+
+    Copyright (C) 2001-2002  Michel Ishizuka
+
+License:
+
+    * The following text are written in Japanese and encoded in UTF-8
+
+    Copyright (C) 2002  Michel Ishizuka  All rights reserved.
+
+    以下の条件に同意するならばソースとバイナリ形式の再配布と使用を
+    変更の有無にかかわらず許可する。
+
+    1.ソースコードの再配布において著作権表示と この条件のリスト
+      および下記の声明文を保持しなくてはならない。
+
+    2.バイナリ形式の再配布において著作権表示と この条件のリスト
+      および下記の声明文を使用説明書もしくは その他の配布物内に
+      含む資料に記述しなければならない。
+
+    このソフトウェアは石塚美珠瑠によって無保証で提供され、特定の目
+    的を達成できるという保証、商品価値が有るという保証にとどまらず、
+    いかなる明示的および暗示的な保証もしない。
+    石塚美珠瑠は このソフトウェアの使用による直接的、間接的、偶発
+    的、特殊な、典型的な、あるいは必然的な損害(使用によるデータの
+    損失、業務の中断や見込まれていた利益の遺失、代替製品もしくは
+    サービスの導入費等が考えられるが、決してそれだけに限定されない
+    損害)に対して、いかなる事態の原因となったとしても、契約上の責
+    任や無過失責任を含む いかなる責任があろうとも、たとえそれが不
+    正行為のためであったとしても、またはそのような損害の可能性が報
+    告されていたとしても一切の責任を負わないものとする。
+
+    * The English version translated by the copyright holder is as
+      following which can be found at
+    http://homepage1.nifty.com/dangan/en/Content/Program/Java/jLHA/LhaLibrary.html
+
+    Copyright (C) 2001-2002  Michel Ishizuka  All rights reserved.
+
+    Redistribution and use in source and binary forms, with or 
+    without modification, are permitted provided that the following
+    conditions are met:
+
+    1. Redistributions of source code must retain the above
+       copyright notice, this list of conditions and the following
+       disclaimer. 
+
+    2. Redistributions in binary form must reproduce the above 
+       copyright notice, this list of conditions and the following 
+       disclaimer in the documentation and/or other materials 
+       provided with the distribution. 
+
+    THIS SOFTWARE IS PROVIDED BY MICHEL ISHIZUKA ``AS IS'' AND ANY 
+    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+    PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MICHEL 
+    ISHIZUKA BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
+    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
+    OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+    EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The English version is very similar to the "Cryptix General License" which
+is GPL-compatible. 
+
+[1] Cryptix General License can be found at http://www.cryptix.org/LICENSE.TXT
+[2] GPLv2 can be found in /usr/share/common-licenses/GPL-2

Added: trunk/libjlha-java/debian/libjlha-java-doc-ja.doc-base
===================================================================
--- trunk/libjlha-java/debian/libjlha-java-doc-ja.doc-base	                        (rev 0)
+++ trunk/libjlha-java/debian/libjlha-java-doc-ja.doc-base	2010-04-11 14:41:40 UTC (rev 12107)
@@ -0,0 +1,10 @@
+Document: libjlha-java-doc-ja
+Title: Java library jLHA Japanese Manual
+Author: Michel Ishizuka <cqw10305 at nifty.com>
+Abstract: This manual is written in Japanese. It describes what jlha is 
+ and the API can be used to (de)compress LHA files.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libjlha-java-doc-ja/api/index.html
+Files: /usr/share/doc/libjlha-java-doc-ja/api/*.html

Added: trunk/libjlha-java/debian/libjlha-java-doc-ja.docs
===================================================================
--- trunk/libjlha-java/debian/libjlha-java-doc-ja.docs	                        (rev 0)
+++ trunk/libjlha-java/debian/libjlha-java-doc-ja.docs	2010-04-11 14:41:40 UTC (rev 12107)
@@ -0,0 +1 @@
+target/docs/api

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

Added: trunk/libjlha-java/debian/patches/01_AntBuildfiles.patch
===================================================================
--- trunk/libjlha-java/debian/patches/01_AntBuildfiles.patch	                        (rev 0)
+++ trunk/libjlha-java/debian/patches/01_AntBuildfiles.patch	2010-04-11 14:41:40 UTC (rev 12107)
@@ -0,0 +1,95 @@
+--- compile.xml
++++ compile.xml
+@@ -4,8 +4,11 @@
+ 	<!-- properties -->
+ 	<property name="javac.compiler" value="modern"/>
+ 	<property name="javac.target"   value="1.1"/>
++	<property name="javac.source"	value="1.1"/>
+ 	<property name="src.dir"        value="."/>
+ 	<property name="dest.dir"       value="."/>
++	<property name="src.encoding"	value="Shift_JIS"/>
++	<property name="compile.nowarn" value="false"/>
+ 
+ 	<!-- targets -->
+ 	<target name="compileDebug">
+@@ -14,6 +17,7 @@
+ 		</delete>
+ 		<javac compiler="${javac.compiler}"
+ 			   target="${javac.target}"
++			   source="${javac.source}"
+ 			   srcdir="${src.dir}"
+ 			   destdir="${dest.dir}"
+ 		       deprecation="on"
+@@ -23,6 +27,7 @@
+ 		</javac>
+ 		<javac compiler="${javac.compiler}"
+ 			   target="${javac.target}"
++			   source="${javac.source}"
+ 			   srcdir="${src.dir}"
+ 			   destdir="${dest.dir}"
+ 		       deprecation="off"
+@@ -38,20 +43,26 @@
+ 		</delete>
+ 		<javac compiler="${javac.compiler}"
+ 			   target="${javac.target}"
++			   source="${javac.source}"
+ 			   srcdir="${src.dir}"
+ 			   destdir="${dest.dir}"
+ 		       deprecation="on"
+ 		       debug="off"
+-		       optimize="on">
++		       optimize="on"
++		       encoding="${src.encoding}"
++		       nowarn="${compile.nowarn}">
+ 			<patternset includesfile="${basedir}/lists/srcfiles.deprecation.list" />
+ 		</javac>
+ 		<javac compiler="${javac.compiler}"
+ 			   target="${javac.target}"
++			   source="${javac.source}"
+ 			   srcdir="${src.dir}"
+ 			   destdir="${dest.dir}"
+ 		       deprecation="off"
+ 		       debug="off"
+-		       optimize="on">
++		       optimize="on"
++		       encoding="${src.encoding}"
++		       nowarn="${compile.nowarn}">
+ 			<patternset includesfile="${basedir}/lists/srcfiles.nodeprecation.list" />
+ 		</javac>
+ 	</target>
+--- javadoc.xml
++++ javadoc.xml
+@@ -5,6 +5,9 @@
+ 	<property name="src.dir"  value="."/>
+ 	<property name="dest.dir" value="./docs"/>
+ 	<property name="link.url" value="http://java.sun.com/j2se/1.4/ja/docs/ja/api/"/>
++	<property name="link.offline" value="false"/>
++	<property name="packagelist.loc" value="" />
++	<property name="src.encoding" value="Shift_JIS" />
+ 
+ 	<!-- targets -->
+     <target name="javadoc">
+@@ -24,15 +27,18 @@
+                                jp.gr.java_conf.dangan.lang.reflect,
+                                jp.gr.java_conf.dangan.util,
+                                jp.gr.java_conf.dangan.util.lha"
+-                 doctitle="LHA Library for Java API ƒhƒLƒ…ƒƒ“ƒg"
+-                 Windowtitle="LHA Library for Java">
+-            <link href="${link.url}" />
++                 doctitle="LHA Library for Java API Document"
++                 Windowtitle="LHA Library for Java"
++                 classpath="${classpath}"
++                 encoding="${src.encoding}" charset="Shift_JIS">
++            <link href="${link.url}" offline="${link.offline}" 
++            	packagelistLoc="${packagelist.loc}" />
+             <Header>
+                     <![CDATA[<small>LHA Library for Java</small>]]>
+             </Header>
+             <bottom>
+-                    <![CDATA[<small>ƒoƒO‚âƒhƒLƒ…ƒƒ“ƒg‚ÌŒë‚è‚Ì•ñ‚Í<A href="mailto:cqw10305 at nifyt.com">ìŽÒˆ¶‚Ä</A>‚É‚¨Šè‚¢‚µ‚Ü‚·B<br></small>]]>
+-                    <![CDATA[<small>ƒhƒLƒ…ƒƒ“ƒg“à‚ÉŠÜ‚Ü‚ê‚éŽÐ–¼A»•i–¼‚ɂ‚¢‚Ă͈ê”Ê‚ÉŠeŽÐ‚̏¤•W‚Ü‚½‚Í“o˜^¤•W‚Å‚·B<br></small>]]>
++                    <![CDATA[<small>When you found typographical errors or omissions, Please mail to <A href="mailto:cqw10305 at nifyt.com">cqw10305 at nifty.com</A><br></small>]]>
++                    <![CDATA[<small>The company name and product name which are used in this document, it is the trademark or registered trademark of each company generally.<br></small>]]>
+                     <![CDATA[<small>Copyright &#169; 2001-2002 Michel Ishizuka. All Rights Reserved.<br></small>]]>
+             </bottom>
+         </javadoc>

Added: trunk/libjlha-java/debian/patches/02_AccessingClassField.patch
===================================================================
--- trunk/libjlha-java/debian/patches/02_AccessingClassField.patch	                        (rev 0)
+++ trunk/libjlha-java/debian/patches/02_AccessingClassField.patch	2010-04-11 14:41:40 UTC (rev 12107)
@@ -0,0 +1,37 @@
+--- jp/gr/java_conf/dangan/util/lha/PostLz5Encoder.java
++++ jp/gr/java_conf/dangan/util/lha/PostLz5Encoder.java
+@@ -219,7 +219,7 @@
+         this.buf[ this.index++ ] = (byte)pos;
+         this.buf[ this.index++ ] = (byte)( ( ( pos >> 4 ) & 0xF0 ) | matchlen );
+ 
+-        this.position += matchlen + this.Threshold;
++        this.position += matchlen + PostLz5Encoder.Threshold;
+ 
+     }
+ 
+--- jp/gr/java_conf/dangan/util/lha/PostLzsEncoder.java
++++ jp/gr/java_conf/dangan/util/lha/PostLzsEncoder.java
+@@ -200,8 +200,8 @@
+ 
+         this.position += this.matchLength + PostLzsEncoder.Threshold;
+ 
+-        this.out.writeBits( this.PositionBits, pos );                           //throws IOException
+-        this.out.writeBits( this.LengthBits,   this.matchLength );              //throws IOException
++        this.out.writeBits( PostLzsEncoder.PositionBits, pos );                           //throws IOException
++        this.out.writeBits( PostLzsEncoder.LengthBits,   this.matchLength );              //throws IOException
+     }
+ 
+ 
+--- jp/gr/java_conf/dangan/util/lha/PreLzsDecoder.java
++++ jp/gr/java_conf/dangan/util/lha/PreLzsDecoder.java
+@@ -213,8 +213,8 @@
+                 this.position++;
+                 return this.in.readBits( 8 );
+             }else{
+-                this.matchOffset = this.in.readBits( this.OffsetBits );
+-                this.matchLength = this.in.readBits( this.LengthBits );
++                this.matchOffset = this.in.readBits( PreLzsDecoder.OffsetBits );
++                this.matchLength = this.in.readBits( PreLzsDecoder.LengthBits );
+                 return this.matchLength | 0x100;
+             }
+         }catch( BitDataBrokenException exception ){

Added: trunk/libjlha-java/debian/patches/03_DateDeprecation.patch
===================================================================
--- trunk/libjlha-java/debian/patches/03_DateDeprecation.patch	                        (rev 0)
+++ trunk/libjlha-java/debian/patches/03_DateDeprecation.patch	2010-04-11 14:41:40 UTC (rev 12107)
@@ -0,0 +1,90 @@
+--- jp/gr/java_conf/dangan/util/MsdosDate.java
++++ jp/gr/java_conf/dangan/util/MsdosDate.java
+@@ -85,7 +85,6 @@
+ public class MsdosDate extends Date
+                        implements Cloneable {
+ 
+-
+     //------------------------------------------------------------------
+     //  constructor
+     //------------------------------------------------------------------
+@@ -117,12 +116,13 @@
+      * @param time MS-DOS Œ`Ž®‚ÌŽžŠÔî•ñ
+      */
+     public MsdosDate( int time ){
+-        super( ( ( time >> 25 ) & 0x7F ) + 80,
+-               ( ( time >> 21 ) & 0x0F ) - 1,
+-               ( time >> 16 ) & 0x1F,
+-               ( time >> 11 ) & 0x1F,
+-               ( time >> 5 )  & 0x3F,
+-               ( time << 1 )  & 0x3F );                                         //deprecated
++        super( (new java.util.GregorianCalendar(
++	     ((time >> 25 ) & 0x7F ) + 80 + 1900,
++	     ((time >> 21 ) & 0x0F ) - 1,
++	     ( time >> 16 ) & 0x1F,
++	     ( time >> 11 ) & 0x1F,
++	     ( time >> 5 )  & 0x3F,
++	     ( time << 1 )  & 0x3F )).getTime().getTime() );                                         //deprecated
+ 
+         this.checkRange();
+     }
+@@ -187,7 +187,10 @@
+      *             Ž¦‚µ‚Ä‚¢‚½ê‡
+      */
+     public void setTime( long time ){
+-        int year = ( new Date( time ) ).getYear();
++        int year = /*( new Date( time ) ).getYear()*/ 0;
++	java.util.GregorianCalendar c = new java.util.GregorianCalendar();
++	c.setTime(new Date(time));
++	year = c.get(java.util.Calendar.YEAR) - 1900;
+         if( year < 80 || 207 < year ){
+             throw new IllegalArgumentException( "out of MS-DOS time format range." );
+         }else{
+@@ -210,12 +213,12 @@
+      * @param time MS-DOS ŽžŠÔŒ`Ž®‚ÌŽžŠÔî•ñ
+      */
+     public void setMsdosTime( int time ){
+-        Date date = new Date( ( ( time >> 25 ) & 0x7F ) + 80,
++        Date date = new java.util.GregorianCalendar( ( ( time >> 25 ) & 0x7F ) + 80 + 1900,
+                               ( ( time >> 21 ) & 0x0F ) - 1,
+                               ( time >> 16 ) & 0x1F,
+                               ( time >> 11 ) & 0x1F,
+                               ( time >> 5 )  & 0x3F,
+-                              ( time << 1 )  & 0x3F );                          //deprecated
++                              ( time << 1 )  & 0x3F ).getTime();                          //deprecated
+ 
+         this.setTime( date.getTime() );
+     }
+@@ -226,12 +229,14 @@
+      * @return MS-DOSŽžŠÔŒ`Ž®‚Ì’l
+      */
+     public int getMsdosTime(){
+-        return ( ( super.getYear() - 80 ) << 25 )                               //deprecated
+-               | ( ( super.getMonth() + 1 ) << 21 )                             //deprecated
+-               | ( super.getDate()    << 16 )                                   //deprecated
+-               | ( super.getHours()   << 11 )                                   //deprecated
+-               | ( super.getMinutes() <<  5 )                                   //deprecated
+-               | ( super.getSeconds() >>  1 );                                  //deprecated
++	java.util.GregorianCalendar c = new java.util.GregorianCalendar();
++	c.setTime(this);
++        return ( ( c.get(java.util.Calendar.YEAR)-1900 - 80 ) << 25 )                               //deprecated
++               | ( ( c.get(java.util.Calendar.MONTH) + 1 ) << 21 )                             //deprecated
++               | ( c.get(java.util.Calendar.DAY_OF_MONTH)    << 16 )                                   //deprecated
++               | ( c.get(java.util.Calendar.HOUR_OF_DAY)   << 11 )                                   //deprecated
++               | ( c.get(java.util.Calendar.MINUTE) <<  5 )                                   //deprecated
++               | ( c.get(java.util.Calendar.SECOND) >>  1 );                                  //deprecated
+     }
+ 
+ 
+@@ -249,7 +254,10 @@
+      *             ”͈͂̎žŠÔ‚ðŽ¦‚µ‚Ä‚¢‚½ê‡
+      */
+     private void checkRange(){
+-        int year = this.getYear();
++        int year = /*this.getYear()*/ 0;
++	java.util.GregorianCalendar c = new java.util.GregorianCalendar();
++	c.setTime(this);
++	year = c.get(java.util.Calendar.YEAR) - 1900;
+         if( year < 80 || 207 < year )
+             throw new IllegalArgumentException( "out of MS-DOS time format range." );
+     }

Added: trunk/libjlha-java/debian/rules
===================================================================
--- trunk/libjlha-java/debian/rules	                        (rev 0)
+++ trunk/libjlha-java/debian/rules	2010-04-11 14:41:40 UTC (rev 12107)
@@ -0,0 +1,23 @@
+#!/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
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_BUILD_TARGET := all
+
+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
+
+clean::
+	rm -f $(CURDIR)/gjdoc_rawcomment.cache


Property changes on: trunk/libjlha-java/debian/rules
___________________________________________________________________
Added: svn:executable
   + 

Added: trunk/libjlha-java/debian/watch
===================================================================
--- trunk/libjlha-java/debian/watch	                        (rev 0)
+++ trunk/libjlha-java/debian/watch	2010-04-11 14:41:40 UTC (rev 12107)
@@ -0,0 +1,4 @@
+version=3
+opts="uversionmangle=s/^/0.0./" \
+http://homepage1.nifty.com/dangan/Content/Program/Java/jLHA/LhaLibrary.html \
+jlhasrc_([\d]*).tar.gz




More information about the pkg-java-commits mailing list