[Git][java-team/jargs][master] 7 commits: Removed the -doc package

Emmanuel Bourg gitlab at salsa.debian.org
Thu Jul 2 10:59:02 BST 2020 


Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jargs


Commits:
7e2b34bb by Emmanuel Bourg at 2020-07-02T11:56:03+02:00
Removed the -doc package

- - - - -
c4f4d2d5 by Emmanuel Bourg at 2020-07-02T11:56:07+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -
47e6a1f3 by Emmanuel Bourg at 2020-07-02T11:56:57+02:00
Wrap and sort

- - - - -
110015fb by Emmanuel Bourg at 2020-07-02T11:57:40+02:00
Standards-Version updated to 4.5.0

- - - - -
afec9e1f by Emmanuel Bourg at 2020-07-02T11:57:42+02:00
Build with the DH sequencer instead of CDBS

- - - - -
a2c03a7d by Emmanuel Bourg at 2020-07-02T11:57:42+02:00
Switch to debhelper level 13

- - - - -
0b6969bc by Emmanuel Bourg at 2020-07-02T11:58:46+02:00
Upload to unstable

- - - - -


10 changed files:

- debian/changelog
- − debian/compat
- debian/control
- − debian/dirs
- − debian/libjargs-java-doc.doc-base
- − debian/libjargs-java-doc.docs
- debian/libjargs-java.poms
- − debian/patches/link-javadoc.patch
- − debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+jargs (1.0.0-5) unstable; urgency=medium
+
+  * Team upload.
+  * Build with the DH sequencer instead of CDBS
+  * Removed the -doc package
+  * Use salsa.debian.org Vcs-* URLs
+  * Standards-Version updated to 4.5.0
+  * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 02 Jul 2020 11:58:38 +0200
+
 jargs (1.0.0-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9


=====================================
debian/control
=====================================
@@ -3,32 +3,21 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Dominik Smatana <dominik.smatana at gmail.com>
-Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant, javahelper (>= 0.32~)
-Build-Depends-Indep: junit, default-jdk-doc, maven-repo-helper
-Standards-Version: 3.9.5
+Build-Depends:
+ ant,
+ debhelper-compat (= 13),
+ default-jdk,
+ junit,
+ maven-repo-helper
+Standards-Version: 4.5.0
+Vcs-Git: https://salsa.debian.org/java-team/jargs.git
+Vcs-Browser: https://salsa.debian.org/java-team/jargs
 Homepage: http://jargs.sourceforge.net/
-Vcs-Git: git://anonscm.debian.org/pkg-java/jargs.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jargs.git
 
 Package: libjargs-java
 Architecture: all
-Depends: ${misc:Depends}, ${java:Depends}
-Recommends: ${java:Recommends}
-Suggests: libjargs-java-doc
+Depends: ${misc:Depends}
 Description: Command-line argument parsing for Java
  jargs provides a convenient, compact, pre-packaged and
  comprehensively documented suite of command line option
  parsers for the use of Java programmers.
-
-Package: libjargs-java-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}, ${java:Depends}
-Recommends: ${java:Recommends}
-Suggests: libjargs-java
-Description: Command-line argument parsing for Java - documentation
- jargs provides a convenient, compact, pre-packaged and
- comprehensively documented suite of command line option
- parsers for the use of Java programmers.
- .
- This package includes the documentation.


=====================================
debian/dirs deleted
=====================================
@@ -1 +0,0 @@
-usr/share/java


=====================================
debian/libjargs-java-doc.doc-base deleted
=====================================
@@ -1,10 +0,0 @@
-Document: libjargs-java-doc
-Title: Programmer API for JArgs
-Author: Steve Purcell, Ewan Mellor, and others.
-Abstract: This is the programmer API of JArgs, a suite of
- command line option parsers for Java.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjargs-java-doc/api/index.html
-Files: /usr/share/doc/libjargs-java-doc/api/*.html


=====================================
debian/libjargs-java-doc.docs deleted
=====================================
@@ -1,3 +0,0 @@
-README
-TODO
-doc/api


=====================================
debian/libjargs-java.poms
=====================================
@@ -25,4 +25,4 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-debian/pom.xml --has-package-version
+debian/pom.xml --has-package-version --java-lib --artifact=lib/jargs.jar


=====================================
debian/patches/link-javadoc.patch deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Links javadoc to the system javadoc.
-Author: Niels Thykier <niels at thykier.net>
-
-diff --git a/build.xml.org b/build.xml
-index c6bc60e..9ebe523 100644
---- a/build.xml.org
-+++ b/build.xml
-@@ -87,6 +87,7 @@ Purcell. Copyright &copy; 2002 Vidar Holen.  Copyright &copy; 2002 Micha
-              footer="${javadoc.header}"
-              bottom="${javadoc.bottom}">
-              <package name="**.*" />
-+             <link href="/usr/share/doc/default-jdk-doc/api/" />
-          </javadoc>
-   </target>
- 


=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-link-javadoc.patch


=====================================
debian/rules
=====================================
@@ -1,29 +1,4 @@
 #!/usr/bin/make -f
-# debian/rules file for jargs (uses cdbs)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-export VERSION = $(DEB_UPSTREAM_VERSION)
-
-# special hack for fake 1.0.0
-ifeq ($(VERSION),1.0.0)
-VERSION=1.0
-endif
-
-JAVA_HOME := /usr/lib/jvm/default-java/
-ANT_HOME := /usr/share/ant
-
-DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_BUILD_TARGET := build
-
-install/libjargs-java::
-	jh_installlibs -p$(cdbs_curpkg) --upstream-version=$(DEB_UPSTREAM_VERSION) lib/jargs.jar
-
-binary-post-install/libjargs-java::
-	mh_installpoms -plibjargs-java
-	mh_installjar -plibjargs-java -l debian/pom.xml lib/jargs.jar
-
-clean::
-	mh_clean
+%:
+	dh $@ --with maven-repo-helper



View it on GitLab: https://salsa.debian.org/java-team/jargs/-/compare/a2df2303edd650e12712cf3b63db9bd58769d4cb...0b6969bcc83f65071e83036a6dc50a60f1b031dd

-- 
View it on GitLab: https://salsa.debian.org/java-team/jargs/-/compare/a2df2303edd650e12712cf3b63db9bd58769d4cb...0b6969bcc83f65071e83036a6dc50a60f1b031dd
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/20200702/eb0a6142/attachment.html>

More information about the pkg-java-commits mailing list