[Git][debian-gis-team/josm-installer][bookworm-backports] 8 commits: Bump debhelper compat to 13.

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Mon Dec 11 07:25:48 GMT 2023



Bas Couwenberg pushed to branch bookworm-backports at Debian GIS Project / josm-installer


Commits:
64fa7037 by Bas Couwenberg at 2023-06-12T11:18:04+02:00
Bump debhelper compat to 13.

- - - - -
111aab7e by Bas Couwenberg at 2023-08-12T13:55:46+02:00
Use execute_after instead of override in rules file.

- - - - -
697817f3 by Bas Couwenberg at 2023-08-23T16:33:57+02:00
Enable Salsa CI.

- - - - -
242e9554 by Bas Couwenberg at 2023-08-25T17:15:08+02:00
Explicitly enable test-build-twice job.

- - - - -
5fa2e6bd by Bas Couwenberg at 2023-12-06T07:08:46+01:00
Updated linux directory to r18889.

- - - - -
94f3b697 by Bas Couwenberg at 2023-12-06T07:08:59+01:00
Set distribution to unstable.

- - - - -
96b3a664 by Bas Couwenberg at 2023-12-11T08:19:29+01:00
Merge tag '0.0.3+svn18889' into bookworm-backports

releasing package josm-installer version 0.0.3+svn18889

- - - - -
74973462 by Bas Couwenberg at 2023-12-11T08:23:47+01:00
Rebuild for bookworm-backports.

- - - - -


7 changed files:

- + debian/.gitlab-ci.yml
- debian/changelog
- + debian/clean
- debian/control
- debian/rules
- linux/latest/DEBIAN/control
- linux/tested/DEBIAN/control


Changes:

=====================================
debian/.gitlab-ci.yml
=====================================
@@ -0,0 +1,8 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
+
+variables:
+  RELEASE: 'bookworm-backports'
+  SALSA_CI_LINTIAN_SUPPRESS_TAGS: 'bad-distribution-in-changes-file'
+  SALSA_CI_ENABLE_BUILD_PACKAGE_TWICE: 1


=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+josm-installer (0.0.3+svn18889~bpo12+1) bookworm-backports; urgency=medium
+
+  * Rebuild for bookworm-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 11 Dec 2023 08:19:38 +0100
+
+josm-installer (0.0.3+svn18889) unstable; urgency=medium
+
+  * Bump debhelper compat to 13.
+  * Use execute_after instead of override in rules file.
+  * Enable Salsa CI.
+  * Updated linux directory to r18889.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 06 Dec 2023 07:08:47 +0100
+
 josm-installer (0.0.2+svn18699~bpo12+1) bookworm-backports; urgency=medium
 
   * Rebuild for bookworm-backports.


=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+*.1


=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Bas Couwenberg <sebastic at debian.org>
 Section: contrib/utils
 Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
                python3,
                python3-flake8,
                shellcheck,


=====================================
debian/rules
=====================================
@@ -9,9 +9,6 @@ MANPAGES := $(wildcard $(CURDIR)/*.*.xml)
 %:
 	dh $@
 
-override_dh_clean:
-	dh_clean *.1
-
 override_dh_auto_build:
 	# Create man page from DocBook XML
 	for x in $(MANPAGES) ; do \
@@ -25,9 +22,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	shellcheck *.sh
 endif
 
-override_dh_auto_install:
-	dh_auto_install
-
+execute_after_dh_auto_install:
 	install -d $(CURDIR)/debian/josm-installer/usr/bin
 	install -m 755 $(CURDIR)/josm $(CURDIR)/debian/josm-installer/usr/bin/josm
 	install -m 755 $(CURDIR)/josm-installer.py $(CURDIR)/debian/josm-installer/usr/bin/josm-installer


=====================================
linux/latest/DEBIAN/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: josm developers <josm-dev at openstreetmap.org>
 Homepage: https://josm.openstreetmap.de
 Priority: extra
 Architecture: all
-Depends: openjdk-11-jre | java11-runtime | openjdk-8-jre | java8-runtime,
+Depends: default-jre (>= 2:1.17) | java8-runtime,
          proj-data, fonts-noto, openjfx
 Description: Editor for OpenStreetMap (daily development snapshot)
  JOSM is an editor for OpenStreetMap (OSM) written in Java.


=====================================
linux/tested/DEBIAN/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: josm developers <josm-dev at openstreetmap.org>
 Homepage: https://josm.openstreetmap.de
 Priority: extra
 Architecture: all
-Depends: openjdk-11-jre | java11-runtime | openjdk-8-jre | java8-runtime,
+Depends: default-jre (>= 2:1.17) | java8-runtime,
          proj-data, fonts-noto, openjfx
 Conflicts: josm-plugins
 Replaces: josm-plugins



View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/compare/b5d2d3f696c5ae08bd1d9e7e8073cb6b7e07b6af...74973462c08d24e812fb98d4bfb445be77049088

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/compare/b5d2d3f696c5ae08bd1d9e7e8073cb6b7e07b6af...74973462c08d24e812fb98d4bfb445be77049088
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-grass-devel/attachments/20231211/15594934/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list