Bug#1034242: unblock: tirex/0.7.0-3

2023-04-15 Thread Sebastiaan Couwenberg

Control: tags -1 - moreinfo

On 4/15/23 18:03, Sebastian Ramacher wrote:

Please remove the moreinfo tag once the package is available in
unstable.


tirex (0.7.0-3) is built & installed on all release architectures.

Kind Regards,

Bas

--
 GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1



Bug#1034242: unblock: tirex/0.7.0-3

2023-04-15 Thread Sebastian Ramacher
Control: tags -1 confirmed moreinfo

On 2023-04-11 10:30:23 +0200, Bas Couwenberg wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian@packages.debian.org
> Usertags: unblock
> X-Debbugs-Cc: ti...@packages.debian.org
> Control: affects -1 + src:tirex
> 
> Please unblock package tirex

Please remove the moreinfo tag once the package is available in
unstable.

Cheers

> 
> It moves the systemd services back to /lib/systemd to fix #1034222.
> 
> [ Reason ]
> Fix service activation by debhelper.
> 
> [ Impact ]
> Services not activated as expected.
> 
> [ Tests ]
> N/A
> 
> [ Risks ]
> Low, leaf package.
> 
> [ Checklist ]
>   [x] all changes are documented in the d/changelog
>   [x] I reviewed all changes and I approve them
>   [x] attach debdiff against the package in testing
> 
> [ Other info ]
> The package has not been uploaded to unstable yet.
> 
> The pending changes in git are also included which we'd rather not have to 
> revert.
> 
> unblock tirex/0.7.0-3

> diff -Nru tirex-0.7.0/debian/changelog tirex-0.7.0/debian/changelog
> --- tirex-0.7.0/debian/changelog  2022-08-03 10:27:51.0 +0200
> +++ tirex-0.7.0/debian/changelog  2023-04-11 10:20:03.0 +0200
> @@ -1,3 +1,14 @@
> +tirex (0.7.0-3) unstable; urgency=medium
> +
> +  * Team upload.
> +  * Add Rules-Requires-Root to control file.
> +  * Update lintian overrides.
> +  * Bump Standards-Version to 4.6.2, no changes.
> +  * Move systemd services to /lib/systemd.
> +(closes: #1034222)
> +
> + -- Bas Couwenberg   Tue, 11 Apr 2023 10:20:03 +0200
> +
>  tirex (0.7.0-2) unstable; urgency=medium
>  
>[ Frederik Ramm ]
> diff -Nru tirex-0.7.0/debian/control tirex-0.7.0/debian/control
> --- tirex-0.7.0/debian/control2022-06-21 07:23:56.0 +0200
> +++ tirex-0.7.0/debian/control2023-01-18 17:21:22.0 +0100
> @@ -9,10 +9,11 @@
> libipc-sharelite-perl,
> libjson-perl,
> libmapnik-dev
> -Standards-Version: 4.6.1
> +Standards-Version: 4.6.2
>  Vcs-Browser: https://salsa.debian.org/debian-gis-team/tirex
>  Vcs-Git: https://salsa.debian.org/debian-gis-team/tirex.git
>  Homepage: https://wiki.openstreetmap.org/wiki/Tirex
> +Rules-Requires-Root: no
>  
>  Package: tirex
>  Section: utils
> diff -Nru tirex-0.7.0/debian/patches/rules-requires-root.patch 
> tirex-0.7.0/debian/patches/rules-requires-root.patch
> --- tirex-0.7.0/debian/patches/rules-requires-root.patch  1970-01-01 
> 01:00:00.0 +0100
> +++ tirex-0.7.0/debian/patches/rules-requires-root.patch  2022-11-29 
> 19:11:38.0 +0100
> @@ -0,0 +1,12 @@
> +Description: Fix FTBFS Rules-Requires-Root: no.
> +Author: Bas Couwenberg 
> +Forwarded: not-needed
> +
> +--- a/Makefile
>  b/Makefile
> +@@ -1,4 +1,4 @@
> +-INSTALLOPTS=-g root -o root
> ++INSTALLOPTS=
> + build: Makefile.perl
> + cd backend-mapnik; $(MAKE) $(MFLAGS)
> + $(MAKE) -f Makefile.perl
> diff -Nru tirex-0.7.0/debian/patches/series tirex-0.7.0/debian/patches/series
> --- tirex-0.7.0/debian/patches/series 2021-10-07 17:46:27.0 +0200
> +++ tirex-0.7.0/debian/patches/series 2022-11-29 19:10:50.0 +0100
> @@ -1 +1,2 @@
>  0001-Make-sure-usr-libexec-directory-extists.patch
> +rules-requires-root.patch
> diff -Nru tirex-0.7.0/debian/rules tirex-0.7.0/debian/rules
> --- tirex-0.7.0/debian/rules  2021-10-08 10:02:58.0 +0200
> +++ tirex-0.7.0/debian/rules  2022-11-29 19:04:47.0 +0100
> @@ -9,7 +9,4 @@
>  %:
>   dh $@ --with apache2
>  
> -override_dh_auto_install:
> - dh_auto_install --destdir=debian/tmp
> -
>  .PHONY: templates
> diff -Nru tirex-0.7.0/debian/tirex.install tirex-0.7.0/debian/tirex.install
> --- tirex-0.7.0/debian/tirex.install  2021-10-07 17:46:27.0 +0200
> +++ tirex-0.7.0/debian/tirex.install  2023-04-11 10:03:09.0 +0200
> @@ -24,7 +24,7 @@
>  debian/etc/tirex/tirex.conf  etc/tirex
>  debian/etc/tirex/renderer/mapnik.confetc/tirex/renderer
>  debian/tmpfiles.d/tirex.conf usr/lib/tmpfiles.d
> -debian/tirex-master.service  usr/lib/systemd/system/
> -debian/tirex-backend-manager.service usr/lib/systemd/system/
> +debian/tirex-master.service  lib/systemd/system/
> +debian/tirex-backend-manager.service lib/systemd/system/
>  usr/libexec/tirex-backend-mapnik
>  usr/libexec/tirex-backend-test
> diff -Nru tirex-0.7.0/debian/tirex.lintian-overrides 
> tirex-0.7.0/debian/tirex.lintian-overrides
> --- tirex-0.7.0/debian/tirex.lintian-overrides2021-10-08 
> 09:39:26.0 +0200
> +++ tirex-0.7.0/debian/tirex.lintian-overrides2022-11-29 
> 19:18:57.0 +0100
> @@ -1,2 +1,6 @@
>  # This package only provides systemd unit files:
>  package-supports-alternative-init-but-no-init.d-script
> +
> +# False positive, lat/lon
> +typo-in-manual-page lon long *
> +


-- 
Sebastian Ramacher



Bug#1034242: unblock: tirex/0.7.0-3

2023-04-11 Thread Bas Couwenberg
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: ti...@packages.debian.org
Control: affects -1 + src:tirex

Please unblock package tirex

It moves the systemd services back to /lib/systemd to fix #1034222.

[ Reason ]
Fix service activation by debhelper.

[ Impact ]
Services not activated as expected.

[ Tests ]
N/A

[ Risks ]
Low, leaf package.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]
The package has not been uploaded to unstable yet.

The pending changes in git are also included which we'd rather not have to 
revert.

unblock tirex/0.7.0-3
diff -Nru tirex-0.7.0/debian/changelog tirex-0.7.0/debian/changelog
--- tirex-0.7.0/debian/changelog2022-08-03 10:27:51.0 +0200
+++ tirex-0.7.0/debian/changelog2023-04-11 10:20:03.0 +0200
@@ -1,3 +1,14 @@
+tirex (0.7.0-3) unstable; urgency=medium
+
+  * Team upload.
+  * Add Rules-Requires-Root to control file.
+  * Update lintian overrides.
+  * Bump Standards-Version to 4.6.2, no changes.
+  * Move systemd services to /lib/systemd.
+(closes: #1034222)
+
+ -- Bas Couwenberg   Tue, 11 Apr 2023 10:20:03 +0200
+
 tirex (0.7.0-2) unstable; urgency=medium
 
   [ Frederik Ramm ]
diff -Nru tirex-0.7.0/debian/control tirex-0.7.0/debian/control
--- tirex-0.7.0/debian/control  2022-06-21 07:23:56.0 +0200
+++ tirex-0.7.0/debian/control  2023-01-18 17:21:22.0 +0100
@@ -9,10 +9,11 @@
libipc-sharelite-perl,
libjson-perl,
libmapnik-dev
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/tirex
 Vcs-Git: https://salsa.debian.org/debian-gis-team/tirex.git
 Homepage: https://wiki.openstreetmap.org/wiki/Tirex
+Rules-Requires-Root: no
 
 Package: tirex
 Section: utils
diff -Nru tirex-0.7.0/debian/patches/rules-requires-root.patch 
tirex-0.7.0/debian/patches/rules-requires-root.patch
--- tirex-0.7.0/debian/patches/rules-requires-root.patch1970-01-01 
01:00:00.0 +0100
+++ tirex-0.7.0/debian/patches/rules-requires-root.patch2022-11-29 
19:11:38.0 +0100
@@ -0,0 +1,12 @@
+Description: Fix FTBFS Rules-Requires-Root: no.
+Author: Bas Couwenberg 
+Forwarded: not-needed
+
+--- a/Makefile
 b/Makefile
+@@ -1,4 +1,4 @@
+-INSTALLOPTS=-g root -o root
++INSTALLOPTS=
+ build: Makefile.perl
+   cd backend-mapnik; $(MAKE) $(MFLAGS)
+   $(MAKE) -f Makefile.perl
diff -Nru tirex-0.7.0/debian/patches/series tirex-0.7.0/debian/patches/series
--- tirex-0.7.0/debian/patches/series   2021-10-07 17:46:27.0 +0200
+++ tirex-0.7.0/debian/patches/series   2022-11-29 19:10:50.0 +0100
@@ -1 +1,2 @@
 0001-Make-sure-usr-libexec-directory-extists.patch
+rules-requires-root.patch
diff -Nru tirex-0.7.0/debian/rules tirex-0.7.0/debian/rules
--- tirex-0.7.0/debian/rules2021-10-08 10:02:58.0 +0200
+++ tirex-0.7.0/debian/rules2022-11-29 19:04:47.0 +0100
@@ -9,7 +9,4 @@
 %:
dh $@ --with apache2
 
-override_dh_auto_install:
-   dh_auto_install --destdir=debian/tmp
-
 .PHONY: templates
diff -Nru tirex-0.7.0/debian/tirex.install tirex-0.7.0/debian/tirex.install
--- tirex-0.7.0/debian/tirex.install2021-10-07 17:46:27.0 +0200
+++ tirex-0.7.0/debian/tirex.install2023-04-11 10:03:09.0 +0200
@@ -24,7 +24,7 @@
 debian/etc/tirex/tirex.conf  etc/tirex
 debian/etc/tirex/renderer/mapnik.confetc/tirex/renderer
 debian/tmpfiles.d/tirex.conf usr/lib/tmpfiles.d
-debian/tirex-master.service  usr/lib/systemd/system/
-debian/tirex-backend-manager.service usr/lib/systemd/system/
+debian/tirex-master.service  lib/systemd/system/
+debian/tirex-backend-manager.service lib/systemd/system/
 usr/libexec/tirex-backend-mapnik
 usr/libexec/tirex-backend-test
diff -Nru tirex-0.7.0/debian/tirex.lintian-overrides 
tirex-0.7.0/debian/tirex.lintian-overrides
--- tirex-0.7.0/debian/tirex.lintian-overrides  2021-10-08 09:39:26.0 
+0200
+++ tirex-0.7.0/debian/tirex.lintian-overrides  2022-11-29 19:18:57.0 
+0100
@@ -1,2 +1,6 @@
 # This package only provides systemd unit files:
 package-supports-alternative-init-but-no-init.d-script
+
+# False positive, lat/lon
+typo-in-manual-page lon long *
+