r1390 - in /unstable/ffmpeg-debian/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Aug 26 12:39:17 2008
New Revision: 1390

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1390
Log:
Tweak sed versions regexps to deal with epochs and upstream revisions with
dashes and be generally stricter.

Modified:
    unstable/ffmpeg-debian/debian/changelog
    unstable/ffmpeg-debian/debian/rules

Modified: unstable/ffmpeg-debian/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/changelog?rev=1390&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/changelog (original)
+++ unstable/ffmpeg-debian/debian/changelog Tue Aug 26 12:39:17 2008
@@ -1,3 +1,10 @@
+ffmpeg-debian (0.svn20080206-13) UNRELEASED; urgency=low
+
+  * Tweak sed versions regexps to deal with epochs and upstream revisions with
+    dashes and be generally stricter.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 26 Aug 2008 14:38:19 +0200
+
 ffmpeg-debian (0.svn20080206-12) unstable; urgency=low
 
   * enable vhook in all flavors. (Closes: #490272, LP: #260296)

Modified: unstable/ffmpeg-debian/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/rules?rev=1390&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/rules (original)
+++ unstable/ffmpeg-debian/debian/rules Tue Aug 26 12:39:17 2008
@@ -4,9 +4,9 @@
 
 #export DH_VERBOSE=1
 
-DEB_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
-SRC_VERSION := $(shell echo $(DEB_VERSION) | cut -d '-' -f 1)
-SVN_VERSION := $(shell echo $(SRC_VERSION) | sed -ne 's/^[0-9]\.[a-z]*//p')
+DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
+SRC_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
+SVN_VERSION := $(shell echo $(SRC_VERSION) | sed -nr 's/^[0-9.:-]+\.svn([0-9]+)$$/\1/p')
 
 LIBS := libavutil libavcodec libpostproc libavformat libavdevice libswscale