[SCM] mplayer/master.experimental: Revert "overwrite the upstream VERSION file only if upstream did not already ship it"
micove-guest at users.alioth.debian.org
micove-guest at users.alioth.debian.org
Tue Dec 2 21:14:10 UTC 2014
The following commit has been merged in the master.experimental branch:
commit a535d84f5dde74027f4a224a588cf10f72b52519
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date: Mon Dec 1 23:57:43 2014 -0500
Revert "overwrite the upstream VERSION file only if upstream did not already ship it"
This reverts commit dcd42f77653859d53eb400a9c48bd3340990f986.
diff --git a/debian/rules b/debian/rules
index 772ccb2..bbea99e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,7 +101,6 @@ build: build-arch build-indep
build-arch:
dh_testdir
dh_prep -a
- test -f VERSION || \
echo "svn r$(SVN_VERSION) ($(DEB_VENDOR)), built with gcc" > VERSION
$(MAKE) -f debian/rules debian/mplayer/usr/bin/mplayer
$(MAKE) -f debian/rules debian/mencoder/usr/bin/mencoder
@@ -172,6 +171,7 @@ install-indep: build-indep
clean:
dh_testdir
dh_testroot
+ dh_clean VERSION
-test -f config.mak && $(MAKE) distclean
# Build architecture-independent packages
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list