[SCM] FFmpeg packaging branch, master.snapshot, updated. debian/0.6.svn20100505-1-9-g9b2a810

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Wed Jun 16 07:44:53 UTC 2010


The following commit has been merged in the master.snapshot branch:
commit 9b2a810778aa0328798e491f59a613d7bdb18456
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 16 09:44:47 2010 +0200

    remove SVN_VERSION check from debian/rules for release tarballs

diff --git a/debian/rules b/debian/rules
index eb434a5..d223016 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,13 +6,8 @@ EPOCH=4:
 DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
-SVN_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed -nr 's/^[0-9.:-]+[+.~]+svn([0-9]+)$$/\1/p')
 SHLIBS_VERSION := 4:0.6~svn20100505-1
 
-ifeq ($(SVN_VERSION),)
-$(error UPSTREAM_VERSION: $(UPSTREAM_VERSION) - but SVN_VERSION is empty! - check debian/rules)
-endif
-
 LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 
 # Support multiple makes at once

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list