[MPlayer-dev-eng] debian/* patch
Juergen Kreileder
jk at blackdown.de
Sun Feb 3 19:19:58 CET 2002
Hi,
the following patch makes sure that libdha and the vidix drivers make
it into the deb package.
Additionally it fixes all lintian errors/warnings.
There's one not purely Debian specific change: vidix/drivers/Makefile
now uses gcc instead of ld for linking. If you want to keep on using
ld, you probably should add "-lc".
Juergen
Index: .cvsignore
===================================================================
RCS file: /cvsroot/mplayer/main/.cvsignore,v
retrieving revision 1.8
diff -u -r1.8 .cvsignore
--- .cvsignore 20 Nov 2001 12:51:57 -0000 1.8
+++ .cvsignore 3 Feb 2002 17:50:42 -0000
@@ -1,7 +1,9 @@
.depend
.developer
+build-stamp
config.h
config.mak
+configure-stamp
configure.log
help_mp.h
mencoder
Index: debian/config
===================================================================
RCS file: /cvsroot/mplayer/main/debian/config,v
retrieving revision 1.1
diff -u -r1.1 config
--- debian/config 28 Jul 2001 07:54:52 -0000 1.1
+++ debian/config 3 Feb 2002 17:50:43 -0000
@@ -3,7 +3,7 @@
# Script to configure mplayer
# based on etherconf by John Goerzen <jgoerzen at progenylinux.com>
-use Debian::DebConf::Client::ConfModule qw(:all);
+use Debconf::Client::ConfModule qw(:all);
my $version = version(2.0);
title('MPlayer Configuration');
@@ -48,7 +48,7 @@
}
sub configure {
- subst("mplayer/voutput", "vochoices", "xv, xmga, mga, x11, gl, sdl");
+ subst("mplayer/voutput", "vochoices", "xv, xmga, mga, x11, gl, sdl, xvidix");
# db_subst mplayer/output vo xc,xmga,mga,x11,gl,sdl
exit(0) if (input($PRIORITY, "mplayer/voutput") eq "question skipped");
go();
Index: debian/dirs
===================================================================
RCS file: /cvsroot/mplayer/main/debian/dirs,v
retrieving revision 1.3
diff -u -r1.3 dirs
--- debian/dirs 20 Dec 2001 17:18:48 -0000 1.3
+++ debian/dirs 3 Feb 2002 17:50:43 -0000
@@ -1,4 +1,4 @@
usr/bin
-usr/sbin
usr/share/man/man1
usr/share/mplayer
+usr/lib/mplayer
Index: debian/postinst
===================================================================
RCS file: /cvsroot/mplayer/main/debian/postinst,v
retrieving revision 1.7
diff -u -r1.7 postinst
--- debian/postinst 25 Aug 2001 19:40:04 -0000 1.7
+++ debian/postinst 3 Feb 2002 17:50:43 -0000
@@ -4,7 +4,7 @@
require ConfHelper;
-use Debian::DebConf::Client::ConfModule qw(:all);
+use Debconf::Client::ConfModule qw(:all);
use IO::Handle;
use Fcntl;
my $version = version(1.0);
@@ -12,6 +12,12 @@
my $didupgrade = 0;
dealwithupgrades();
+
+my $temp="set -e\nset -- @ARGV\n" . << 'EOF';
+#DEBHELPER#
+EOF
+system ($temp) / 256 == 0
+or die "Problem with debhelper scripts: $!";
my $mcfg = new ConfHelper('mplayer', "/etc/mplayer.conf");
$mcfg->setconfarea("
Index: debian/rules
===================================================================
RCS file: /cvsroot/mplayer/main/debian/rules,v
retrieving revision 1.31
diff -u -r1.31 rules
--- debian/rules 8 Jan 2002 19:03:29 -0000 1.31
+++ debian/rules 3 Feb 2002 17:50:43 -0000
@@ -6,7 +6,7 @@
export DH_COMPAT=3
package := mplayer
-prefix := debian/$(package)
+prefix := $(shell pwd)/debian/$(package)
arch := $(shell dpkg --print-architecture)
ifeq ($(arch),powerpc)
@@ -53,8 +53,9 @@
dh_installdirs
# commands to install the package into debian/<packagename>
- $(MAKE) prefix=$(prefix)/usr CONFDIR=$(prefix)/etc/mplayer DATADIR=$(prefix)/usr/share/mplayer install
- dh_link usr/bin/mplayer usr/bin/gmplayer
+ $(MAKE) prefix=$(prefix)/usr CONFDIR=$(prefix)/etc/mplayer 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
dh_installdocs DOCS/*
Index: vidix/drivers/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- vidix/drivers/Makefile 17 Jan 2002 09:01:50 -0000 1.5
+++ vidix/drivers/Makefile 3 Feb 2002 17:50:51 -0000
@@ -52,37 +52,37 @@
$(CC) -c $(RADEON_CFLAGS) -o $@ $<
$(RADEON_VID): $(RADEON_OBJS)
- $(LD) $(RADEON_LIBS) -shared -soname $(RADEON_VID) -o $(RADEON_VID) $(RADEON_OBJS)
+ $(CC) $(RADEON_LIBS) -shared -Xlinker -soname -Xlinker $(RADEON_VID) -o $(RADEON_VID) $(RADEON_OBJS)
$(RAGE128_OBJS): $(RAGE128_SRCS)
$(CC) -c $(RAGE128_CFLAGS) -o $@ $<
$(RAGE128_VID): $(RAGE128_OBJS)
- $(LD) $(RAGE128_LIBS) -shared -soname $(RAGE128_VID) -o $(RAGE128_VID) $(RAGE128_OBJS)
+ $(CC) $(RAGE128_LIBS) -shared -Xlinker -soname -Xlinker $(RAGE128_VID) -o $(RAGE128_VID) $(RAGE128_OBJS)
$(NVIDIA_OBJS): $(NVIDIA_SRCS)
$(CC) -c $(NVIDIA_CFLAGS) -o $@ $<
$(NVIDIA_VID): $(NVIDIA_OBJS)
- $(LD) $(NVIDIA_LIBS) -shared -soname $(NVIDIA_VID) -o $(NVIDIA_VID) $(NVIDIA_OBJS)
+ $(CC) $(NVIDIA_LIBS) -shared -Xlinker -soname -Xlinker $(NVIDIA_VID) -o $(NVIDIA_VID) $(NVIDIA_OBJS)
$(GENFB_OBJS): $(GENFB_SRCS)
$(CC) -c $(GENFB_CFLAGS) -o $@ $<
$(GENFB_VID): $(GENFB_OBJS)
- $(LD) $(GENFB_LIBS) -shared -soname $(GENFB_VID) -o $(GENFB_VID) $(GENFB_OBJS)
+ $(CC) $(GENFB_LIBS) -shared -Xlinker -soname -Xlinker $(GENFB_VID) -o $(GENFB_VID) $(GENFB_OBJS)
$(MGA_OBJS): $(MGA_SRCS)
$(CC) -c $(MGA_CFLAGS) -o $@ $<
$(MGA_VID): $(MGA_OBJS)
- $(LD) $(MGA_LIBS) -shared -soname $(MGA_VID) -o $(MGA_VID) $(MGA_OBJS)
+ $(CC) $(MGA_LIBS) -shared -Xlinker -soname -Xlinker $(MGA_VID) -o $(MGA_VID) $(MGA_OBJS)
$(MGA_CRTC2_OBJS): $(MGA_CRTC2_SRCS)
$(CC) -c $(MGA_CRTC2_CFLAGS) -o $@ $<
$(MGA_CRTC2_VID): $(MGA_CRTC2_OBJS)
- $(LD) $(MGA_CRTC2_LIBS) -shared -soname $(MGA_CRTC2_VID) -o $(MGA_CRTC2_VID) $(MGA_CRTC2_OBJS)
+ $(CC) $(MGA_CRTC2_LIBS) -shared -Xlinker -soname -Xlinker $(MGA_CRTC2_VID) -o $(MGA_CRTC2_VID) $(MGA_CRTC2_OBJS)
clean:
rm -f *.o *.so *~
--
Juergen Kreileder, Blackdown Java-Linux Team
http://www.blackdown.org/java-linux.html
Run Java 2 SE v1.3.1 on your iPAQ:
http://www.handhelds.org/pipermail/ipaq/2001-June/007221.html
More information about the MPlayer-dev-eng
mailing list