[Git][java-team/httpunit][master] 5 commits: rewrite d/rules with newer & shorter syntax

Alexandre Detiste (@detiste-guest) gitlab at salsa.debian.org
Fri Mar 20 17:16:40 GMT 2026



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


Commits:
05c6912f by Alexandre Detiste at 2026-03-20T18:12:01+01:00
rewrite d/rules with newer & shorter syntax

- - - - -
8906134f by Alexandre Detiste at 2026-03-20T18:12:28+01:00
bump Standards-Version to 4.7.3, drop Priority: tag

- - - - -
55a77c7e by Alexandre Detiste at 2026-03-20T18:14:34+01:00
trim dpatch boilerplate

- - - - -
abbb9ee6 by Alexandre Detiste at 2026-03-20T18:16:07+01:00
rewrite d/watch in v5 format

- - - - -
c035de1e by Alexandre Detiste at 2026-03-20T18:16:35+01:00
release

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/patches/add_classpath_to_manifest
- debian/patches/fix_set_encoding
- debian/patches/use_system_jars
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+httpunit (1.7+dfsg-16) unstable; urgency=medium
+
+  * Team upload.
+  * Rewrite d/rules with newer & shorter syntax
+  * Bump Standards-Version to 4.7.3, drop Priority: tag
+  * Trim dpatch boilerplate
+  * Rewrite d/watch in v5 format
+
+  [ Debian Janitor ]
+  * Apply multi-arch hints. + libhttpunit-java-doc: Add Multi-Arch: foreign.
+
+ -- Alexandre Detiste <tchet at debian.org>  Fri, 20 Mar 2026 18:16:11 +0100
+
 httpunit (1.7+dfsg-15) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -2,7 +2,6 @@ Source: httpunit
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: James Page <james.page at ubuntu.com>
 Section: java
-Priority: optional
 Build-Depends: ant,
                debhelper-compat (= 13),
                default-jdk-headless,
@@ -15,7 +14,7 @@ Build-Depends: ant,
                libxerces2-java,
                maven-repo-helper,
                rhino
-Standards-Version: 4.7.0
+Standards-Version: 4.7.3
 Vcs-Browser: https://salsa.debian.org/java-team/httpunit
 Vcs-Git: https://salsa.debian.org/java-team/httpunit.git
 Homepage: https://httpunit.sourceforge.net/


=====================================
debian/patches/add_classpath_to_manifest
=====================================
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## add_classpath_to_manifest.dpatch by Florian Weimer <fweimer at bfk.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add Class-Path entry to the manifest, so packages using
-## DP: httpunit don't have to worry about httpunit's internal dependencies.
+Author: Florian Weimer <fweimer at bfk.de>
+Description: add Class-Path entry to the manifest, so packages using
+ httpunit don't have to worry about httpunit's internal dependencies.
 
- at DPATCH@
 diff -urNad httpunit-1.7+dfsg~/build.xml httpunit-1.7+dfsg/build.xml
 --- httpunit-1.7+dfsg~/build.xml	2008-05-20 09:55:36.000000000 -0430
 +++ httpunit-1.7+dfsg/build.xml	2009-07-25 14:30:26.000000000 -0430


=====================================
debian/patches/fix_set_encoding
=====================================
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_set_encoding.dpatch by Miguel Landaeta <miguel at miguel.cc>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: method setCharEncoding from Tidy class was removed from API.
-## DP: now the methods setInputEncoding and setOutputEncoding must be used.
+Author: Miguel Landaeta <miguel at miguel.cc>
+Description: method setCharEncoding from Tidy class was removed from API.
+ now the methods setInputEncoding and setOutputEncoding must be used.
 
- at DPATCH@
 diff -urNad httpunit-1.7+dfsg~/src/com/meterware/httpunit/parsing/JTidyHTMLParser.java httpunit-1.7+dfsg/src/com/meterware/httpunit/parsing/JTidyHTMLParser.java
 --- httpunit-1.7+dfsg~/src/com/meterware/httpunit/parsing/JTidyHTMLParser.java	2008-05-20 16:25:36.000000000 +0000
 +++ httpunit-1.7+dfsg/src/com/meterware/httpunit/parsing/JTidyHTMLParser.java	2009-03-04 21:25:54.000000000 +0000


=====================================
debian/patches/use_system_jars
=====================================
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## use_system_jars.dpatch by Miguel Landaeta <miguel at miguel.cc>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Configure build to use jar installed on system.
+Author: Miguel Landaeta <miguel at miguel.cc>
+Description: Configure build to use jar installed on system.
 
- at DPATCH@
 diff -urNad httpunit-1.7+dfsg~/build.xml httpunit-1.7+dfsg/build.xml
 --- httpunit-1.7+dfsg~/build.xml	2008-05-20 16:25:36.000000000 +0000
 +++ httpunit-1.7+dfsg/build.xml	2009-03-04 21:19:43.000000000 +0000


=====================================
debian/rules
=====================================
@@ -5,8 +5,7 @@ export JAVA_HOME := /usr/lib/jvm/default-java
 %:
 	dh $@ --with javahelper --with jh_maven_repo_helper
 
-override_dh_auto_clean:
-	dh_auto_clean
+execute_after_dh_auto_clean:
 	ant total-clean
 	rm -f doc/tutorial/task1.zip
 


=====================================
debian/watch
=====================================
@@ -1,4 +1,5 @@
-version=4
+Version: 5
 
-opts=dversionmangle=s/\+dfsg// \
-https://sf.net/httpunit/httpunit-([\d\.]*).zip
+Source: https://sf.net/httpunit/
+Matching-Pattern: httpunit-([\d\.]*).zip
+Dversionmangle: s/\+dfsg//



View it on GitLab: https://salsa.debian.org/java-team/httpunit/-/compare/8206a066dc64ed01c386b09bd3308f4e27d95cd9...c035de1e5a987c7035ded084b095a67751617c59

-- 
View it on GitLab: https://salsa.debian.org/java-team/httpunit/-/compare/8206a066dc64ed01c386b09bd3308f4e27d95cd9...c035de1e5a987c7035ded084b095a67751617c59
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/20260320/30ea534b/attachment.htm>


More information about the pkg-java-commits mailing list