[Git][java-team/plm][master] 8 commits: Trim trailing whitespace.

Martin Quinson gitlab at salsa.debian.org
Sun May 17 20:26:23 BST 2020 


Martin Quinson pushed to branch master at Debian Java Maintainers / plm


Commits:
ec19127c by Martin Quinson at 2020-05-17T21:22:07+02:00
Trim trailing whitespace.

Fixes: lintian: file-contains-trailing-whitespace
See-also: https://lintian.debian.org/tags/file-contains-trailing-whitespace.html

- - - - -
8df3ca68 by Martin Quinson at 2020-05-17T21:22:16+02:00
Don't specify --with=quilt, since package uses '3.0 (quilt)' source format.

Fixes: lintian: dh-quilt-addon-but-quilt-source-format
See-also: https://lintian.debian.org/tags/dh-quilt-addon-but-quilt-source-format.html

- - - - -
52317cc8 by Martin Quinson at 2020-05-17T21:22:16+02:00
debian/control: Add Vcs-Browser field

Fixes: lintian: missing-vcs-browser-field
See-also: https://lintian.debian.org/tags/missing-vcs-browser-field.html

- - - - -
371615f2 by Martin Quinson at 2020-05-17T21:22:17+02:00
Bump debhelper from deprecated 8 to 12.

Fixes: lintian: package-uses-deprecated-debhelper-compat-version
See-also: https://lintian.debian.org/tags/package-uses-deprecated-debhelper-compat-version.html

- - - - -
db382416 by Martin Quinson at 2020-05-17T21:22:17+02:00
Set debhelper-compat version in Build-Depends.

Fixes: lintian: uses-debhelper-compat-file
See-also: https://lintian.debian.org/tags/uses-debhelper-compat-file.html

- - - - -
2e6b416b by Martin Quinson at 2020-05-17T21:22:17+02:00
Change priority extra to priority optional.

Fixes: lintian: priority-extra-is-replaced-by-priority-optional
See-also: https://lintian.debian.org/tags/priority-extra-is-replaced-by-priority-optional.html

- - - - -
acef05b7 by Martin Quinson at 2020-05-17T21:25:02+02:00
Set upstream metadata fields: Bug-Database, Bug-Submit.

Fixes: lintian: upstream-metadata-file-is-missing
See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html


Fixes: lintian: upstream-metadata-missing-bug-tracking
See-also: https://lintian.debian.org/tags/upstream-metadata-missing-bug-tracking.html

- - - - -
32bef49b by Martin Quinson at 2020-05-17T21:25:03+02:00
Fix field name case in debian/copyright (Upstream-name => Upstream-Name).
- - - - -


6 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/rules
- + debian/upstream/metadata


Changes:

=====================================
debian/changelog
=====================================
@@ -7,6 +7,16 @@ plm (2.6+repack-4) UNRELEASED; urgency=medium
   [ Martin Quinson ]
   * Point vcs-git to salsa, and update upstream homepage.
   * Java 7 was hardcoded in the launcher script :(
+  * Trim trailing whitespace.
+  * Don't specify --with=quilt, since package uses '3.0 (quilt)' source
+    format.
+  * debian/control: Add Vcs-Browser field
+  * Bump debhelper from deprecated 8 to 12.
+  * Set debhelper-compat version in Build-Depends.
+  * Change priority extra to priority optional.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit.
+  * Fix field name case in debian/copyright (Upstream-name => Upstream-
+    Name).
 
  -- Martin Quinson <mquinson at debian.org>  Sun, 17 May 2020 08:37:53 +0200
 
@@ -36,7 +46,7 @@ plm (2.6+repack-1) unstable; urgency=medium
     - New lesson on Hanoi variations, on recursive decomposition
     - Various improvements to the pedagogical content and bug fixes
 
-  * Enable scala teaching, now that Scala 2.11 is in Debian 
+  * Enable scala teaching, now that Scala 2.11 is in Debian
     (Fix: #809482) Thanks Rogério Brito for the reminder.
   * Use ant instead of jh_build, that doesn't like our scala code.
 
@@ -44,7 +54,7 @@ plm (2.6+repack-1) unstable; urgency=medium
 
 plm (2.4.11+repack-2) unstable; urgency=medium
 
-  * Specify to jh_build that javac will encounter UTF-8 files 
+  * Specify to jh_build that javac will encounter UTF-8 files
     (Closes: #768732) Thanks to L. Nussbaum for the report and fix
   * Update Standards-Version to 3.9.6 (no change needed)
   * Remove Scala from package description and rules (Closes: #722148)
@@ -137,7 +147,7 @@ plm (2.2.1+repack-1) unstable; urgency=low
 
 plm (2.2+repack-1) unstable; urgency=low
 
-  * New upstream release: 
+  * New upstream release:
     - the software was renamed from JLM to PLM.
     - Scala can now be used to solve the exercises
     - Two new lessons: recreative applications of sorting,
@@ -152,7 +162,7 @@ plm (2.2+repack-1) unstable; urgency=low
 
 jlm (2.0+repack-1) unstable; urgency=low
 
-  * New upstream release. 
+  * New upstream release.
     - Refresh our patches.
   * d/p/system-ant-tasks: use system jarfiles for ant tasks definitions
   * d/p/review-french: integrate a post-release upstream patch that


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-8


=====================================
debian/control
=====================================
@@ -1,8 +1,8 @@
 Source: plm
 Section: java
-Priority: extra
+Priority: optional
 Maintainer: Martin Quinson <mquinson at debian.org>
-Build-Depends: debhelper (>> 8), javahelper (>= 0.32), ant, quilt
+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,
   jython, libgettext-ant-tasks-java, imagemagick,
@@ -10,20 +10,21 @@ Build-Depends-Indep: default-jdk, scala, libmiglayout-java, librsyntaxtextarea-j
 Standards-Version: 3.9.6
 Vcs-Git: https://salsa.debian.org/java-team/plm.git
 Homepage: http://people.irisa.fr/Martin.Quinson/Teaching/PLM/
+Vcs-Browser: https://salsa.debian.org/java-team/plm
 
 Package: plm
 Architecture: all
 Depends: java-wrappers, ${java:Depends}, ${misc:Depends}, libhttpmime-java,
-  default-jdk, jruby, jython, 
+  default-jdk, jruby, jython,
 Recommends: ${java:Recommends}
 Description: Programming exerciser in Java, Python, Scala and others
  The Programmer's Learning Machine (PLM) is a free cross-platform programming
- exerciser. It lets you explore various concepts of programming through 
- over 200 interactive exercises, that you can solve in either Java, 
+ exerciser. It lets you explore various concepts of programming through
+ over 200 interactive exercises, that you can solve in either Java,
  Python or Scala.
  .
  The PLM interface and content is thoughtfully translated to English,
- French and Brazilian; Other translations may be added in the future. 
+ French and Brazilian; Other translations may be added in the future.
  .
  The following concepts are included in this package:
  .


=====================================
debian/copyright
=====================================
@@ -1,13 +1,13 @@
 Format:
  http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
-Upstream-name: plm 
 Upstream-contact: Martin Quinson and Gerald Oster (first.last at loria.fr)
 Source: https://github.com/oster/JLM
+Upstream-Name: plm
 
 Files: *
 Copyright: Copyright 2008-2013 the PLM team
 License: GPL-3
-  
+
 Files: src/lessons/*
 Copyright: Copyright 2008-2013 the PLM team
 License: CC-BY-SA-3.0


=====================================
debian/rules
=====================================
@@ -24,7 +24,7 @@ JSON_EXCEPTION = DeserializationException
 endif
 
 %:
-	dh  $@  --with javahelper --with quilt
+	dh $@   --with javahelper
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -58,7 +58,7 @@ override_dh_auto_install:
 	# desktop
 	install -D -m 644 debian/plm.desktop $(DESTDIR)/usr/share/applications/plm.desktop
 		
-	# wrapper script 
+	# wrapper script
 	install -d -m 755 $(DESTDIR)/usr/bin
 	cp debian/plm.sh $(DESTDIR)/usr/bin/plm
 	chmod 755 $(DESTDIR)/usr/bin/plm
@@ -69,7 +69,7 @@ wrkdir:=$(shell pwd)
 
 get-orig-source:
 	rm -f ${wrkdir}/../plm_${version}+repack.orig.tar.gz
-	rm -f ${wrkdir}/../plm_${version}.orig.tar.gz 
+	rm -f ${wrkdir}/../plm_${version}.orig.tar.gz
 	uscan --verbose --force-download && cp ../${version}.tar.gz ${tmpdir} || true
 	set +ex; cd ${tmpdir} && \
 	    tar xf ${version}.tar.gz && rm -f ${version}.tar.gz && \


=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1,3 @@
+---
+Bug-Database: https://github.com/oster/PLM/issues
+Bug-Submit: https://github.com/oster/PLM/issues/new



View it on GitLab: https://salsa.debian.org/java-team/plm/-/compare/3dda4e484ca2bd91850beceb66b1bdaab81a54a3...32bef49b258523879eda5edc16f87506fbe3695c

-- 
View it on GitLab: https://salsa.debian.org/java-team/plm/-/compare/3dda4e484ca2bd91850beceb66b1bdaab81a54a3...32bef49b258523879eda5edc16f87506fbe3695c
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/20200517/432daa4c/attachment.html>

More information about the pkg-java-commits mailing list