[Git][java-team/scala-xml][master] 11 commits: Point Vcs fields to Salsa

Andreas Tille (@tille) gitlab at salsa.debian.org
Thu Aug 14 06:59:15 BST 2025



Andreas Tille pushed to branch master at Debian Java Maintainers / scala-xml


Commits:
21214ef7 by Andreas Tille at 2025-08-14T07:09:03+02:00
Point Vcs fields to Salsa

- - - - -
75fd7303 by Andreas Tille at 2025-08-14T07:47:05+02:00
Standards-Version: 4.7.2 (routine-update)

- - - - -
4d4ad30d by Andreas Tille at 2025-08-14T07:47:05+02:00
debhelper-compat 13 (routine-update)

- - - - -
1e1d58c6 by Andreas Tille at 2025-08-14T07:47:08+02:00
Secure URI in copyright format (routine-update)

- - - - -
330811d1 by Andreas Tille at 2025-08-14T07:47:08+02:00
Drop useless get-orig-source target (routine-update)

- - - - -
7dc08663 by Andreas Tille at 2025-08-14T07:47:08+02:00
Remove trailing whitespace in debian/rules (routine-update)

- - - - -
82527110 by Andreas Tille at 2025-08-14T07:49:00+02:00
Do not parse d/changelog (routine-update)

- - - - -
ba538109 by Andreas Tille at 2025-08-14T07:50:31+02:00
Update watch file format version to 4.

Changes-By: lintian-brush
Fixes: lintian: older-debian-watch-file-standard
See-also: https://lintian.debian.org/tags/older-debian-watch-file-standard.html

- - - - -
efae710b by Andreas Tille at 2025-08-14T07:50:54+02:00
Add upstream metadata

- - - - -
88c6d168 by Andreas Tille at 2025-08-14T07:51:47+02:00
Build-Depends: s/default-jdk/default-jdk-headless/

- - - - -
0667f009 by Andreas Tille at 2025-08-14T07:56:52+02:00
Add package containing documentation Closes: #806995

- - - - -


8 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/rules
- + debian/scala-xml-doc.docs
- + debian/upstream/metadata
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,25 @@
+scala-xml (1.0.3-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+
+  [ Andreas Tille ]
+  * Point Vcs fields to Salsa
+  * Standards-Version: 4.7.2 (routine-update)
+  * debhelper-compat 13 (routine-update)
+  * Secure URI in copyright format (routine-update)
+  * Drop useless get-orig-source target (routine-update)
+  * Remove trailing whitespace in debian/rules (routine-update)
+  * Do not parse d/changelog (routine-update)
+  * Update watch file format version to 4.
+  * Add upstream metadata
+  * Build-Depends: s/default-jdk/default-jdk-headless/
+
+  [ Christopher Cramer ]
+  * Add package containing documentation
+    Closes: #806995
+
+ -- Andreas Tille <tille at debian.org>  Thu, 14 Aug 2025 07:08:09 +0200
+
 scala-xml (1.0.3-3) unstable; urgency=medium
 
   * Added the missing build dependency on default-jdk


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


=====================================
debian/control
=====================================
@@ -1,12 +1,16 @@
 Source: scala-xml
-Section: devel
-Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 9), default-jdk, maven-repo-helper, scala (>= 2.11), scala-xml
-Standards-Version: 3.9.6
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/scala-xml.git
-Vcs-Git: git://anonscm.debian.org/pkg-java/scala-xml.git
+Section: devel
+Priority: optional
+Build-Depends: debhelper-compat (= 13),
+               default-jdk-headless,
+               maven-repo-helper,
+               scala,
+               scala-xml
+Standards-Version: 4.7.2
+Vcs-Browser: https://salsa.debian.org/java-team/scala-xml
+Vcs-Git: https://salsa.debian.org/java-team/scala-xml.git
 Homepage: https://github.com/scala/scala-xml
 
 Package: scala-xml
@@ -17,3 +21,11 @@ Description: Standard Scala XML library
  modern language features.
  .
  This package contains the standard Scala XML library.
+
+Package: scala-xml-doc
+Architecture: all
+Description: Standard Scala XML library documentation
+ Scala is a Java-compatible programming language with many
+ modern language features.
+ .
+ This package contains the documentation for the standard Scala XML library.


=====================================
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: Standard Scala XML library
 Source: https://github.com/scala/scala-xml
 


=====================================
debian/rules
=====================================
@@ -7,22 +7,22 @@ SCALA_VERSION=$(shell scala -version 2>&1 | cut -f 5 -d ' ')
 SCALA_MAJOR=$(shell scala -version 2>&1 | cut -f 5 -d ' ' | cut -f 1 -d '.')
 SCALA_MINOR=$(shell scala -version 2>&1 | cut -f 5 -d ' ' | cut -f 2 -d '.')
 SCALA_BINARY_VERSION=$(SCALA_MAJOR).$(SCALA_MINOR)
-VERSION=$(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)[-+].*$$/\1/p')
+
+include /usr/share/dpkg/default.mk
 
 SOURCE_FILES=$(shell find src/main/scala -name *.scala)
 
 override_dh_auto_build:
 	mkdir -p target/classes
 	scalac -d target/classes -cp /usr/share/java/scala-xml_$(SCALA_BINARY_VERSION).jar $(SOURCE_FILES)
-	
+
 	echo "scala.version.number=$(SCALA_VERSION)"               >> target/classes/scala-xml.properties
 	echo "scala.binary.version.number=$(SCALA_BINARY_VERSION)" >> target/classes/scala-xml.properties
-	echo "version.number=$(VERSION)"                           >> target/classes/scala-xml.properties
-	
+	echo "version.number=$(DEB_VERSION_UPSTREAM)"              >> target/classes/scala-xml.properties
+
 	jar cfm target/scala-xml.jar debian/manifest -C target/classes .
+	mkdir -p html
+	scaladoc -d html $(SOURCE_FILES)
 
 override_dh_auto_clean:
-	rm -Rf target
-
-get-orig-source:
-	uscan --download-current-version --rename
+	rm -Rf target html


=====================================
debian/scala-xml-doc.docs
=====================================
@@ -0,0 +1 @@
+html/


=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1,3 @@
+---
+Bug-Database: https://github.com/scala/scala-xml/issues
+Repository-Browse: https://github.com/scala/scala-xml


=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
-version=3
+version=4
 https://github.com/scala/scala-xml/tags .*/v([\d\.]+).tar.gz



View it on GitLab: https://salsa.debian.org/java-team/scala-xml/-/compare/8356ac51b5aef0d8bb3cfcbd30bb55278a966491...0667f009e2e03a7869c6bbfc2e93e4fcf8871113

-- 
View it on GitLab: https://salsa.debian.org/java-team/scala-xml/-/compare/8356ac51b5aef0d8bb3cfcbd30bb55278a966491...0667f009e2e03a7869c6bbfc2e93e4fcf8871113
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/20250814/f048ed26/attachment.htm>


More information about the pkg-java-commits mailing list