diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/README.debian | 4 | ||||
| -rw-r--r-- | debian/TODO.Debian | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rwxr-xr-x | debian/config | 52 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/menu | 6 | ||||
| -rw-r--r-- | debian/postrm | 18 | ||||
| -rwxr-xr-x | debian/rules | 21 | ||||
| -rw-r--r-- | debian/templates | 26 | ||||
| -rw-r--r-- | debian/watch | 3 |
11 files changed, 24 insertions, 120 deletions
diff --git a/debian/README.debian b/debian/README.debian index 23fc3ea415..80874c8de6 100644 --- a/debian/README.debian +++ b/debian/README.debian @@ -8,9 +8,9 @@ mplayer for Debian directory In case you would like to pass some parameters to ./configure, set variable - DEB_BUILD_OPTIONS like that: + DEB_BUILD_CONFIGURE like that: - eyck@ghost$ DEB_BUILD_OPTIONS="--enable-streaming" fakeroot debian/rules binary + eyck@ghost$ DEB_BUILD_CONFIGURE"--enable-streaming" fakeroot debian/rules binary Dariush Pietrzak <eyck@ghost.anime.pl> Sat Jan 5 20:28:23 CET 2002 diff --git a/debian/TODO.Debian b/debian/TODO.Debian index 4f73f9ba38..8b13789179 100644 --- a/debian/TODO.Debian +++ b/debian/TODO.Debian @@ -1 +1 @@ -- Figure out why /etc/mplayer/mplayer.config.1 gets created and fix this. + diff --git a/debian/changelog b/debian/changelog index 8b16dbce63..ace71aa772 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mplayer (1.0git) unstable; urgency=low + + * change version name to git. + * update standards version to 3.8.2 + + -- Anton Khirnov <wyskas@gmail.com> Sat, 08 Aug 2009 13:15:57 +0200 + mplayer (1.0svn) unstable; urgency=low * change version naming from cvs to svn. diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000000..7f8f011eb7 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/config b/debian/config deleted file mode 100755 index ab3c8c1b5b..0000000000 --- a/debian/config +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -CONFIGFILE=/etc/mplayer/mplayer.conf - -set -e - -# Source debconf library. -. /usr/share/debconf/confmodule - -if test -r $CONFIGFILE && ! grep -q '### mplayer DEBCONF AREA' $CONFIGFILE -then - db_input medium 'mplayer/replace-existing-files' || true - db_go || true - if [ "$RET" != "true" ]; then - exit 0 - fi - db_get 'mplayer/replace-existing-files' || true -fi - -########################################## find fonts -#default font (if available) -BESTFONT=/usr/share/fonts/truetype/Arial.ttf -[ -r $BESTFONT ] || BESTFONT=/usr/share/fonts/truetype/freefont/FreeSans.ttf - -t=$(tempfile -p fonts ) -find /usr/share/fonts/ /?/?in*/?ont* -type f -iname '*.ttf' -maxdepth 3 2> /dev/null > $t || true - -if test -s $t -then - fonts=$( awk '{print a $0;a=", "}' $t || true ) - db_subst "mplayer/ttfont" ttfontchoices $fonts || true - ## suppose the question is skipped: give a default - a=$BESTFONT - [ -r $BESTFONT ] || a=$(head -1 $t) - db_subst "mplayer/ttfont" ttfontdefault $a || true - - db_input medium mplayer/ttfont || true - if [ "$?" = 30 ] ; then - db_set mplayer/ttfont $a || true - fi -else - db_input medium "mplayer/no-ttfont" || true -fi - -rm $t - -db_go || true - -############################################################ - - -exit 0 diff --git a/debian/control b/debian/control index f8a5704f54..fb578fee1c 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: mplayer Section: misc Priority: optional Maintainer: Diego Biurrun <diego@biurrun.de> -Standards-Version: 3.2.1 -Build-Depends: libgtk1.2-dev | libgtk2.0-dev, libpng12-dev, zlib1g-dev, x11proto-core-dev, libx11-dev, libxext-dev, libxinerama-dev, libxv-dev, debhelper (>= 2) +Standards-Version: 3.8.2 +Build-Depends: libpng12-dev, zlib1g-dev, x11proto-core-dev, libx11-dev, libxext-dev, libxinerama-dev, libxv-dev, debhelper (>= 7) Package: mplayer Architecture: any diff --git a/debian/menu b/debian/menu deleted file mode 100644 index 06a7c7f583..0000000000 --- a/debian/menu +++ /dev/null @@ -1,6 +0,0 @@ -?package(mplayer):\ - needs="X11"\ - section="Apps/Viewers"\ - title="MPlayer"\ - command="/usr/bin/gmplayer"\ - icon="/usr/share/pixmaps/mplayer.xpm" diff --git a/debian/postrm b/debian/postrm deleted file mode 100644 index 5cfa18c857..0000000000 --- a/debian/postrm +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "purge" ]; then - if [ -e /usr/share/debconf/confmodule ]; then - # Source debconf library. - . /usr/share/debconf/confmodule - # Remove my changes to the db. - db_purge - fi - - if [ -d /etc/mplayer/ ]; then - rm -rf /etc/mplayer/ - fi -fi - -#DEBHELPER# diff --git a/debian/rules b/debian/rules index 17c06b0621..5a775b8906 100755 --- a/debian/rules +++ b/debian/rules @@ -2,8 +2,10 @@ # 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 -# This is the debhelper compatability version to use. -export DH_COMPAT=4 + +# 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) @@ -14,6 +16,11 @@ arch := $(shell dpkg --print-architecture) # https://wiki.ubuntu.com/DistCompilerFlags CLEAN_ENV=env -u CFLAGS -u CPPFLAGS -u LDFLAGS -u FFLAGS -u CXXFLAGS +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + configure: configure-stamp configure-stamp: dh_testdir @@ -23,7 +30,7 @@ configure-stamp: # you may want to add the "--enable-runtime-cpudetection" option to # the line below, but beware: the resulting binary will run slower $(CLEAN_ENV) \ - ./configure --prefix=/usr --confdir=/etc/mplayer $(DEB_BUILD_OPTIONS) + ./configure --prefix=/usr --confdir=/etc/mplayer $(DEB_BUILD_CONFIGURE) touch configure-stamp @@ -44,7 +51,6 @@ clean: # commands to clean up after the build process. -$(MAKE) distclean - rm -f help_mp.h config.h config.mak dh_clean # Build architecture-independent files here. @@ -61,14 +67,9 @@ binary-arch: build # 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 - dh_link usr/bin/mplayer usr/bin/gmplayer \ - usr/share/man/man1/mplayer.1.gz usr/share/man/man1/gmplayer.1.gz - - - dh_installdebconf + install -D -m 644 etc/example.conf $(prefix)/etc/mplayer/mplayer.conf dh_installdocs -X.svn -Xmplayer.1 DOCS/* dh_installexamples etc/example.conf etc/dvb-menu.conf etc/input.conf etc/menu.conf - dh_installmenu dh_installmime dh_installinfo dh_installchangelogs diff --git a/debian/templates b/debian/templates deleted file mode 100644 index 8fc8ca072b..0000000000 --- a/debian/templates +++ /dev/null @@ -1,26 +0,0 @@ -Template: mplayer/replace-existing-files -Type: boolean -Default: true -Description: Upgrade existing system? - It looks like you've configured MPlayer already. If you'd like to - configure it with this program, the old configuration - /etc/mplayer/mplayer.conf will be deleted. Do you want to continue - configuration with this program? If you say "Yes", your old - configuration will be deleted and you can create it anew with this - program. If you say "No" your existing files will be kept. If you - change your mind later, you can run 'dpkg-reconfigure mplayer'. - -Template: mplayer/ttfont -Type: select -Choices: ${ttfontchoices} -Default: ${ttfontdefault} -Description: MPlayer fonts - MPlayer can use TrueType fonts to render the OSD and subtitles. - Choose your favorite. - -Template: mplayer/no-ttfont -Type: note -Description: MPlayer cannot find TrueType fonts - You should install a package providing TrueType fonts (such as - 'ttf-freefont' or 'ttf-bitstream-vera' or 'msttcorefonts' ) - and reconfigure mplayer. diff --git a/debian/watch b/debian/watch deleted file mode 100644 index f02e397260..0000000000 --- a/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -# Site Directory Pattern Version Script -version=2 -http://www.mplayerhq.hu /MPlayer/releases/ MPlayer-(.*)\.tar\.bz2 debian uupdate |