[Git][java-team/ognl][master] 5 commits: Address fail to build after successful build (Closes: #1048792)

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / ognl


Commits:
3249f1b0 by tony mancill at 2025-12-02T12:51:00-08:00
Address fail to build after successful build (Closes: #1048792)

- - - - -
0ea27d41 by tony mancill at 2025-12-02T12:52:14-08:00
Freshen years in debian/copyright

- - - - -
1086357c by tony mancill at 2025-12-02T12:52:32-08:00
Bump Standards-Version to 4.7.2

- - - - -
fd5b7243 by tony mancill at 2025-12-02T12:53:02-08:00
Prepare changelog for upload

- - - - -
5920586e by tony mancill at 2025-12-03T20:32:34-08:00
Make backup and restoral of sources less verbose

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/copyright
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+ognl (2.7.3-9) unstable; urgency=medium
+
+  * Team upload.
+  * Address fail to build after successful build (Closes: #1048792)
+  * Freshen years in debian/copyright
+  * Bump Standards-Version to 4.7.2
+
+ -- tony mancill <tmancill at debian.org>  Tue, 02 Dec 2025 12:52:45 -0800
+
 ognl (2.7.3-8) unstable; urgency=medium
 
   * Team upload


=====================================
debian/control
=====================================
@@ -15,11 +15,10 @@ Build-Depends: ant,
                libjavassist-java,
                libxalan2-java,
                maven-repo-helper,
-Standards-Version: 4.6.2
+Standards-Version: 4.7.2
 Vcs-Git: https://salsa.debian.org/java-team/ognl.git
 Vcs-Browser: https://salsa.debian.org/java-team/ognl
 Homepage: https://commons.apache.org/ognl/
-Rules-Requires-Root: no
 
 Package: libognl-java
 Architecture: all


=====================================
debian/copyright
=====================================
@@ -99,6 +99,7 @@ Licence: other
 Files: debian/*
 Copyright: 2005, Trygve Laugstøl <trygvis at inamo.no>
            2009, Damien Raude-Morvan <drazzib at debian.org>
+           2024-2025, tony mancill <tmancill at debian.org>
 License: BSD
  Copying and distribution of this package, with or without
  modification, are permitted in any medium without royalty


=====================================
debian/rules
=====================================
@@ -2,11 +2,25 @@
 
 export CLASSPATH := /usr/share/java/javassist.jar:/usr/share/java/junit4.jar:/usr/share/java/ant-trax.jar:/usr/share/java/xalan2.jar:/usr/share/java/xml-apis.jar:/usr/share/java/serializer.jar:/usr/share/java/javacc.jar:/usr/share/java/ant-contrib.jar
 
+BACKUP_DIR := $(CURDIR)/.backup_src
+
 %:
 	dh $@ --with maven-repo-helper
 
 override_dh_auto_build:
+	if [ ! -d "$(BACKUP_DIR)" ]; then \
+		mkdir -p $(BACKUP_DIR) ;\
+		cp -a $(CURDIR)/src/java/ognl $(BACKUP_DIR) ;\
+	fi
 	dh_auto_build -- -Dversion=2.7.3 javacc-generate jar docs.impl javadocs
 
+override_dh_auto_clean:
+	if [ -d "$(BACKUP_DIR)" ]; then \
+		rm -rf $(CURDIR)/src/java/ognl ;\
+		mv -v $(BACKUP_DIR)/ognl $(CURDIR)/src/java/ ;\
+		rm -rf $(BACKUP_DIR) ;\
+	fi
+	dh_auto_clean
+
 get-orig-source:
 	sh debian/orig-tar.sh 2.7.3



View it on GitLab: https://salsa.debian.org/java-team/ognl/-/compare/a6f8e09f53b0afdf75770841b9570454330a8656...5920586eab5d727d344fcde024bb74348e6c9e12

-- 
View it on GitLab: https://salsa.debian.org/java-team/ognl/-/compare/a6f8e09f53b0afdf75770841b9570454330a8656...5920586eab5d727d344fcde024bb74348e6c9e12
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/20251204/47c129c3/attachment.htm>