r1383 - in /unstable/ffmpeg/debian: ./ patches/001_fixup_version.diff

[siretart at users.alioth.debian.org]

Author: siretart
Date: Tue Aug 26 11:52:45 2008
New Revision: 1383

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1383
Log:
patch version.sh in a way that actualy works

Modified:
    unstable/ffmpeg/debian/   (props changed)
    unstable/ffmpeg/debian/patches/001_fixup_version.diff

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:file-ids (original)
+++ bzr:file-ids Tue Aug 26 11:52:45 2008
@@ -1,3 +1,1 @@
-changelog	1186 at 49b7e9ba-2410-0410-beda-b1d44d574104:unstable%2Fffmpeg%2Fdebian:changelog
 patches/001_fixup_version.diff	001_fixup_version.di-20080825140726-guzk3hpye4piikkm-1
-patches/series	1186 at 49b7e9ba-2410-0410-beda-b1d44d574104:unstable%2Fffmpeg%2Fdebian:patches%2Fseries

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Tue Aug 26 11:52:45 2008
@@ -54,3 +54,4 @@
 89 siretart at tauware.de-20080823084956-itjp7hf0c4j4qk3j
 90 siretart at tauware.de-20080825134515-0uoh3mdcl7d48do1
 91 siretart at tauware.de-20080825140939-lnk0kip7bla0avr5
+92 siretart at tauware.de-20080825144120-bi02eefv3nqvl32s

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Tue Aug 26 11:52:45 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-08-25 16:09:39.927999973 +0200
+timestamp: 2008-08-25 16:41:20.973000050 +0200
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
 	branch-nick: unstable

Modified: unstable/ffmpeg/debian/patches/001_fixup_version.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/001_fixup_version.diff?rev=1383&op=diff
==============================================================================
--- unstable/ffmpeg/debian/patches/001_fixup_version.diff (original)
+++ unstable/ffmpeg/debian/patches/001_fixup_version.diff Tue Aug 26 11:52:45 2008
@@ -1,14 +1,15 @@
 --- a/version.sh
 +++ b/version.sh
-@@ -1,5 +1,11 @@
- #!/bin/sh
+@@ -6,6 +6,12 @@ test $revision || revision=`cd "$1" && g
+ test $revision || revision=`cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null`
+ test $revision && revision=SVN-r$revision
  
 +# check for debian package branch
-+if test -f debian/control; then
-+    debrevision=`dpkg-parsechangelog | awk '/^Version/ {print $2}'`
-+    revision="$debrevision (based on r11872)"
++if test -f "$1"/debian/control; then
++    debrevision=`cd "$1" && dpkg-parsechangelog | awk '/^Version/ {print $2}'`
++    revision="r11872+debian_${debrevision}"
 +fi
 +
- # check for SVN revision number
- revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
- test $revision || revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2`
+ # check for git short hash
+ if ! test $revision; then
+     revision=`cd "$1" && git log -1 --pretty=format:%h`