[Git][debian-gis-team/libapache2-mod-tile][master] 2 commits: Remove get-orig-source target from rules.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / libapache2-mod-tile


Commits:
05674db5 by Bas Couwenberg at 2020-09-28T12:02:53+02:00
Remove get-orig-source target from rules.

- - - - -
ac618278 by Bas Couwenberg at 2020-09-28T12:03:39+02:00
Update get-orig-source script for more robust git snapshots.

- - - - -


3 changed files:

- debian/changelog
- debian/get-orig-source
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -27,6 +27,8 @@ libapache2-mod-tile (0.5-1) UNRELEASED; urgency=medium
     - Drop --parallel option, enabled by default
     - Don't explicitly enable autoreconf, enabled by default
     - Drop dh-autoreconf build dependency
+  * Remove get-orig-source target from rules.
+  * Update get-orig-source script for more robust git snapshots.
 
   [ Felix Delattre ]
   * Fixed ODbL formatting in copyright file.


=====================================
debian/get-orig-source
=====================================
@@ -2,12 +2,19 @@
 
 REMOTE=upstream
 BRANCH=${REMOTE}/master
-PACKAGE=$(dpkg-parsechangelog | grep ^Source: | awk '{print $2}')
-VERSION=$(dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-[^-]*/\1/p')
 
 if [ $(git remote show ${REMOTE} | wc -l) -eq 0 ]; then
-	git remote add ${REMOTE} https://github.com/openstreetmap/mod_tile.git
+    git remote add ${REMOTE} https://github.com/openstreetmap/mod_tile.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})")
+
+VERSION="${VERSION}+git${DATE}-${COMMIT}"
+
 git archive --format=tar.gz --prefix=${PACKAGE}-${VERSION}/ -o ../${PACKAGE}_${VERSION}.orig.tar.gz ${BRANCH}


=====================================
debian/rules
=====================================
@@ -10,6 +10,3 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 override_dh_auto_test:
 	dh_auto_test || echo "Ignoring test failures"
-
-get-orig-source:
-	. debian/get-orig-source



View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/compare/7741df669a2d933f13961de1719eadc0743f4575...ac618278d93ce4015c4c0175065224134a804e15

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/compare/7741df669a2d933f13961de1719eadc0743f4575...ac618278d93ce4015c4c0175065224134a804e15
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/20200928/f406853f/attachment-0001.html>