Dear Maintainer, I have just uploaded fixes for bugs 1048703 and 1071082 to DELAYED/10. This is to prevent testing autoremoval of plm on June, 11th.
Enclosed is the source debdiff of this NMU. It is strictly based upon the patches I submitted in the two bug logs.
Please tell me if I should delay or cancel the foreseen NMU. Best wishes, -- Pierre
diff -Nru plm-2.9.2/debian/changelog plm-2.9.2/debian/changelog
--- plm-2.9.2/debian/changelog 2020-10-11 21:54:58.000000000 +0200
+++ plm-2.9.2/debian/changelog 2024-05-22 21:50:25.000000000 +0200
@@ -1,3 +1,11 @@
+plm (2.9.2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Solving FTBFS against jgit/6.7.0 (Closes: #1071082)
+ * Allowing source package to be built twice in a row (Closes: #1048703)
+
+ -- Pierre Gruet <p...@debian.org> Wed, 22 May 2024 21:50:25 +0200
+
plm (2.9.2-1) unstable; urgency=medium
* New upstream release: The Portuguese release (new complete translation)
diff -Nru plm-2.9.2/debian/control plm-2.9.2/debian/control
--- plm-2.9.2/debian/control 2020-10-11 21:54:58.000000000 +0200
+++ plm-2.9.2/debian/control 2024-05-22 21:49:05.000000000 +0200
@@ -4,7 +4,7 @@
Maintainer: Martin Quinson <mquin...@debian.org>
Build-Depends: debhelper-compat (= 12), javahelper (>= 0.32), ant, quilt
Build-Depends-Indep: default-jdk, scala, libmiglayout-java, librsyntaxtextarea-java,
- junit4, libgettext-commons-java, libjson-simple-java, libhttpclient-java, libhttpmime-java, libjgit-java,
+ junit4, libgettext-commons-java, libjson-simple-java, libhttpclient-java, libhttpmime-java, libjgit-java (>= 6.7.0),
jython, libgettext-ant-tasks-java, imagemagick,
libmockito-java
Standards-Version: 4.5.0
diff -Nru plm-2.9.2/debian/patches/jgit_6.7.0.patch plm-2.9.2/debian/patches/jgit_6.7.0.patch
--- plm-2.9.2/debian/patches/jgit_6.7.0.patch 1970-01-01 01:00:00.000000000 +0100
+++ plm-2.9.2/debian/patches/jgit_6.7.0.patch 2024-05-22 21:50:16.000000000 +0200
@@ -0,0 +1,26 @@
+Description: replacing methods removed in jgit 6.7.0
+ The method getRef in Repository had been deprecated in previous versions, and
+ is now removed.
+Author: Pierre Gruet <p...@debian.org>
+Forwarded: no
+Last-Update: 2024-05-03
+
+--- a/src/plm/core/model/tracking/GitUtils.java
++++ b/src/plm/core/model/tracking/GitUtils.java
+@@ -126,7 +126,7 @@
+
+ public void mergeRemoteIntoLocalBranch(String userBranchHash) throws Exception {
+ try {
+- MergeResult res = git.merge().setCommit(true).setFastForward(MergeCommand.FastForwardMode.FF).setStrategy(MergeStrategy.RECURSIVE).include(git.getRepository().getRef("refs/remotes/origin/"+userBranchHash)).call();
++ MergeResult res = git.merge().setCommit(true).setFastForward(MergeCommand.FastForwardMode.FF).setStrategy(MergeStrategy.RECURSIVE).include(git.getRepository().findRef("refs/remotes/origin/"+userBranchHash)).call();
+
+ if(res.getMergeStatus() == MergeResult.MergeStatus.FAST_FORWARD) {
+ System.out.println(Game.i18n.tr("last session data successfully retrieved"));
+@@ -376,6 +376,6 @@
+ }
+
+ public Ref getRepoRef(String branch) throws IOException {
+- return git.getRepository().getRef(branch);
++ return git.getRepository().findRef(branch);
+ }
+ }
diff -Nru plm-2.9.2/debian/patches/series plm-2.9.2/debian/patches/series
--- plm-2.9.2/debian/patches/series 2020-10-11 21:54:58.000000000 +0200
+++ plm-2.9.2/debian/patches/series 2024-05-22 21:49:40.000000000 +0200
@@ -3,4 +3,4 @@
no-github
jython-fixes
json-simple-3.patch
-
+jgit_6.7.0.patch
diff -Nru plm-2.9.2/debian/rules plm-2.9.2/debian/rules
--- plm-2.9.2/debian/rules 2020-10-11 21:54:58.000000000 +0200
+++ plm-2.9.2/debian/rules 2024-05-22 21:48:32.000000000 +0200
@@ -26,11 +26,28 @@
%:
dh $@ --with javahelper
+execute_before_dh_auto_configure:
+ # Making backups of files that will be altered during the build
+ for F in $$(find l10n/engine -name "*.po" -o -name "*.pot") lib/resources/plm.configuration.properties; do \
+ cp $$F $${F}.save ;\
+ done
+
override_dh_auto_clean:
dh_auto_clean
find . -type f -name \*.java.json-simple \
-exec sh -c 'file={} && mv $$file $${file%.json-simple}' \; -print
+override_dh_clean:
+ dh_clean
+ # Removing files left there by the build system.
+ find . -name "*.jar" -delete
+ -rm dist/*.tar.bz2
+ -rm errors-*.txt
+ # Restoring files that were altered during the build
+ for F in $$(find . -name "*.save") ; do \
+ mv $$F $${F%.save} ;\
+ done
+
override_dh_auto_build:
find . -type f -name \*.java -exec grep -q 'import @JSON_SIMPLE_PACKAGE@' {} \; \
-exec sed -i.json-simple \
OpenPGP_signature.asc
Description: OpenPGP digital signature
