[Mplayer-cvslog] CVS: main/debian changelog,1.9,1.10 control,1.9,1.10 copyright,1.4,1.5 dirs,1.2,1.3 rules,1.21,1.22

[Dariush Pietrzak]

Update of /cvsroot/mplayer/main/debian
In directory mplayer:/var/tmp.root/cvs-serv9234

Modified Files:
	changelog control copyright dirs rules 
Log Message:
Adam Di Carlo changes. see debian/changelog


Index: changelog
===================================================================
RCS file: /cvsroot/mplayer/main/debian/changelog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- changelog	7 Nov 2001 10:43:46 -0000	1.9
+++ changelog	20 Dec 2001 17:18:48 -0000	1.10
@@ -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 <aph at debian.org>  Sat, 15 Dec 2001 03:33:44 -0500
+
 mplayer (0.50-2) unstable; urgency=low
 
   * gui added to package/menu 

Index: control
===================================================================
RCS file: /cvsroot/mplayer/main/debian/control,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- control	11 Nov 2001 21:08:30 -0000	1.9
+++ control	20 Dec 2001 17:18:48 -0000	1.10
@@ -4,7 +4,6 @@
 Maintainer: Dariush Pietrzak <eyck at ghost.anime.pl>
 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

Index: copyright
===================================================================
RCS file: /cvsroot/mplayer/main/debian/copyright,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- copyright	22 Aug 2001 20:58:50 -0000	1.4
+++ copyright	20 Dec 2001 17:18:48 -0000	1.5
@@ -5,3 +5,7 @@
 
 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.
+

Index: dirs
===================================================================
RCS file: /cvsroot/mplayer/main/debian/dirs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dirs	25 Aug 2001 19:40:04 -0000	1.2
+++ dirs	20 Dec 2001 17:18:48 -0000	1.3
@@ -1,3 +1,4 @@
 usr/bin
 usr/sbin
-usr/share/man/man1/
+usr/share/man/man1
+usr/share/mplayer

Index: rules
===================================================================
RCS file: /cvsroot/mplayer/main/debian/rules,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rules	7 Nov 2001 10:43:46 -0000	1.21
+++ rules	20 Dec 2001 17:18:48 -0000	1.22
@@ -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-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 @@
 	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/<packagename>
-#	$(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/<packagename>
+	#$(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