[Pkg-virtualbox-commits] [kbuild] 05/07: Fix get-import-orig script

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository kbuild.

commit efb1b7cb3b405b94d451d6884ec77cbaf263e558
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Jan 15 18:37:17 2015 +0100

    Fix get-import-orig script
---
 debian/changelog | 3 ++-
 debian/rules     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0d5151..796b9e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kbuild (1:0.1.9998svn2745+dfsg-1) UNRELEASED; urgency=medium
 
-  * New upstream release.
+  * New upstream snapshot, patch refresh.
+  * Fix get-orig-source script, to avoid the epoch bump.
   [ Logan Rosen ]
   * debian/patches/12_arm64.diff: Add arm64 support to fix FTBFS.
     (Closes: #759457)
diff --git a/debian/rules b/debian/rules
index 55e173d..3e4d86c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p')
+UPSTREAM_VERSION := $(shell dpkg-parsechangelog -SVersion| cut -d ":" -f 2 |cut -d "-" -f 1)
 
 YACC      := YACC=/usr/bin/byacc
 BOOTSTRAP := ASH=/bin/bash ECHO=/bin/echo MKDIR=/bin/mkdir CP=/bin/cp \
@@ -37,7 +37,7 @@ override_dh_auto_clean:
 	( cd src/sed/po; rm -f Makevars.template remove-potcdate.sin )
 
 get-orig-info:
-	svn info $(SVNROOT)
+	svn info $(SVNROOT) | grep "Last Changed Rev:" | cut -d' ' -f4
 
 get-orig-source:
 	sh debian/orig-tar.sh $(SVNROOT) $(UPSTREAM_VERSION) $(REVISION)

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