[Mplayer-dev-eng] [patch] Debian changes, part 2

André Dahlqvist andre.dahlqvist at telia.com
Sat Jul 28 16:36:37 CEST 2001 

Here's another change for the debian packaging. It is on top of my other
patch. It also remoes my bogus build-dependency on docbook-to-man that
I pointed out earlier, so my last patch can be applied in full since
this one fixes it.

What's up with the horribly overcomplicated perl postinst script by the
way? If you don't mind, Dariush, I can replace that with a standard simple
postinst written in shell. Or does mplayer have a need to do any fancy
stuff there that I overlooked?

diff -ur debian.old/changelog debian/changelog
--- debian.old/changelog	Sat Jul 28 15:02:25 2001
+++ debian/changelog	Sat Jul 28 16:09:06 2001
@@ -1,3 +1,9 @@
+mplayer (0.18-3) unstable; urgency=low
+
+  * blaa
+
+ -- André Dahlqvist <andre at debian.org>  Sat, 28 Jul 2001 16:08:41 +0200
+
 mplayer (0.18-2) unstable; urgency=low
 
   * modified debian scripts 
Only in debian: changelog.old
diff -ur debian.old/control debian/control
--- debian.old/control	Sat Jul 28 16:05:30 2001
+++ debian/control	Sat Jul 28 16:21:07 2001
@@ -1,20 +1,20 @@
 Source: mplayer
-Section: unknown
+Section: x11
 Priority: optional
 Maintainer: * TeLeNiEkO * <telenieko at telenieko.com>
 Standards-Version: 3.2.1
-Build-Depends: debhelper (>= 3.0.0), docbook-to-man
+Build-Depends: debhelper (>= 3.0.0)
 
 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?
+ 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?
diff -ur debian.old/menu debian/menu
--- debian.old/menu	Sat Jul 28 15:02:25 2001
+++ debian/menu	Sat Jul 28 15:55:14 2001
@@ -1 +1,7 @@
-?package(mplayer):command=/usr/bin/mplayer section="Apps/Viewers" needs=text title=mplayer
+?package(mplayer): \
+	needs=x11 \
+	section=Apps/Viewers \
+	title="MPlayer" \
+	longtitle="MPlayer: Media Player for Linux" \
+	command="/usr/bin/mplayer" \
+	hints="Player"
Only in debian.old/: postinst.templates
diff -ur debian.old/rules debian/rules
--- debian.old/rules	Sat Jul 28 16:05:30 2001
+++ debian/rules	Sat Jul 28 16:01:42 2001
@@ -1,48 +1,29 @@
 #!/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
-# This is the debhelper compatability version to use.
-export DH_COMPAT=1
-
-package=mplayer
+# Sample debian/rules that uses debhelper.
+# This file is public domain software, originally written by Joey Hess. 
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	$(checkdir)
-	./configure --prefix=/usr
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-	touch configure-stamp
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=3
 
-build: configure-stamp build-stamp
+build: 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
-
+	./configure	
+	$(MAKE)
 
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	#-$(MAKE) clean
-#	$(checkdir)
-#	-rm -f build
-#	-$(MAKE) distclean
-#	-rm -f `find . -name "*~"`
-#	-rm -rf debian/tmp debian/files* core debian/substvars
-	dh_clean
+	rm -f build-stamp
 
+	-$(MAKE) clean
 
+	dh_clean
 
 install: build
 	dh_testdir
@@ -50,29 +31,20 @@
 	dh_clean -k
 	dh_installdirs
 
-	# 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) prefix=`pwd`/debian/mplayer/usr install
 
 # 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
-	dh_installexamples DOCS/example.conf DOCS/codecs.conf 
+	dh_installexamples DOCS/example.conf DOCS/codecs.conf
 	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
 	dh_installman DOCS/mplayer.1
 #	dh_installinfo
 #	dh_undocumented
@@ -89,23 +61,5 @@
 	dh_md5sums
 	dh_builddeb
 
-
-
-#binary-arch: checkroot build
-#	$(checkdir)
-#	-rm -rf debian/tmp
-#	install -d debian/tmp
-#	cd debian/tmp && install -d `cat ../dirs`
-
-
-# Must have debmake installed for this to work. Otherwise please copy
-# /usr/bin/debstd into the debian directory and change debstd to debian/debstd
-#	debstd 
-#	dpkg-gencontrol -isp
-#	chown -R root.root debian/tmp
-#	chmod -R go=rX debian/tmp
-#	dpkg --build debian/tmp ..
-
 binary: binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: build clean binary-indep binary-arch binary install
Only in debian.old/: substvars
-- 

André Dahlqvist <andre.dahlqvist at telia.com>

_______________________________________________
Mplayer-dev-eng mailing list
Mplayer-dev-eng at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-dev-eng

More information about the MPlayer-dev-eng mailing list