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

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Aug 26 13:06:31 2008
New Revision: 1392

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1392
Log:
Rename SRC_VERSION to UPSTREAM_VERSION in rules.

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=1392&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/changelog (original)
+++ unstable/ffmpeg-debian/debian/changelog Tue Aug 26 13:06:31 2008
@@ -4,6 +4,7 @@
     dashes and be generally stricter.
   * Large cleanup to rules logic: drop some cruft, rewrite some small chunks
     in a slightly more readable manner, whitespaces, .PHONY fixes...
+  * Rename SRC_VERSION to UPSTREAM_VERSION in rules.
 
  -- Loic Minier <lool at dooz.org>  Tue, 26 Aug 2008 14:38:19 +0200
 

Modified: unstable/ffmpeg-debian/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/rules?rev=1392&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/rules (original)
+++ unstable/ffmpeg-debian/debian/rules Tue Aug 26 13:06:31 2008
@@ -3,8 +3,8 @@
 include /usr/share/quilt/quilt.make
 
 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')
+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')
 
 include debian/confflags
 
@@ -60,10 +60,10 @@
 	chmod +x debian/strip.sh
 	sh debian/get-orig-source.sh -r{$(SVN_VERSION)} \
 	    -c $(CURDIR)/debian/strip.sh \
-	    -o ../ffmpeg-debian_$(SRC_VERSION).orig.tar.gz
+	    -o ../ffmpeg-debian_$(UPSTREAM_VERSION).orig.tar.gz
 else
 	sh debian/get-orig-source.sh -r{$(SVN_VERSION)} \
-	    -o ../ffmpeg_$(SRC_VERSION).orig.tar.gz
+	    -o ../ffmpeg_$(UPSTREAM_VERSION).orig.tar.gz
 endif
 
 define install_flavor
@@ -90,7 +90,7 @@
 
 define call_dh_makeshlibs
 	dh_makeshlibs -p $(1)$(2) \
-	    -V "$(1)$(2) (>= $(SRC_VERSION)-8) | $(1)-unstripped-$(2) (>= $(SRC_VERSION)-8)"
+	    -V "$(1)$(2) (>= $(UPSTREAM_VERSION)-8) | $(1)-unstripped-$(2) (>= $(UPSTREAM_VERSION)-8)"
 endef
 
 binary-arch: build install