[proj] 01/05: Revert OSX cruft exclusion from repacked upstream tarball.

Bas Couwenberg sebastic at debian.org
Wed Aug 17 08:40:51 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository proj.

commit 0b1adc8a8337f6c3c03e34dc0cae13618d917aae
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Aug 17 10:23:15 2016 +0200

    Revert OSX cruft exclusion from repacked upstream tarball.
    
    RC2 was generated on Ubuntu which doesn't contain the cruft.
    
    This reverts commit cb31b11c965f5b8c8203fc7b3ba6059c251f2b75.
---
 debian/changelog | 7 +++++++
 debian/copyright | 2 --
 debian/watch     | 3 +--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0306f47..8d3ca07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+proj (4.9.3~rc1+ds-1~exp2) UNRELEASED; urgency=medium
+
+  * Revert OSX cruft exclusion from repacked upstream tarball.
+    RC2 was generated on Ubuntu which doesn't contain the cruft.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 17 Aug 2016 10:23:44 +0200
+
 proj (4.9.3~rc1+ds-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.
diff --git a/debian/copyright b/debian/copyright
index 56a2a23..aeae502 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: PROJ.4
 Upstream-Contact: MetaCRS Developers <metacrs at lists.osgeo.org>
 Source: http://download.osgeo.org/proj/
- OSX cruft is excluded from the repacked upstream tarball.
-Files-Excluded: */._*
 
 Files: *
 Comment: Version 4.3.3 was authored by:
diff --git a/debian/watch b/debian/watch
index e42167b..1cfac00 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,6 @@
 version=3
 opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
-uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|b|beta|a|alpha)\d*)$/$1~$2/;s/RC/rc/,\
-repacksuffix=+ds \
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|b|beta|a|alpha)\d*)$/$1~$2/;s/RC/rc/ \
 http://download.osgeo.org/proj/ \
 (?:.*/)?proj[\-\_](\d+[\.\d+]+(?:[a-zA-Z]+\d+)?)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj.git



More information about the Pkg-grass-devel mailing list