ǝɹʇʇɐʃǝ◖ xıʃǝɟ pushed to branch master at Debian GIS Project / tirex
Commits: 41398512 by Felix Delattre at 2021-09-03T17:40:31+00:00 Adjust copyright information. - - - - - 20856e3e by Felix Delattre at 2021-09-03T17:40:36+00:00 Remove get-orig-source in favour of watch. - - - - - aff764ef by Felix Delattre at 2021-09-03T17:40:36+00:00 Rename logrotate config file. - - - - - e7c5bc16 by Felix Delattre at 2021-09-03T17:40:36+00:00 Improve details in control file. - - - - - 5e0abd3d by Felix Delattre at 2021-09-03T17:40:36+00:00 Adjust changelog. - - - - - c844323d by Felix Delattre at 2021-09-03T17:40:36+00:00 Stop ignoring test runs. - - - - - 619d01b6 by Felix Delattre at 2021-09-03T17:40:36+00:00 Don't forward not-needed patch to upstream. - - - - - 3c25f6b6 by Felix Delattre at 2021-09-03T17:42:00+00:00 Make single instance build in usual directory. - - - - - 8 changed files: - debian/changelog - debian/control - debian/copyright - debian/etc/logrotate.d/tirex-master → debian/etc/logrotate.d/tirex - − debian/get-orig-source - debian/patches/0002-Disconnect-configuration-overlap-between-build-and-d.patch - debian/rules - debian/tirex.install Changes: ===================================== debian/changelog ===================================== @@ -1,8 +1,8 @@ tirex (0.6.4-1~exp1) experimental; urgency=medium [ Felix Delattre ] + * Initial package (Closes: #968676) * Import upstream version 0.6.3 - * Targeted packaging to debian archive. * Adjusted copyright information. * Use tirex package. * Sort and review dependencies. @@ -18,11 +18,10 @@ tirex (0.6.4-1~exp1) experimental; urgency=medium * Revisit configuration. * Add patch to avoid simple building error. * Disconnect logrotate configuration overlap. - * Initial package (Closes: #968676) [ Bas Couwenberg ] * Bump watch file version to 4. * Bump Standards-Version to 4.5.1, no changes. * Update watch file for GitHub URL changes. - -- Felix Delattre <[email protected]> Sun, 29 Aug 2021 17:13:23 +0000 + -- Felix Delattre <[email protected]> Fri, 03 Sep 2021 16:25:42 +0000 ===================================== debian/control ===================================== @@ -8,11 +8,11 @@ Build-Depends: debhelper (>= 10~), libboost-program-options-dev, libipc-sharelite-perl, libjson-perl, - libmapnik-dev, + libmapnik-dev Standards-Version: 4.5.1 Vcs-Browser: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile Vcs-Git: https://salsa.debian.org/debian-gis-team/tirex.git -Homepage: http://wiki.openstreetmap.org/wiki/Tirex +Homepage: https://wiki.openstreetmap.org/wiki/Tirex Package: tirex Section: utils @@ -24,7 +24,7 @@ Depends: adduser, libipc-sharelite-perl, ${misc:Depends}, ${perl:Depends}, - ${shlibs:Depends}, + ${shlibs:Depends} Recommends: ${misc:Recommends} Conflicts: renderd, Description: Daemon that renders raster map tile using different backends ===================================== debian/copyright ===================================== @@ -4,10 +4,16 @@ Upstream-Contact: Frederik Ramm <[email protected]> Source: https://github.com/openstreetmap/tirex Files: * -Copyright: 2010-2021, Frederik Ramm <[email protected]> - 2010-2021, Jochen Topf <[email protected]> +Copyright: 2010, 2019-2020, Frederik Ramm <[email protected]> + 2010-2011, Jochen Topf <[email protected]> + 2012, Sven Geggus <[email protected]> License: GPL-2+ +Files: utils/analyze_postgis_log.pl +Copyright: 2010-2016, Frederik Ramm <[email protected]> +License: Public-Domain + "This file is explicitly placed in the public domain" + Files: debian/* Copyright: 2010-2020, Frederik Ramm <[email protected]> 2020-2021, Felix Delattre <[email protected]> ===================================== debian/etc/logrotate.d/tirex-master → debian/etc/logrotate.d/tirex ===================================== ===================================== debian/get-orig-source deleted ===================================== @@ -1,18 +0,0 @@ -#!/bin/bash - -REMOTE=upstream -BRANCH=${REMOTE}/master - -if [ $(git remote show ${REMOTE} | wc -l) -eq 0 ]; then - git remote add ${REMOTE} https://github.com/openstreetmap/tirex.git -fi - -git fetch ${REMOTE} --no-tags - -PACKAGE=$(dpkg-parsechangelog -S Source) -VERSION=$(dpkg-parsechangelog -S Version | sed -e 's/-[^-]*$//' | sed -e 's/^[0-9]*://' | sed -e 's/^[0-9]*://' | sed -e 's/\+.*//') - -COMMIT=$(git log -n1 --format=format:%h ${BRANCH}) -DATE=$(date +%Y%m%d --date="@$(git log -n1 --format=format:%ct ${BRANCH})") - -git archive --format=tar.gz --prefix=${PACKAGE}-${VERSION}/ -o ../${PACKAGE}_${VERSION}.orig.tar.gz ${BRANCH} ===================================== debian/patches/0002-Disconnect-configuration-overlap-between-build-and-d.patch ===================================== @@ -1,8 +1,7 @@ From: Felix Delattre <[email protected]> Date: Sun, 29 Aug 2021 13:26:33 +0000 Subject: Disconnect configuration overlap between build and debian packaging -Origin: https://github.com/openstreetmap/tirex/pull/34/commits/ae3b7495083a942b4196e435759054d77721164e -Bug: https://github.com/openstreetmap/tirex/pull/34 +Forwarded: not-needed --- Makefile | 2 -- ===================================== debian/rules ===================================== @@ -8,5 +8,5 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: dh $@ --with apache2 -override_dh_auto_test: - dh_auto_test || echo "Ignoring test failures" +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp ===================================== debian/tirex.install ===================================== @@ -18,7 +18,7 @@ usr/share/man/man1/tirex-tiledir-check.1 usr/share/man/man1/tirex-tiledir-stat.1 usr/share/man/man3 usr/share/perl5 -debian/etc/logrotate.d/tirex-master etc/logrotate.d/tirex-master +debian/etc/logrotate.d/tirex etc/logrotate.d/tirex debian/etc/tirex/renderer/test.conf etc/tirex/renderer debian/etc/tirex/renderer/test/checkerboard.conf etc/tirex/renderer/test debian/etc/tirex/tirex.conf etc/tirex @@ -28,4 +28,3 @@ debian/tirex-master.service lib/systemd/system/ debian/tirex-backend-manager.service lib/systemd/system/ usr/lib/tirex/backends/mapnik usr/libexec/tirex/backends usr/lib/tirex/backends/test usr/libexec/tirex/backends - View it on GitLab: https://salsa.debian.org/debian-gis-team/tirex/-/compare/bbd6a78f4783c8c3e722683d58e8119071890a57...3c25f6b69fe0736916661914c7a70f49e22841b1 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/tirex/-/compare/bbd6a78f4783c8c3e722683d58e8119071890a57...3c25f6b69fe0736916661914c7a70f49e22841b1 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
