[Git][debian-gis-team/tippecanoe][master] Cleanup packaging.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / tippecanoe


Commits:
866e2d1c by Bas Couwenberg at 2024-01-26T12:57:54+01:00
Cleanup packaging.

- - - - -


4 changed files:

- debian/copyright
- − debian/get-orig-source
- debian/rules
- debian/watch


Changes:

=====================================
debian/copyright
=====================================
@@ -8,11 +8,6 @@ Copyright: 2022, Protomaps LLC
            2014, Mapbox Inc.
 License: BSD-2-Clause
 
-Files: debian/*
-Copyright: 2023, Anthony Fok <foka at debian.org>
-License: BSD-2-Clause
-Comment: Debian packaging is licensed under the same terms as upstream
-
 Files: catch/*
 Copyright: 2012, Two Blue Cubes Ltd.
 License: BSL-1.0
@@ -68,6 +63,11 @@ Files: visvalingam.cpp
 Copyright: 2017, Paul Mach
 License: Expat
 
+Files: debian/*
+Copyright: 2023, Anthony Fok <foka at debian.org>
+License: BSD-2-Clause
+Comment: Debian packaging is licensed under the same terms as upstream
+
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.


=====================================
debian/get-orig-source deleted
=====================================
@@ -1,45 +0,0 @@
-#!/bin/sh
-# if you need to repack for whatever reason you can
-# use this script via uscan or directly
-#
-# FIXME: currently the code is not conform to Debian Policy
-#        http://www.debian.org/doc/debian-policy/ch-source.html
-#        "get-orig-source (optional)"
-#        This target may be invoked in any directory, ...
-# --> currently it is assumed the script is called in the
-#     source directory featuring the debian/ dir
-
-COMPRESS=xz
-
-set -e
-NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-
-if ! echo $@ | grep -q upstream-version ; then
-    VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
-    uscan --force-download
-else
-    VERSION=`echo $@ | sed "s?^.*--upstream-version \([0-9.]\+\) .*${NAME}.*?\1?"`
-    if echo "$VERSION" | grep -q "upstream-version" ; then
-        echo "Unable to parse version number"
-        exit
-    fi
-fi
-
-TARDIR=${NAME}-${VERSION}
-mkdir -p ../tarballs
-cd ../tarballs
-# need to clean up the tarballs dir first because upstream tarball might
-# contain a directory with unpredictable name
-rm -rf *
-tar -xaf ../${TARDIR}.tar.gz
-
-UPSTREAMTARDIR=`find . -mindepth 1 -maxdepth 1 -type d`
-if [ "${UPSTREAMTARDIR}" != "${TARDIR}" ] ; then
-    mv "${UPSTREAMTARDIR}" "${TARDIR}"
-fi
-
-# Remove useless binaries
-# ... do something which needs to be done ...
-
-GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -caf "$NAME"_"$VERSION".orig.tar.${COMPRESS} "${TARDIR}"
-rm -rf ${TARDIR}


=====================================
debian/rules
=====================================
@@ -2,16 +2,8 @@
 
 # DH_VERBOSE := 1
 
-# some helpful variables - uncomment them if needed
-# shamelessly stolen from http://jmtd.net/log/awk/
-#DEBVERS        := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-#VERSION        := $(shell echo '$(DEBVERS)' | sed -e 's/^[0-9]*://' -e 's/-.*//')
-#DEBFLAVOR      := $(shell dpkg-parsechangelog | awk '/^Distribution:/ {print $$2}')
-#DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
-#DEBIAN_BRANCH  := $(shell awk 'BEGIN{FS="[= ]+"} /debian-branch/ {print $$2}' debian/gbp.conf)
-#GIT_TAG        := $(subst ~,_,$(VERSION))
-
 export DEB_BUILD_MAINT_OPTIONS := hardening=+all
+
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
@@ -22,6 +14,3 @@ export PREFIX := debian/tippecanoe/usr
 
 override_dh_auto_test:
 	-dh_auto_test
-
-#get-orig-source:
-#	. debian/get-orig-source


=====================================
debian/watch
=====================================
@@ -1,4 +1,8 @@
 version=4
-opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%,\
-      uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/$1~$2$3/" \
-  https://github.com/felt/tippecanoe/tags .*/v?(\d\S*)\.tar\.gz debian
+opts=\
+dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/_/./g;s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/;s/RC/rc/,\
+filenamemangle=s/(?:.*?\/)?(?:rel|v|tippecanoe)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/tippecanoe-$1.$2/,\
+repacksuffix=+ds \
+https://github.com/felt/tippecanoe/tags \
+(?:.*?/archive/(?:.*?/)?)?(?:rel|v|tippecanoe)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))



View it on GitLab: https://salsa.debian.org/debian-gis-team/tippecanoe/-/commit/866e2d1cdbd26ef1a275c86c2f15c85399081c35

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/tippecanoe/-/commit/866e2d1cdbd26ef1a275c86c2f15c85399081c35
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/20240126/31dcade0/attachment-0001.htm>