From ef33d014c62967bc3478b1e50ecb8836d23a0359 Mon Sep 17 00:00:00 2001 From: eyck Date: Thu, 20 Dec 2001 17:18:48 +0000 Subject: Adam Di Carlo changes. see debian/changelog git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3633 b3059339-0415-0410-9bf9-f77b7e298cf2 --- debian/changelog | 12 ++++++++++++ debian/control | 1 - debian/copyright | 4 ++++ debian/dirs | 3 ++- debian/rules | 52 +++++++++++++++++++++------------------------------- 5 files changed, 39 insertions(+), 33 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f716d4704c..2ca1c70447 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +mplayer (0.50-3) unstable; urgency=low + + * debian/rules: improve install routine; will include mencore if it is + built + * debian/control: remove invalid source recommends + * debian/copyright: mention that binary distribution is not allowed + * debian/rules: install /usr/share/mplayer/codecs.conf; this should + probably be a config file + * turn on fbdev option + + -- Adam Di Carlo Sat, 15 Dec 2001 03:33:44 -0500 + mplayer (0.50-2) unstable; urgency=low * gui added to package/menu diff --git a/debian/control b/debian/control index a9154f4c87..a8149f9fb7 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,6 @@ Priority: optional Maintainer: Dariush Pietrzak Standards-Version: 3.2.1 Build-Depends:c++-compiler, libglib-dev, libgtk-dev, xlibs-dev, libpng2-dev, zlib1g-dev, debhelper (>= 2) -Recommends: libsdl1.2-dev Package: mplayer Architecture: any diff --git a/debian/copyright b/debian/copyright index 9aec96a800..86e074fb4e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,3 +5,7 @@ Original source can be found at: http://www.mplayerHQ.hu/homepage/ Copyrighted by various authors. Licensed under the terms of GNU GPL. See /usr/share/common-licenses/GPL for details. + +This package may not be distributed in binary form. Debian packaging +in provided for convenience only. + diff --git a/debian/dirs b/debian/dirs index 8afe5eca20..e972d27203 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,3 +1,4 @@ usr/bin usr/sbin -usr/share/man/man1/ +usr/share/man/man1 +usr/share/mplayer diff --git a/debian/rules b/debian/rules index 1c0987cc3a..5f155a910b 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,14 @@ # This is the debhelper compatability version to use. export DH_COMPAT=2 -package=mplayer +package := mplayer +prefix := debian/$(package) +arch := $(shell dpkg --print-architecture) + +ifeq ($(arch),powerpc) + arch-conf += --disable-mp1e +endif + configure: configure-stamp configure-stamp: @@ -20,10 +27,8 @@ build: configure-stamp build-stamp build-stamp: dh_testdir - # Add here commands to compile the package. - #$(MAKE) - #/usr/bin/docbook-to-man debian/etherconf.sgml > etherconf.1 - ${MAKE} mplayer + # commands to compile the package. + ${MAKE} touch build-stamp @@ -32,49 +37,34 @@ clean: dh_testroot rm -f build-stamp configure-stamp - # Add here commands to clean up after the build process. - #-$(MAKE) clean -# $(checkdir) -# -rm -f build + # commands to clean up after the build process. -$(MAKE) distclean -# -rm -f `find . -name "*~"` -# -rm -rf debian/tmp debian/files* core debian/substvars dh_clean +# Build architecture-independent files here. +binary-indep: build +# We have nothing to do by default. - -install: build +# Build architecture-dependent files here. +binary-arch: build dh_testdir dh_testroot dh_clean -k dh_installdirs - # Add here commands to install the package into debian/ -# $(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install -# $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr -# install -d $(CURDIR)/debian/tmp/usr/bin + # commands to install the package into debian/ + #$(MAKE) prefix=$(prefix)/usr install install -m 755 -s mplayer $(CURDIR)/debian/`dh_listpackages`/usr/bin/mplayer dh_link usr/bin/mplayer usr/bin/gmplayer + install -o root -g root -m 0644 etc/codecs.conf $(prefix)/usr/share/mplayer -#Do we really need this?: -# install -o root -g root -m 4755 fibmap_mplayer usr/bin/fibmap_mplayer - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot dh_installdebconf dh_installdocs DOCS/* dh_installexamples etc/example.conf dh_installmenu # dh_installmime - dh_installmanpages TVout/fbset/fb.modes.5 TVout/fbset/fbset.8 +# dh_installmanpages TVout/fbset/fb.modes.5 TVout/fbset/fbset.8 +# dh_installmanpages # handled by make install above dh_installinfo # dh_undocumented dh_installchangelogs -- cgit v1.2.3