[Git][java-team/plm][master] 3 commits: Fixing the clean rule

[Pierre Gruet (@pgt)]

Pierre Gruet pushed to branch master at Debian Java Maintainers / plm


Commits:
445777e2 by Pierre Gruet at 2024-05-24T21:28:46+02:00
Fixing the clean rule

- - - - -
b69c53e4 by Pierre Gruet at 2024-05-24T21:30:34+02:00
FIxing FTBFS against jgit/6.7.0

- - - - -
26c3e1ba by Pierre Gruet at 2024-05-24T21:31:06+02:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/jgit_6.7.0.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -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 <pgt at debian.org>  Wed, 22 May 2024 21:50:25 +0200
+
 plm (2.9.2-2) UNRELEASED; urgency=medium
 
   * Remove constraints unnecessary since buster:


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Martin Quinson <mquinson at debian.org>
 Build-Depends: debhelper-compat (= 12), javahelper, 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


=====================================
debian/patches/jgit_6.7.0.patch
=====================================
@@ -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 <pgt at 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);
+ 	}
+ }


=====================================
debian/patches/series
=====================================
@@ -3,4 +3,4 @@ system-ant-tasks
 no-github
 jython-fixes
 json-simple-3.patch
-
+jgit_6.7.0.patch


=====================================
debian/rules
=====================================
@@ -26,11 +26,28 @@ endif
 %:
 	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 \



View it on GitLab: https://salsa.debian.org/java-team/plm/-/compare/43091e8e60c443a1df33f652ef6b835464c222a0...26c3e1ba38a731b92640a1b232605d847e51c638

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/java-team/plm/-/compare/43091e8e60c443a1df33f652ef6b835464c222a0...26c3e1ba38a731b92640a1b232605d847e51c638
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/20240524/f48b68b1/attachment.htm>