Your message dated Sun, 26 May 2024 08:24:08 +0000
with message-id <e1sb9am-00howb...@fasolo.debian.org>
and subject line Bug#1071082: fixed in plm 2.9.2-1.1
has caused the Debian Bug report #1071082,
regarding FTBFS against jgit/6.7.0-1 in unstable
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1071082: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1071082
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: plm
Version: 2.9.2-1
Severity: serious
Tags: ftbfs patch
Dear Maintainer,
I have just uploaded jgit/6.7.0 to unstable, in order to fix a security issue.
However, plm fails to build against it because some -- previously -- deprecated
methods have been removed.
The enclosed patch will allow you to build plm again.
Best,
--
Pierre
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-03 16:00:26.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-03 16:00:26.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-03 15:59:24.000000000 +0200
@@ -4,3 +4,4 @@
jython-fixes
json-simple-3.patch
+jgit_6.7.0.patch
--- End Message ---
--- Begin Message ---
Source: plm
Source-Version: 2.9.2-1.1
Done: Pierre Gruet <p...@debian.org>
We believe that the bug you reported is fixed in the latest version of
plm, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1071...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Pierre Gruet <p...@debian.org> (supplier of updated plm package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Wed, 22 May 2024 21:50:25 +0200
Source: plm
Architecture: source
Version: 2.9.2-1.1
Distribution: unstable
Urgency: medium
Maintainer: Martin Quinson <mquin...@debian.org>
Changed-By: Pierre Gruet <p...@debian.org>
Closes: 1048703 1071082
Changes:
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)
Checksums-Sha1:
abab8bc78feb832cbd56daa42645a9844dc1ab97 2106 plm_2.9.2-1.1.dsc
eaab2f7291982a4f48ee7495cb2a44a4ad573427 52404 plm_2.9.2-1.1.debian.tar.xz
c7fcac78855a828748f70a4f5bdcbe19b9c6a294 12697 plm_2.9.2-1.1_source.buildinfo
Checksums-Sha256:
525d59f7b11dd85b7d1b78b9f0df090d0046bebb8d072fbb68f2193970457e77 2106
plm_2.9.2-1.1.dsc
753471d04703419261398ddf40f8aae164580ab6df84e5aebbbc9e4ecae3fae8 52404
plm_2.9.2-1.1.debian.tar.xz
80c001a4f8f42495566fdab04153553540b5f27be6bf5d586ffec1ff11cc5706 12697
plm_2.9.2-1.1_source.buildinfo
Files:
a9236779fe4c0353ca23c0a95fd62bc8 2106 java optional plm_2.9.2-1.1.dsc
3ac63c51b69ae6c0aa59b899747ac22d 52404 java optional
plm_2.9.2-1.1.debian.tar.xz
163a64fab69de22968e9e7697c8d3bb2 12697 java optional
plm_2.9.2-1.1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEM8soQxPpC9J9y0UjYAMWptwndHYFAmZOVIgACgkQYAMWptwn
dHbsihAAg9p6gyFJJnXTMS8WExkmlUs+3vyFH77S9OzB/Zm4Jnfjk8MEn+fyU+Yy
MQjyA/dza3hSXakw6TJmbICMHcA/e73HhlUYBansDKU0I9iTF8tRCS7xIAZ0SNfi
X5yPCsVCG4ZJcWy3JlHXpaLgtY9MTiKy2351CWwbb1VMz9HbP748XzccNDy/82Yh
haulWNAFeZsECDxlo9TU3gJBenQsXrdZvEkkcT8mT/IIT9ZE91u4k7MlADqkLWfg
1MXW6uQZK8yxqgCqbEt0a+x/0AqOw0ztSt7NNvdGobL680VWH2YOZ6ZZ6+fqTmwW
9+OL6/oDmgMZwY2YFva4A9azBYRSSFsqhypjI5eZyzoLNMnArxr1DqVLSj1IeSMH
BGuG0kt3RqTZrzlU5xYe7VkDzRIM9G2YtPxs13K+lc/Juajsekc8JmIEN7cmsdhD
6EHpJtYPyWSE7ljwQTUJK5YNOBnR2gfh1tkmIDjKPgTttJrl42uU2bWE9OQdbkwS
9zldXskIJ16qwTXgKBoDBd20wRWse43vjdoa96F7Cf0U2kvQeWcuBE1iCAX14XhA
9S+GZjs3W6JnAXIw8B5KeF/2FeoDuI/PbjBbCDqgt405RddmKzYkHIiXZBpg3Gfe
8B3dlj//X8utRcpEdmZxQbj1G4sBjqC8FlkNCpYhLB6vWWvmXOg=
=Svep
-----END PGP SIGNATURE-----
pgpJ3zv3rMYY2.pgp
Description: PGP signature
--- End Message ---
