[SCM] mplayer packaging branch, master, updated. debian/1.0.rc3+svn20090405-1-8-g0a6ab2e

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Tue Jun 2 20:44:07 UTC 2009


The following commit has been merged in the master branch:
commit 8a44e17636b0e7b7b390f295e3f3c94e02b4038c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 2 21:05:32 2009 +0200

    avoid overlong lines

diff --git a/debian/rules b/debian/rules
index def60b1..63bd901 100755
--- a/debian/rules
+++ b/debian/rules
@@ -118,7 +118,8 @@ endif
 
 
 ifeq (linux,$(DEB_HOST_ARCH_OS))
-    DEB_BUILD_CONFIGURE += --enable-tv-v4l2 --enable-xmga --enable-mga --enable-3dfx --enable-tdfxfb --enable-fbdev
+    DEB_BUILD_CONFIGURE += --enable-tv-v4l2 --enable-xmga --enable-mga
+    DEB_BUILD_CONFIGURE += --enable-3dfx --enable-tdfxfb --enable-fbdev
 endif
 ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
     DEB_BUILD_CONFIGURE += --enable-tv-bsdbt848 --disable-directfb
@@ -177,13 +178,15 @@ install-nogui:
 
 # scripts
 	chmod a+x debian/scripts/*
-	install -D -m 644 etc/example.conf $(CURDIR)/debian/mplayer-nogui/etc/mplayer/mplayer.conf
+	install -D -m 644 etc/example.conf \
+	                  $(CURDIR)/debian/mplayer-nogui/etc/mplayer/mplayer.conf
 
 install-gui: 
 	$(MAKE) -f debian/rules GUI_FLAG=--enable-gui build-common
 
 	install -D -m 755 mplayer $(CURDIR)/debian/mplayer/usr/bin/gmplayer
-	install -D -m 644 DOCS/man/en/mplayer.1 $(CURDIR)/debian/mplayer/usr/share/man/man1/gmplayer.1
+	install -D -m 644 DOCS/man/en/mplayer.1 \
+	                  $(CURDIR)/debian/mplayer/usr/share/man/man1/gmplayer.1
 
 ###### build-indep
 
@@ -289,4 +292,9 @@ get-orig-source:
 	chmod +x debian/strip.sh
 	sh debian/get-orig-source.sh -d $(SVN_VERSION)
 
-.PHONY: build clean binary-indep binary-arch binary-common binary install binary binary-arch binary-indep clean checkroot get-orig-source autocontrol fix-orig-source copy-orig-from-svn download-and-unpack-orig build-gui build-nogui install-gui install-nogui
+PHONY += build clean binary-indep binary-arch binary-common binary 
+PHONY += install binary binary-arch binary-indep clean checkroot get-orig-source
+PHONY += autocontrol fix-orig-source copy-orig-from-svn download-and-unpack-orig
+PHONY += build-gui build-nogui install-gui install-nogui
+
+.PHONY: $(PHONY)

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list