[Git][debian-gis-team/gdal-grass][experimental] 15 commits: Revert "Update branch in gbp.conf & Vcs-Git URL."

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Fri Apr 22 13:33:15 BST 2022



Bas Couwenberg pushed to branch experimental at Debian GIS Project / gdal-grass


Commits:
441ca0a3 by Bas Couwenberg at 2022-03-14T12:39:43+01:00
Revert "Update branch in gbp.conf & Vcs-Git URL."

This reverts commit ba3064a833e568c77e024bc8b5d86bf7ae9593ff.

- - - - -
36690bdf by Bas Couwenberg at 2022-03-14T12:40:18+01:00
Update upstream source from tag 'upstream/3.4.2'

Update to upstream version '3.4.2'
with Debian dir 43f2c9f53d9b4923b480668deac6d6254e6b9dc4
- - - - -
c077de48 by Bas Couwenberg at 2022-03-14T12:40:18+01:00
New upstream version 3.4.2
- - - - -
6bca8c72 by Bas Couwenberg at 2022-03-14T12:40:37+01:00
New upstream release.

- - - - -
962b09ff by Bas Couwenberg at 2022-03-14T12:59:38+01:00
Revert "Update packaging for GRASS 8.0.1."

This reverts commit a87c3447b69e5b8dd1fca277fa93e0f502fe0099.

- - - - -
b8faeb9f by Bas Couwenberg at 2022-03-14T13:00:23+01:00
Set distribution to unstable.

- - - - -
0192b041 by Bas Couwenberg at 2022-03-20T07:06:49+01:00
Update packaging for GRASS 8.0.1.

- - - - -
29c7814e by Bas Couwenberg at 2022-03-20T07:18:06+01:00
Set distribution to unstable.

- - - - -
9c9f5c1e by Bas Couwenberg at 2022-04-21T20:01:15+02:00
Drop Ubuntu PIE changes.

- - - - -
92925ac9 by Bas Couwenberg at 2022-04-22T13:13:35+02:00
Update branch in gbp.conf & Vcs-Git URL.

- - - - -
db50d9e9 by Bas Couwenberg at 2022-04-22T13:19:31+02:00
Update watch file to match only 3.4.x releases.

- - - - -
bdc369d2 by Bas Couwenberg at 2022-04-22T13:30:54+02:00
New upstream version 3.4.3~rc1
- - - - -
44aa0946 by Bas Couwenberg at 2022-04-22T13:30:55+02:00
Update upstream source from tag 'upstream/3.4.3_rc1'

Update to upstream version '3.4.3~rc1'
with Debian dir 34ab9e23297ae65712f796cd6fdb882d26ca1d62
- - - - -
3a29452c by Bas Couwenberg at 2022-04-22T13:31:23+02:00
New upstream release candidate.

- - - - -
b32ed112 by Bas Couwenberg at 2022-04-22T13:31:38+02:00
Set distribution to experimental.

- - - - -


5 changed files:

- VERSION
- debian/changelog
- debian/control
- debian/rules
- debian/watch


Changes:

=====================================
VERSION
=====================================
@@ -1 +1 @@
-3.4.2
+3.4.3


=====================================
debian/changelog
=====================================
@@ -1,3 +1,25 @@
+libgdal-grass (3.4.3~rc1-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Drop Ubuntu PIE changes.
+  * Update watch file to match only 3.4.x releases.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 22 Apr 2022 13:31:26 +0200
+
+libgdal-grass (3.4.2-2) unstable; urgency=medium
+
+  * Update packaging for GRASS 8.0.1.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 20 Mar 2022 07:17:56 +0100
+
+libgdal-grass (3.4.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Revert GRASS 8 changes.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 14 Mar 2022 13:00:03 +0100
+
 libgdal-grass (3.4.2~rc2-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.


=====================================
debian/control
=====================================
@@ -7,9 +7,8 @@ Priority: optional
 Build-Depends: debhelper-compat (= 12),
                grass (>= 8.0.1),
                grass-dev (>= 8.0.1),
-               libgdal-dev (>= 3.4.2~),
+               libgdal-dev (>= 3.4.3~),
                libpq-dev,
-               lsb-release,
                pkg-config
 Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/gdal-grass


=====================================
debian/rules
=====================================
@@ -10,16 +10,6 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 # Don't link with as-needed to prevent missing libraries
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--no-as-needed
 
-# Disable PIE on Ubuntu where it's still problematic
-VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo yes)
-DISTRIBUTION_RELEASE       := $(shell lsb_release -cs)
-
-ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
-  ifneq (,$(filter $(DISTRIBUTION_RELEASE),xenial bionic))
-    export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
-  endif
-endif
-
 PKGNAME=$(shell grep Package: debian/control | head -1 | cut -d' ' -f2)
 GRASS=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2))
 GRASS_ABI=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2,3 | sed -e 's/RC/-/'))


=====================================
debian/watch
=====================================
@@ -3,5 +3,5 @@ opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/,\
 dirversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/ \
-https://download.osgeo.org/gdal/(\d+\.\d+\.\d+\w*)/ \
+https://download.osgeo.org/gdal/(3\.4\.\d+\w*)/ \
 (?:|.*/)gdal(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)



View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/compare/c450b754938a3f38d280c03e8ab11d449d343a10...b32ed11298fcf4dfef3140341f7c2941fc0143ad

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/compare/c450b754938a3f38d280c03e8ab11d449d343a10...b32ed11298fcf4dfef3140341f7c2941fc0143ad
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/20220422/059655e0/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list