[SCM] mplayer/master.experimental: Add a patch to update the VERSION file.
micove-guest at users.alioth.debian.org
micove-guest at users.alioth.debian.org
Tue Dec 2 21:14:12 UTC 2014
The following commit has been merged in the master.experimental branch:
commit 0a21e82c5751b0b5ada9701d3cf8e6b9c708ef4d
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date: Tue Dec 2 00:15:34 2014 -0500
Add a patch to update the VERSION file.
diff --git a/debian/patches/0001_version.patch b/debian/patches/0001_version.patch
new file mode 100644
index 0000000..d169296
--- /dev/null
+++ b/debian/patches/0001_version.patch
@@ -0,0 +1,14 @@
+Description: Modify the VERSION file.
+ Follow DOCS/tech/binary-packaging.txt instructions and adjust the version
+ since we modify the source.
+ .
+ Official releases always have a VERSION file and get-orig-source generates
+ one too.
+Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
+Forwarded: not-needed
+
+--- mplayer-1.1.1+svn37328.orig/VERSION
++++ mplayer-1.1.1+svn37328/VERSION
+@@ -1 +1 @@
+-1.1.1+svn37328
++svn r37328 (Debian), built with gcc
diff --git a/debian/patches/series b/debian/patches/series
index 2e86a33..524182f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+0001_version.patch
23mplayer-debug-printf.patch
50_Hurd_PATH_MAX.patch
diff --git a/debian/rules b/debian/rules
index 0ff2d8a..f5d60d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,6 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_VENDOR ?= $(shell dpkg-vendor --query Vendor)
# XXX enable-menu is frowned upon by upstream
@@ -99,7 +98,6 @@ build: build-arch build-indep
build-arch:
dh_testdir
dh_prep -a
- 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
$(MAKE) -f debian/rules debian/mplayer-gui/usr/bin/gmplayer
@@ -169,7 +167,6 @@ 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