Changes to debian packaging based on patches by Josip Rodin (joy debian org)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1635 b3059339-0415-0410-9bf9-f77b7e298cf2

7 files changed, 38 insertions, 63 deletions

diff --git a/debian/README.debian b/debian/README.debian
index 8221b2fcfb..b0de7e6eb6 100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -1,11 +1,10 @@
 mplayer for Debian
 ----------------------
-  This package is meant for users to build themselves.
-  Recommended method is running "fakeroot debian/rules binary" in "main" directory
 
-Dariush Pietrzak <eyck@incubus.ar.lublin.pl>  Thu, 17 May 2001 13:25:12 +0200
+  Most options are autodetected or configured during compilation thus
+  users are supposed to build this package themselves.
 
+  Recommended method is running "fakeroot debian/rules binary" in the top
+  directory
 
-Comments regarding the Package
-
-* TeLeNiEkO * <telenieko@telenieko.com>, Mon, 26 Feb 2001 12:24:04 +0100
+Dariush Pietrzak <eyck@incubus.ar.lublin.pl>  Wed Aug 22 21:54:12 CEST 2001
diff --git a/debian/changelog b/debian/changelog
index 92ec08befc..fa816ae1e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mplayer (0.18-4) unstable; urgency=low
+
+  * Changes to debian packaging suggested Josip Rodin 
+
+ -- Dariush Pietrzak <eyck@ghost.forumakad.pl>  Wed, 22 Aug 2001 22:40:58 +0200
+
 mplayer (0.18-3) unstable; urgency=low
 
   * fixed templates. 
diff --git a/debian/control b/debian/control
index 78fc605355..1d7df16d2b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,24 @@
 Source: mplayer
-Section: unknown
+Section: misc
 Priority: optional
-Maintainer: * TeLeNiEkO * <telenieko@telenieko.com>
+Maintainer: Dariush Pietrzak <eyck@ghost.anime.pl>
 Standards-Version: 3.2.1
+Build-Depends: xlibs-dev, libpng2-dev, libz-dev, debhelper (>= 2), nasm
 
 Package: mplayer
 Architecture: any
 Depends: ${shlibs:Depends},debconf,libconfhelper-perl
-Description: The Ultimate Movie Player For Linux
-  MPlayer is a movie player for LINUX. It plays most MPEG, AVI and ASF files,
-  supported by many native and Win32 DLL codecs. You can watch VCD, DVD and even
-  DivX movies too. The another big feature of mplayer is the wide range of
-  supported output drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev,
-  but you can use SDL (and this way all drivers of SDL, for example AAlib) and
-  some lowlevel card-specific drivers (for Matrox) too! Most of them supports
-  software or hardware scaling, so you can enjoy movies in fullscreen. And what
-  about the nice big antialiased shaded subtitles (7 supported types!!!) with
-  hungarian, english, cyrillic, czech, korean fonts, and OSD?
+Description: The Ultimate Movie Player 
+ MPlayer is a movie player for Un*x. It plays most MPEG, AVI and ASF files,
+ supported by many native and Win32 DLL codecs. You can watch VCD, DVD and even
+ DivX movies with MPlayer.
+ .
+ MPlayer supports a wide range of output drivers: X11, Xv, DGA, OpenGL,
+ SVGAlib, fbdev, AAlib, GGI, SDL . You can use SDL and thus all the SDL 
+ drivers. Same goes for GGI.
+ There are some low-level card-specific drivers (e.g. Matrox).  Most of the
+ drivers support either software or hardware scaling, so you can enjoy
+ movies in full screen mode.
+ .
+ MPlayer has nice, big antialiased shaded subtitles (7 supported types!)
+ with Hungarian, English, Cyrillic, Czech and Korean fonts, and OSD.
diff --git a/debian/copyright b/debian/copyright
index bf7ecff17b..9aec96a800 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,7 @@
 This package was debianized by * TeLeNiEkO * telenieko@telenieko.com on
 Mon, 26 Feb 2001 12:24:04 +0100.
 
-It was downloaded from http://mp.dev.hu
+Original source can be found at: http://www.mplayerHQ.hu/homepage/
 
-Copyright:
-
- GPL! (partly)
+Copyrighted by various authors. Licensed under the terms of GNU GPL.
+See /usr/share/common-licenses/GPL for details.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 4997d2f51a..0000000000
--- a/debian/docs
+++ /dev/null
@@ -1,35 +0,0 @@
-
-DOCS/AUTHORS
-DOCS/BUGREPORTS
-DOCS/BUGS
-DOCS/CDROM
-DOCS/CODECS
-DOCS/CVS
-DOCS/ChangeLog
-DOCS/ChangeLog.mpeg
-DOCS/DEBIAN
-DOCS/DGA
-DOCS/DVD
-DOCS/DVD-FAQ
-DOCS/Hungarian
-DOCS/INSTALL
-DOCS/LIRC
-DOCS/MPlayer-FAQ
-DOCS/MTRR
-DOCS/OpenDivX
-DOCS/README
-DOCS/Russian
-DOCS/SDL
-DOCS/SOUNDCARDS
-DOCS/SPEED
-DOCS/Spanish
-DOCS/TODO
-DOCS/TVout-G400
-DOCS/VIDEOCARDS
-DOCS/codecs-in.html
-DOCS/codecs.conf
-DOCS/example.conf
-DOCS/inttypes.h
-DOCS/mplayer.1
-DOCS/tech-eng.txt
-DOCS/tech-hun.txt
diff --git a/debian/rules b/debian/rules
index b6a3709564..3659f80d46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,9 +23,8 @@ build-stamp:
 	# Add here commands to compile the package.
 	#$(MAKE)
 	#/usr/bin/docbook-to-man debian/etherconf.sgml > etherconf.1
-	make dep
-	make mplayer
-
+	${MAKE} dep
+	${MAKE} mplayer
 
 	touch build-stamp
 
@@ -53,7 +52,7 @@ install: build
 
 	# Add here commands to install the package into debian/<packagename>
 #	$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
-	$(MAKE) install prefix=`pwd`/debian/tmp/usr
+	$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -65,7 +64,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdebconf	
-	dh_installdocs
+	dh_installdocs DOCS/*
 	dh_installexamples
 	dh_installmenu
 #	dh_installlogrotate
diff --git a/debian/templates b/debian/templates
index dcd36e74ec..438e877c8d 100644
--- a/debian/templates
+++ b/debian/templates
@@ -34,10 +34,12 @@ Description: MPlayer Video Output
  	   this driver can work without X and display video on secondary head of matrox cards
  	 * xv - XVideo extensions of X 4.x ( hardware scaling, bilinear filtering )
  	 * sdl - SDL library, it can also use hardware scaling, filtering etc 
+ 	 * ggi - GGI library, it can also use hardware scaling, filtering etc 
  	 * dga, fsdga - DGA extension.
  	 * fsbdev - framebuffer device ( watching movies on text console )
  	 * x11 - simple x11 output.
- Please choose carefully because it has tramendous effect on speed.
+ .	 
+ Please choose carefully because this will have a tremendous effect on speed.
 
 Template: mplayer/cfgnote
 Type: note