[Git][java-team/libjlha-java][master] 7 commits: Removed the -java-doc package
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Wed Apr 17 10:58:41 BST 2024
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libjlha-java
Commits:
41aed14f by Emmanuel Bourg at 2024-04-17T11:46:53+02:00
Removed the -java-doc package
- - - - -
f681b4ad by Emmanuel Bourg at 2024-04-17T11:47:13+02:00
Use salsa.debian.org Vcs-* URLs
- - - - -
889d46fa by Emmanuel Bourg at 2024-04-17T11:47:48+02:00
Wrap and sort
- - - - -
74033b67 by Emmanuel Bourg at 2024-04-17T11:56:00+02:00
Build with the DH sequencer instead of CDBS
- - - - -
9751a5d7 by Emmanuel Bourg at 2024-04-17T11:56:08+02:00
Standards-Version updated to 4.7.0
- - - - -
587b8524 by Emmanuel Bourg at 2024-04-17T11:56:22+02:00
Switch to debhelper level 13
- - - - -
b4709366 by Emmanuel Bourg at 2024-04-17T11:58:15+02:00
Upload to unstable
- - - - -
9 changed files:
- debian/build.xml
- debian/changelog
- − debian/compat
- debian/control
- − debian/libjlha-java-doc-ja.doc-base
- − debian/libjlha-java-doc-ja.docs
- + debian/libjlha-java.jlibs
- debian/patches/01_AntBuildfiles.patch
- debian/rules
Changes:
=====================================
debian/build.xml
=====================================
@@ -12,8 +12,6 @@
<!-- 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 ========================================= -->
@@ -33,8 +31,6 @@
<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">
@@ -59,19 +55,7 @@
<delete dir="${build.home}"/>
</target>
- <target name="all" depends="clean,compile,javadoc"
+ <target name="all" depends="clean,compile"
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>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+libjlha-java (0.0.20050504-11) unstable; urgency=medium
+
+ * Team upload.
+ * Build with the DH sequencer instead of CDBS
+ * Removed the -java-doc package
+ * Use salsa.debian.org Vcs-* URLs
+ * Standards-Version updated to 4.7.0
+ * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 17 Apr 2024 11:58:08 +0200
+
libjlha-java (0.0.20050504-10.1) unstable; urgency=medium
* Non maintainer upload by the Reproducible Builds team.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10
=====================================
debian/control
=====================================
@@ -3,32 +3,21 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: tony mancill <tmancill at debian.org>
-Build-Depends: cdbs (>= 0.4.36), debhelper (>= 10)
-Build-Depends-Indep: ant, default-jdk, default-jdk-doc
-Standards-Version: 4.0.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libjlha-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjlha-java.git
+Build-Depends:
+ ant,
+ debhelper-compat (= 13),
+ default-jdk,
+ javahelper
+Standards-Version: 4.7.0
+Vcs-Git: https://salsa.debian.org/java-team/libjlha-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libjlha-java
Homepage: http://dangan.g.dgdg.jp/Content/Program/Java/jLHA/LhaLibrary.html
Package: libjlha-java
Architecture: all
Depends: ${misc:Depends}
-Suggests: 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}, 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
- 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.
=====================================
debian/libjlha-java-doc-ja.doc-base deleted
=====================================
@@ -1,10 +0,0 @@
-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
=====================================
debian/libjlha-java-doc-ja.docs deleted
=====================================
@@ -1 +0,0 @@
-target/docs/api
=====================================
debian/libjlha-java.jlibs
=====================================
@@ -0,0 +1 @@
+target/jlha.jar
=====================================
debian/patches/01_AntBuildfiles.patch
=====================================
@@ -1,5 +1,5 @@
--- a/compile.xml
-+++ a/compile.xml
++++ b/compile.xml
@@ -4,8 +4,11 @@
<!-- properties -->
<property name="javac.compiler" value="modern"/>
@@ -57,39 +57,3 @@
<patternset includesfile="${basedir}/lists/srcfiles.nodeprecation.list" />
</javac>
</target>
---- a/javadoc.xml
-+++ a/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 ドキュメント"
-- 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>バグやドキュメントの誤りの報告は<A href="mailto:cqw10305 at nifyt.com">作者宛て</A>にお願いします。<br></small>]]>
-- <![CDATA[<small>ドキュメント内に含まれる社名、製品名については一般に各社の商標または登録商標です。<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 © 2001-2002 Michel Ishizuka. All Rights Reserved.<br></small>]]>
- </bottom>
- </javadoc>
=====================================
debian/rules
=====================================
@@ -1,16 +1,10 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+ dh $@ --buildsystem=ant --with javahelper
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_BUILD_TARGET := all
+override_dh_auto_build:
+ ant -f debian/build.xml
-install/libjlha-java::
- install -m 644 -D target/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
+override_dh_auto_clean:
+ ant -f debian/build.xml clean
View it on GitLab: https://salsa.debian.org/java-team/libjlha-java/-/compare/4dd8b5789448cba1d7f77493fa4870e97c3ac274...b4709366695ced3ca4fd0908e2fc3d87a1f488ed
--
View it on GitLab: https://salsa.debian.org/java-team/libjlha-java/-/compare/4dd8b5789448cba1d7f77493fa4870e97c3ac274...b4709366695ced3ca4fd0908e2fc3d87a1f488ed
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240417/dabf34c7/attachment.htm>
More information about the pkg-java-commits
mailing list