[rbdoom3bfg] 01/01: Fix get-orig-target -- order of version components were swapped; and prepare for relase

[Tobias Frost]

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

tobi pushed a commit to branch master
in repository rbdoom3bfg.

commit 138f263c33ae4893a5eeced90f3c1c30c0d83a41
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Sat Jul 11 09:29:16 2015 +0200

    Fix get-orig-target -- order of version components were swapped; and prepare for relase
---
 debian/changelog | 5 +++--
 debian/rules     | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef38400..3f01d29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-rbdoom3bfg (1.0.3+repack1+git20150625-1) UNRELEASED; urgency=medium
+rbdoom3bfg (1.0.3+repack1+git20150625-1) unstable; urgency=medium
 
   * New uptream git snapshot.
   * Refreshing/Removing patches:
@@ -7,8 +7,9 @@ rbdoom3bfg (1.0.3+repack1+git20150625-1) UNRELEASED; urgency=medium
    - 80-disable-cpu-features.patch refreshed, almost applied upstream completly
    - 82-enable-hurd-kfreebsd.patch removed, applied upstream
   * Work towards reprdoucible builds
+  * Fix get-orig-target to produce the right version string
 
- -- Tobias Frost <tobi at debian.org>  Sat, 04 Jul 2015 10:09:40 +0200
+ -- Tobias Frost <tobi at debian.org>  Sat, 11 Jul 2015 09:32:44 +0200
 
 rbdoom3bfg (1.0.3+repack1-5) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 744a635..b108c12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,8 +39,8 @@ override_dh_installchangelogs:
 UURL =  https://github.com/RobertBeckebans/RBDOOM-3-BFG.git
 PKD   = $(abspath $(dir $(MAKEFILE_LIST)))
 PKG   = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
-VER  ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog  -SVersion | sed -e s/^.*git// -e s/+repack// | cut -d- -f1 )
-DTYPE = +repack
+VER  ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog  -SVersion | sed -e s/^.*git// | cut -d- -f1 )
+DTYPE = +repack1
 UPSVER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | cut -d+ -f1)
 
 ## from: https://wiki.debian.org/onlyjob/get-orig-source
@@ -73,5 +73,5 @@ $(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz:
 	&& $(RM) -r .git .git*
 	@echo "# Packing..."
 	find -L "$(PKG)-$(UPSVER)+git$(VER)" -xdev -type f -print | sort \
-	| XZ_OPT="-6v" tar -caf "$(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
+	| XZ_OPT="-6v" tar -caf "$(PKG)_$(UPSVER)$(DTYPE)+git$(VER).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
 	&& $(RM) -r "$(PKG)-$(UPSVER)+git$(VER)"

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