[Git][java-team/ditaa][master] 12 commits: add d/.gitignore

Alexandre Detiste (@detiste-guest) gitlab at salsa.debian.org
Fri Dec 8 21:54:40 GMT 2023



Alexandre Detiste pushed to branch master at Debian Java Maintainers / ditaa


Commits:
736de0c2 by Alexandre Detiste at 2023-12-08T22:31:35+01:00
add d/.gitignore

- - - - -
23b59a2d by Alexandre Detiste at 2023-12-08T22:31:52+01:00
Use secure copyright file specification URI.

Changes-By: lintian-brush
Fixes: lintian: insecure-copyright-format-uri
See-also: https://lintian.debian.org/tags/insecure-copyright-format-uri.html

- - - - -
17cc6559 by Alexandre Detiste at 2023-12-08T22:31:58+01:00
Use secure URI in Homepage field.

Changes-By: lintian-brush
Fixes: lintian: homepage-field-uses-insecure-uri
See-also: https://lintian.debian.org/tags/homepage-field-uses-insecure-uri.html

- - - - -
fee91f24 by Alexandre Detiste at 2023-12-08T22:32:01+01:00
Bump debhelper from deprecated 9 to 13.

Changes-By: lintian-brush
Fixes: lintian: package-uses-deprecated-debhelper-compat-version
See-also: https://lintian.debian.org/tags/package-uses-deprecated-debhelper-compat-version.html

- - - - -
563033fc by Alexandre Detiste at 2023-12-08T22:32:03+01:00
Set debhelper-compat version in Build-Depends.

Changes-By: lintian-brush
Fixes: lintian: uses-debhelper-compat-file
See-also: https://lintian.debian.org/tags/uses-debhelper-compat-file.html

- - - - -
6721170f by Alexandre Detiste at 2023-12-08T22:32:23+01:00
Remove unnecessary get-orig-source-target.

Changes-By: lintian-brush
Fixes: lintian: debian-rules-contains-unnecessary-get-orig-source-target
See-also: https://lintian.debian.org/tags/debian-rules-contains-unnecessary-get-orig-source-target.html

- - - - -
da80d878 by Alexandre Detiste at 2023-12-08T22:36:48+01:00
lintian-brush

- - - - -
9eea30c1 by Alexandre Detiste at 2023-12-08T22:43:43+01:00
use watch file v4

- - - - -
332aba00 by Alexandre Detiste at 2023-12-08T22:49:05+01:00
Alioth -> Salsa move, R³:no

- - - - -
bbd136aa by Alexandre Detiste at 2023-12-08T22:49:30+01:00
trim d/rules

- - - - -
7ce071c3 by Alexandre Detiste at 2023-12-08T22:49:56+01:00
typo found by lintian

- - - - -
d73956c7 by Alexandre Detiste at 2023-12-08T22:54:28+01:00
release

- - - - -


9 changed files:

- + debian/.gitignore
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/ditaa.1
- debian/rules
- + debian/upstream/metadata
- debian/watch


Changes:

=====================================
debian/.gitignore
=====================================
@@ -0,0 +1,8 @@
+/.debhelper/
+/_jh_build.ditaa/
+/_jh_build.javadoc/
+/_jh_manifest.ditaa
+/ditaa.debhelper.log
+/ditaa.substvars
+/ditaa/
+/files


=====================================
debian/changelog
=====================================
@@ -1,3 +1,20 @@
+ditaa (0.10+ds1-1.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Ditaa only need headless Java runtime (Closes: #953572)
+  * use watch file v4
+  * fix URL's for Alioth -> Salsa move
+  * define Rules-Requires-Root:no
+  * trim d/rules
+  * fix typo found by lintian in manpage
+
+  [ Janitor ]
+  * Use secure URI in debian/control.
+  * Bump debhelper from deprecated 9 to 13.
+  * Remove unnecessary get-orig-source-target.
+
+ -- Alexandre Detiste <tchet at debian.org>  Fri, 08 Dec 2023 22:50:03 +0100
+
 ditaa (0.10+ds1-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.


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


=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Section: graphics
 Priority: optional
 Maintainer: David Paleino <dapal at debian.org>
 Build-Depends:
- debhelper (>= 9)
+ debhelper-compat (= 13)
  , javahelper (>= 0.20~)
  , default-jre-headless
  , fastjar
@@ -12,10 +12,11 @@ Build-Depends:
  , libbatik-java
  , libxml-commons-external-java
  , libjericho-html-java (>= 3.1)
+Rules-Requires-Root: no
 Standards-Version: 3.9.6
-Homepage: http://ditaa.sourceforge.net
-Vcs-Git: git://anonscm.debian.org/collab-maint/ditaa.git
-Vcs-Browser: https://git.debian.org/cgit/collab-maint/ditaa.git
+Homepage: https://ditaa.sourceforge.net
+Vcs-Git: https://salsa.debian.org/debian/ditaa.git
+Vcs-Browser: https://salsa.debian.org/debian/ditaa
 
 Package: ditaa
 Architecture: all


=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: DiTAA
 Files-Excluded:
  lib/*.jar


=====================================
debian/ditaa.1
=====================================
@@ -40,7 +40,7 @@ produced with the appropriate <img> tags.
 .TP
 .B \-o, \-\-overwrite
 If the filename of the destination image already exists, an alternative name is chosen.
-If the overwrite option is selected, the image file is instead overwriten.
+If the overwrite option is selected, the image file is instead overwritten.
 .TP
 .B \-r, \-\-round\-corners
 Causes all corners to be rendered as round corners.


=====================================
debian/rules
=====================================
@@ -7,14 +7,10 @@
 export JAVA_HOME=/usr/lib/jvm/default-java
 export CLASSPATH=/usr/share/java/junit4.jar:$(JAVA_HOME)/lib/tools.jar:/usr/share/java/commons-cli.jar:/usr/share/java/batik-bridge.jar:/usr/share/java/batik-dom.jar:/usr/share/java/batik-gvt.jar:/usr/share/java/batik-svg-dom.jar:/usr/share/java/batik-awt-util.jar:/usr/share/java/xml-apis-ext.jar:/usr/share/java/batik-libs.jar:/usr/share/java/jericho-html.jar
 
-DEBVER=$(shell dpkg-parsechangelog | grep ^Version | cut -d\  -f2 | cut -d- -f1)
-UPVER=$(shell echo $(DEBVER) | cut -d+ -f1)
-
 %:
 	dh $@ --with javahelper
 
-override_dh_auto_clean:
-	dh_auto_clean
+execute_after_dh_auto_clean:
 	rm -rf ditaa.jar
 
 override_dh_installchangelogs:
@@ -22,15 +18,3 @@ override_dh_installchangelogs:
 
 override_jh_depends:
 	jh_depends -Xopenjdk-6-jdk
-
-ifdef VERSION
-   USCAN_OPTS=--download-version $(VERSION)
-endif
-get-orig-source:
-	uscan --verbose \
-	        $(USCAN_OPTS) \
-		--force-download \
-		--rename \
-		--repack \
-		--compression xz \
-		--destdir .


=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1,4 @@
+---
+Bug-Database: https://github.com/stathissideris/ditaa/issues
+Bug-Submit: https://github.com/stathissideris/ditaa/issues/new
+Repository-Browse: https://github.com/stathissideris/ditaa


=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
-version=3
+version=4
 opts=filenamemangle=s/.*\/v?/ditaa-/,dversionmangle=s/\+ds1//,repacksuffix=+ds1 \
 https://github.com/stathissideris/ditaa/releases .*/v?(\d.*)\.tar\.gz



View it on GitLab: https://salsa.debian.org/java-team/ditaa/-/compare/916588f7cf147b235a0e91d40422c43a8aa85b5c...d73956c7985ffe9bf354682be90d3b50105212ab

-- 
View it on GitLab: https://salsa.debian.org/java-team/ditaa/-/compare/916588f7cf147b235a0e91d40422c43a8aa85b5c...d73956c7985ffe9bf354682be90d3b50105212ab
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/20231208/3a5de02f/attachment.htm>


More information about the pkg-java-commits mailing list