r1382 - in /unstable/ffmpeg/debian: ./ changelog patches/001_fixup_version.diff patches/series

[siretart at users.alioth.debian.org]

Author: siretart
Date: Tue Aug 26 11:52:43 2008
New Revision: 1382

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1382
Log:
make ffmpeg output a proper version number. (Closes: #496133, #483923)

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

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:file-ids (original)
+++ bzr:file-ids Tue Aug 26 11:52:43 2008
@@ -1,1 +1,3 @@
-confflags	confflags-20080630125322-7rg1ieetyenhgll4-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:43 2008
@@ -53,3 +53,4 @@
 88 siretart at tauware.de-20080717060115-8bo7a4zal3hhlpin
 89 siretart at tauware.de-20080823084956-itjp7hf0c4j4qk3j
 90 siretart at tauware.de-20080825134515-0uoh3mdcl7d48do1
+91 siretart at tauware.de-20080825140939-lnk0kip7bla0avr5

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

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1382&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Tue Aug 26 11:52:43 2008
@@ -1,6 +1,7 @@
 ffmpeg-debian (0.svn20080206-12) unstable; urgency=low
 
   * enable vhook in all flavors. (Closes: #490272, LP: #260296)
+  * make ffmpeg output a proper version number. (Closes: #496133, #483923)
 
  -- Reinhard Tartler <siretart at tauware.de>  Sat, 23 Aug 2008 10:49:10 +0200
 

Added: 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=1382&op=file
==============================================================================
--- unstable/ffmpeg/debian/patches/001_fixup_version.diff (added)
+++ unstable/ffmpeg/debian/patches/001_fixup_version.diff Tue Aug 26 11:52:43 2008
@@ -1,0 +1,14 @@
+--- a/version.sh
++++ b/version.sh
+@@ -1,5 +1,11 @@
+ #!/bin/sh
+ 
++# check for debian package branch
++if test -f debian/control; then
++    debrevision=`dpkg-parsechangelog | awk '/^Version/ {print $2}'`
++    revision="$debrevision (based on r11872)"
++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`

Modified: unstable/ffmpeg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/series?rev=1382&op=diff
==============================================================================
--- unstable/ffmpeg/debian/patches/series (original)
+++ unstable/ffmpeg/debian/patches/series Tue Aug 26 11:52:43 2008
@@ -1,3 +1,4 @@
+001_fixup_version.diff
 010_fix_ftbfs_hppa.diff
 10_fix_kfreebsd_libx11_linkage.diff
 010_proper_rpath.diff