added debianization to dist tarball,

removed obsolete 0.4 debianization

CVS patchset: 500
CVS date: 2001/08/26 09:50:10

9 files changed, 6 insertions, 192 deletions

diff --git a/Makefile.am b/Makefile.am
index 731345944..1e58755ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,10 @@ AUTOMAKE_OPTIONS = 1.3
 
 SUBDIRS = doc m4 src misc include
 
-EXTRA_DIST = cvscompile.sh automake.diff
+EXTRA_DIST = cvscompile.sh automake.diff \
+             debian/README.Debian debian/changelog debian/control \
+             debian/copyright debian/dirs debian/docs debian/postinst \
+             debian/postrm debian/preinst debian/prerm debian/rules
 
 noinst_HEADERS = config.h
 
diff --git a/configure.in b/configure.in
index 26abb172f..79fece494 100644
--- a/configure.in
+++ b/configure.in
@@ -590,6 +590,8 @@ uid=0\(* )
     ACLOCAL_DIR="/usr/local/share/aclocal"
     AC_MSG_RESULT(none - will be installed in $ACLOCAL_DIR)
   fi
+  escapedprefix=`echo "$prefix"|sed -e 's/\//\/\//g'`
+  ACLOCAL_DIR=`echo "$ACLOCAL_DIR"|sed -e s/^"$escapedprefix"/'\${prefix}'/`
   AC_SUBST(ACLOCAL_DIR)
   ;;
 esac
diff --git a/misc/Makefile.am b/misc/Makefile.am
index b65984337..39da0de59 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -1,7 +1,5 @@
 EXTRA_DIST = autogen.sh upload.pl SlackBuild.in SlackBuild build_rpms.sh \
 	xine-lib.spec.in xine-lib.spec \
-	debian/control debian/copyright debian/menu \
-	debian/rules debian/changelog debian/xine.docs\
 	xine_logo.png
 
 bin_SCRIPTS = xine-config
diff --git a/misc/debian/changelog b/misc/debian/changelog
deleted file mode 100644
index 83d7296aa..000000000
--- a/misc/debian/changelog
+++ /dev/null
@@ -1,25 +0,0 @@
-xine (0.4.0-2) unstable; urgency=low
-
-  * added upstream ChangeLog (closes: Bug#88402)
-
- -- Siggi Langauf <siggi@debian.org>  Sun,  4 Mar 2001 13:04:42 +0100
-
-xine (0.4.0-1) unstable; urgency=low
-
-  * new upstream version with totally new architecture (refer to ChangeLog)
-  
-  * now using seperate binary packages for input plugins
-  * switched to non-native package format 
-  * separate binary package for DVD plugin
-
-
- -- Siggi Langauf <siggi@debian.org>  Sat,  3 Mar 2001 01:35:01 +0100
-
-
-(old changelog entries are in upstream ChangeLog)
-  
-  
-  
-Local variables:
-mode: debian-changelog
-End:
diff --git a/misc/debian/control b/misc/debian/control
deleted file mode 100644
index 2e4c2d4bb..000000000
--- a/misc/debian/control
+++ /dev/null
@@ -1,52 +0,0 @@
-Source: xine
-Section: graphics
-Priority: optional
-Maintainer: Siggi Langauf <siggi@debian.org>
-Build-Depends: debhelper (>>2.0.0), imlib-dev (>=1.9.8.1), libasound1-dev (>=0.5.9), liborbit-dev (>=0.5.6-1)
-Standards-Version: 3.1.1
-
-Package: xine
-Architecture: i386
-Depends: ${shlibs:Depends}
-Suggests: xserver-xfree86 (>> 4.0)
-Description: MPEG, VCD, DVD audio/video player for X11
- Xine plays MPEG system streams (ie. MPEG videos with sound). In contrast
- to many other players, it does its best to synchronize audio and video.
- .
- MPEG streams can be read from plain files, pipes, network sockets, Video CDs
- or DVDs.
- .
- For DVD playback, an input plugin is required. You can use xine-dvd, the
- original plugin that comes with xine. If you want to play region locked or
- encrypted DVDs, you'll need an enhanced DVD plugin, like xine-dvd-css.
- .
- Xine currently _cannot_ play pure MPEG video streams (without audio).
- You will need another Player (like smpeg-xmms or the old  smpeg-gtv)
- for this. 
- .
- For optimal performance (and full screen support), the Xvideo extension (Xv)
- is reqired. Xv is supported by some XFree4 drivers. Of course, xine will also
- run with XFree 3.x, using the MIT-shm extension, but you might experience
- performance problems. For windows codecs, Xv is required.
- (See the README for more info)
- .
- Rudimentary support for AVI files (DivX;-) is known to work) is included.
- However, you'll need windows codec DLLs for that. Of course, xine will
- happily work without those DLLs, playing only MPEG streams.
-
-Package: xine-dvd
-Architecture: i386
-Depends: xine (>=0.4.0), ${shlibs:Depends}
-Conflicts: xine (<<0.4.0)
-Provides: xine-input-plugin
-Description: DVD (non-CSS) input plugin for xine
- This input plugin enables xine to play unencrypted, region-free
- DVDs. It does NOT contain CSS decryption or IFO parsing, so most
- DVDs will look quite poor: Chapters, subtitle colors, names for
- subtitle or audio channels, multi-angle support are not supported by
- this plugin.
- .
- This is the "official" DVD plugin from the xine project. There are some
- unofficial plugins which support CSS descrambling or IFO parsing. However,
- the legal status of these features is unclear...
-
diff --git a/misc/debian/copyright b/misc/debian/copyright
deleted file mode 100644
index ef4e6b87e..000000000
--- a/misc/debian/copyright
+++ /dev/null
@@ -1,32 +0,0 @@
-Xine was written by Günter Bartsch <guenter@users.sourceforge.net>
-and the xine development team. (see AUTHORS file for more credits)
-
-This package is maintained by Siggi Langauf <siggi@debian.org> as part of
-the upstream source, so the Debian source package is the upstream source.
-The original source, including current CVS versions can also be found on
-the xine homapage at
-
-http://xine.sourceforge.net/
-
-
-
-Copyright (C) 2000 the xine project
-
-xine is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-xine is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
-
-On Debian systems, the full text of the GPL can be found in 
-/usr/share/common-licenses/GPL
-
-
diff --git a/misc/debian/menu b/misc/debian/menu
deleted file mode 100644
index c78fa7283..000000000
--- a/misc/debian/menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(xine):needs=X11 section=Apps/Viewers\
-  title="xine" command="/usr/bin/xine"
diff --git a/misc/debian/rules b/misc/debian/rules
deleted file mode 100755
index dca6fd40d..000000000
--- a/misc/debian/rules
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/make -f
-#
-# debian/rules file for xine, the debhelper version.
-# inspired by a sample debian/rules file from dh_make
-
-# to make debhelper verbose:
-#export DH_VERBOSE=1
-
-export DH_COMPAT=2
-
-# Build architecture "i686-pc-linux-gnu" ensures that all optimizations
-# are compiled in. They are checked at runtime, so this has no portability
-# issues (on i386 arch...)
-ifeq ($(strip $(XINE_BUILD)),)
-export XINE_BUILD=i686-pc-linux-gnu
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	./configure --prefix=/usr --mandir=/usr/share/man
-	touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	-$(MAKE) distclean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) install prefix=`pwd`/debian/xine/usr  \
-	                mandir=`pwd`/debian/xine/usr/share/man
-	chmod a-x debian/xine/usr/lib/xine/plugins/*
-	mkdir -p debian/xine-dvd/usr/lib/xine/plugins
-	mv debian/xine/usr/lib/xine/plugins/input_dvd.so \
-	   debian/xine-dvd/usr/lib/xine/plugins/input_dvd.so
-	rm debian/xine/usr/lib/xine/plugins/*.la
-#       The freebsd README is not really interesting for Debian users
-	-rm debian/xine/usr/share/doc/xine/README.freebsd
-
-
-binary-indep: build install
-# no architecture independent files.
-
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installmenu
-#	dh_installmanpages
-	dh_installchangelogs -k ChangeLog
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/misc/debian/xine.docs b/misc/debian/xine.docs
deleted file mode 100644
index 2904d3e30..000000000
--- a/misc/debian/xine.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTHORS
-TODO
-doc/dataflow.dia