[SCM] mplayer2/master: Merge commit 'upstream/2.0_rc2'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.0~rc2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 16e88cdbc173704e7be9d9ad94243a4ab1824d12
X-Git-Newrev: 038036bd3934c31631476c9f9c8c49c9cac7bf7e

The following commit has been merged in the master branch:
commit 038036bd3934c31631476c9f9c8c49c9cac7bf7e
Merge: 16e88cdbc173704e7be9d9ad94243a4ab1824d12 248be12059d3b5fb6dcbd75ca23cf03eb9f6cbfc
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Mar 22 15:16:42 2011 +0100

    Merge commit 'upstream/2.0_rc2'
    
    Fixed conflicts:
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/copyright
    	debian/rules

diff --combined debian/rules
index ce86118,81dfc8f..c7a34f2
--- a/debian/rules
+++ b/debian/rules
@@@ -1,23 -1,91 +1,23 @@@
  #!/usr/bin/make -f
 -# Made with the aid of debmake, by Christoph Lameter,
 -# based on the sample debian/rules file for GNU hello by Ian Jackson.
 -#export DH_VERBOSE=1
 -
 -# do not run the actual rules of this makefile in parallel. sub-makes
 -# can go in parallel
 -.NOTPARALLEL:
 -
 -package        := mplayer
 -prefix := $(shell pwd)/debian/$(package)
 -
 -arch   := $(shell dpkg --print-architecture)
 -
 -# See http://wiki.debian.org/Teams/Dpkg/DebianRules; #465282  and
 -# https://wiki.ubuntu.com/DistCompilerFlags
 -CLEAN_ENV=env -u CFLAGS -u CPPFLAGS -u LDFLAGS -u FFLAGS -u CXXFLAGS
  
 +# Support multiple makes at once
  ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 -         NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 -         MAKEFLAGS += -j$(NUMJOBS)
 +NUMJOBS = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 +else
 +# on i386 and amd64, we query the system unless overriden by DEB_BUILD_OPTIONS
 +ifeq      ($(DEB_HOST_ARCH),i386)
 +NUMJOBS := -j$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
 +else ifeq ($(DEB_HOST_ARCH),amd64)
 +NUMJOBS := -j$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
  endif
 -
 -configure: configure-stamp
 -configure-stamp:
 -	dh_testdir
 -	# Add here commands to configure the package.
 -	$(checkdir)
 -	# If you plan to install the target .deb on a wide variety of machines,
 -	# you may want to add the "--enable-runtime-cpudetection" option to
 -	# the line below, but beware: the resulting binary will run slower
 -ifneq (grep '--prefix' mplayer_options,0)
 -	echo '--prefix=/usr' >> mplayer_options
  endif
  
 -	touch configure-stamp
 -
 -build: configure-stamp build-stamp
 -build-stamp:
 -	dh_testdir
 -
 -	# commands to compile the package.
 -	$(CLEAN_ENV) \
 -	${MAKE}
 +%:
 +	dh $@ 
  
 -	touch build-stamp
 +override_dh_auto_build:
 +	make V=1 $(NUMJOBS)
  
 -clean:
 -	dh_testdir
 -	dh_testroot
 -	rm -f build-stamp configure-stamp
 -
 -	# commands to clean up after the build process.
 -	./clean
 +override_dh_clean:
  	dh_clean
- 	rm -rf build_libs/ ffmpeg_build/
 -
 -# Build architecture-independent files here.
 -binary-indep: build
 -# We have nothing to do by default.
 -
 -# Build architecture-dependent files here.
 -binary-arch: build
 -	dh_testdir
 -	dh_testroot
 -	dh_clean -k
 -	dh_installdirs
 -
 -	# commands to install the package into debian/<packagename>
 -	$(MAKE) prefix=$(prefix)/usr BINDIR=$(prefix)/usr/bin CONFDIR=$(prefix)/etc/mplayer LIBDIR=$(prefix)/usr/lib DATADIR=$(prefix)/usr/share/mplayer  MANDIR=$(prefix)/usr/share/man  install
 -
 -	install -D -m 644 mplayer/etc/example.conf $(prefix)/etc/mplayer/mplayer.conf
 -	dh_installdocs -X.svn -Xmplayer.1 mplayer/DOCS/*
 -	dh_installexamples mplayer/etc/example.conf mplayer/etc/dvb-menu.conf mplayer/etc/input.conf mplayer/etc/menu.conf
 -	dh_installmime
 -	dh_installinfo
 -	dh_installchangelogs
 -	#ChangeLog
 -	dh_link
 -	dh_strip
 -	dh_compress
 -	dh_fixperms
 -	dh_makeshlibs
 -	dh_installdeb
 -	dh_shlibdeps
 -	dh_gencontrol
 -	dh_md5sums
 -	dh_builddeb
 -
 -binary: binary-indep binary-arch
 -
 -.PHONY: binary binary-arch binary-indep clean checkroot
++	rm -rf build_libs/ ffmpeg_build/

-- 
mplayer2 packaging