[Git][java-team/dita-ot][master] 3 commits: Fix clean target

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Java Maintainers / dita-ot


Commits:
526418a2 by Andreas Tille at 2025-08-19T16:53:27+02:00
Fix clean target

- - - - -
51789d92 by Andreas Tille at 2025-08-19T16:53:35+02:00
Close bugs

- - - - -
e4528ee4 by Andreas Tille at 2025-08-19T16:55:15+02:00
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+dita-ot (1.5.4+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Andreas Tille ]
+  * Fix clean target
+    Closes: #1044859
+
+  [ Tj ]
+  * Bugs closed in last upload:
+     - update for debhelper Closes: #1099969
+     - new upstream + patches Closes: #1092375
+
+ -- Andreas Tille <tille at debian.org>  Tue, 19 Aug 2025 16:54:03 +0200
+
 dita-ot (1.5.4+dfsg-1) unstable; urgency=low
 
   * Team upload.


=====================================
debian/rules
=====================================
@@ -9,6 +9,16 @@ export CLASSPATH=/usr/share/java/xml-resolver.jar:/usr/share/java/commons-codec.
 
 # Minimal version does not install fo.jar
 override_dh_auto_build:
+	cp -a build.xml build.xml.orig
+	cp -a catalog-dita.txt catalog-dita.txt.orig
+	cp -a catalog-dita.xml catalog-dita.xml.orig
+	cp -a relnotes.html relnotes.html.orig
+	cp -a doc doc.orig
+	cp -a demo/fo/build.xml demo/fo/build.xml.orig
+	cp -a lib/org.dita.dost.platform/plugin.properties lib/org.dita.dost.platform/plugin.properties.orig
+	cp -a resource/messages.xml resource/messages.xml.orig
+	cp -a xsl/map2plugin.xsl xsl/map2plugin.xsl.orig
+	cp -a xsl/preprocess xsl/preprocess.orig
 	ant -propertyfile debian/ant.properties -f buildPackage.xml package-java
 	ant -propertyfile debian/ant.properties -f demo/fo/buildPackage.xml package-java
 	ant -propertyfile debian/ant.properties -f buildPackage.xml package-binary-minimum doc
@@ -25,9 +35,20 @@ override_dh_auto_install:
 override_dh_installdocs:
 	dh_installdocs -p dita-ot
 	dh_installdocs -p dita-ot-doc --doc-main-package=dita-ot
+	find debian -name doc.orig -type d | xargs rm -rf
 
 override_dh_clean:
 	dh_clean -X'*.orig'
+	if [ -e build.xml.orig ] ; then mv build.xml.orig build.xml ; fi
+	if [ -e catalog-dita.txt.orig ] ; then mv catalog-dita.txt.orig catalog-dita.txt ; fi
+	if [ -e catalog-dita.xml.orig ] ; then mv catalog-dita.xml.orig catalog-dita.xml ; fi
+	if [ -e relnotes.html.orig ] ; then mv relnotes.html.orig relnotes.html ; fi
+	if [ -d doc.orig ] ; then rm -rf doc; mv doc.orig doc ; fi
+	if [ -e demo/fo/build.xml.orig ] ; then mv demo/fo/build.xml.orig demo/fo/build.xml ; fi
+	if [ -e lib/org.dita.dost.platform/plugin.properties.orig ] ; then mv lib/org.dita.dost.platform/plugin.properties.orig lib/org.dita.dost.platform/plugin.properties ; fi
+	if [ -e resource/messages.xml.orig ] ; then mv resource/messages.xml.orig resource/messages.xml ; fi
+	if [ -e xsl/map2plugin.xsl.orig ] ; then mv xsl/map2plugin.xsl.orig xsl/map2plugin.xsl ; fi
+	if [ -d xsl/preprocess.orig ] ; then rm -rf xsl/preprocess; mv xsl/preprocess.orig xsl/preprocess ; fi
 
 override_dh_auto_clean:
 	ant -propertyfile debian/ant.properties -f buildPackage.xml clean-java clean-package



View it on GitLab: https://salsa.debian.org/java-team/dita-ot/-/compare/d73eea5fe6342a24aac732c9a36d6672010e8be5...e4528ee4131f38211a29ead46a6093322fa6793a

-- 
View it on GitLab: https://salsa.debian.org/java-team/dita-ot/-/compare/d73eea5fe6342a24aac732c9a36d6672010e8be5...e4528ee4131f38211a29ead46a6093322fa6793a
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/20250819/8d561b1c/attachment.htm>