[SCM] FFmpeg packaging branch, master, updated. debian/0.svn20090303-1-28-geb4e01e

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat May 2 07:40:25 UTC 2009


The following commit has been merged in the master branch:
commit 0aec4e9edeb0d49d03e2e9e9a4827fea48c48973
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 26 22:31:17 2009 +0200

    remove debian/005_release_branch_changes.diff
    
    not necessary anymore

diff --git a/debian/patches/005_release_branch_changes.diff b/debian/patches/005_release_branch_changes.diff
deleted file mode 100644
index 465b598..0000000
--- a/debian/patches/005_release_branch_changes.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-This patch contains the changes done in the release branch.
-The patch was generated with the following command:
-
-svn diff -r{20090303} svn://svn.mplayerhq.hu/ffmpeg/branches/0.5
-
-It can be dropped on the next upstream upgrade
-
---- a/version.sh
-+++ b/version.sh
-@@ -1,20 +1,6 @@
- #!/bin/sh
- 
--# check for SVN revision number
--revision=$(cat snapshot_version 2> /dev/null)
--test $revision || 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)
--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 git short hash
--if ! test $revision; then
--    revision=$(cd "$1" && git log -1 --pretty=format:%h)
--    test $revision && revision=git-$revision
--fi
--
--# no version number found
--test $revision || revision=UNKNOWN
-+revision=0.5
- 
- test -n "$3" && revision=$revision-$3
- 
diff --git a/debian/patches/series b/debian/patches/series
index 5775a04..c4bfd83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 # 020_visibility_patch
-005_release_branch_changes.diff
 900_doxyfile

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list