X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=debian%2Frules;h=ec32dd2f2d69de22fca4e617fdddaf4dcfcef464;hb=cd08e2c2544b1268c7bb387be1a983fdd373c54e;hp=d6ce94efd22e8cd80852bb10108a20b86189d1a7;hpb=ced4c0f627f0924cb36ae6e700823c10625d11b0;p=vlc

diff --git a/debian/rules b/debian/rules
index d6ce94efd2..ec32dd2f2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,16 +9,14 @@
 export DH_COMPAT=3
 
 # Compilation options
-export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --enable-ggi --enable-sdl --enable-esd --enable-qt --enable-mad --enable-arts --enable-alsa --enable-lirc --enable-a52"
-export LIBDVDCSS_FLAGS="--with-dvdcss=local-shared"
+export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --enable-ggi --enable-sdl --enable-esd --enable-qt --enable-mad --enable-arts --enable-alsa --enable-lirc --enable-a52 --enable-aa"
+# Remove --without-dvdcss here in non-totalitarian countries
+export DVDCSS_FLAGS="--enable-dvd --without-dvdcss"
+
 export VIDDIR="usr/share/videolan"
 export PIXDIR="usr/share/pixmaps"
 export GNOMEDIR="usr/share/gnome/apps/Multimedia"
 
-# Library options
-version=$(shell grep '^ *LIBDVDCSS_VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=)
-major=$(shell echo "$(version)" | cut -f1 -d.)
-
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -31,7 +29,7 @@ build-stamp:
 	esac ;\
 	./configure $$ARCH_FLAGS --mandir=$${prefix}/share/man \
 		--infodir=$${prefix}/share/info \
-		$(shell echo $(CONFIG_FLAGS)) $(shell echo $(LIBDVDCSS_FLAGS))
+		$(shell echo $(CONFIG_FLAGS)) $(shell echo $(DVDCSS_FLAGS))
 
 	$(MAKE)
 
@@ -57,9 +55,9 @@ install: build
 	# make symlinks for packages and install plugins
 	case $(DEB_BUILD_ARCH) in \
 	i386) \
-		ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa a52 lirc glide" ;; \
+		ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa lirc aa glide" ;; \
 	*) \
-		ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa a52 lirc" ;; \
+		ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa lirc aa" ;; \
 	esac ;\
 	for alias in $$ARCH_ALIASES ; do \
 		ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \
@@ -69,6 +67,7 @@ install: build
 	mv debian/vlc/usr/bin/gvlc debian/vlc-gtk/usr/bin/
 	mv debian/vlc/usr/bin/gnome-vlc debian/vlc-gnome/usr/bin/
 	mv debian/vlc/usr/bin/qvlc debian/vlc-qt/usr/bin/
+	#mv debian/vlc/usr/bin/kvlc debian/vlc-kde/usr/bin/
 
 	mv debian/vlc/$(VIDDIR)/vlc48x48.png debian/vlc/$(PIXDIR)/vlc.png
 	mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/vlc-gtk/$(VIDDIR)/gvlc.xpm
@@ -77,6 +76,8 @@ install: build
 	mv debian/vlc/$(VIDDIR)/gnome-vlc48x48.png debian/vlc-gnome/$(PIXDIR)/gnome-vlc.png
 	mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/vlc-qt/$(VIDDIR)/qvlc.xpm
 	mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/vlc-qt/$(PIXDIR)/qvlc.png
+	#mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/vlc-kde/$(VIDDIR)/kvlc.xpm
+	#mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/vlc-kde/$(PIXDIR)/kvlc.png
 
 	cp debian/vlc.desktop debian/vlc/$(GNOMEDIR)
 	cp debian/gvlc.desktop debian/vlc-gtk/$(GNOMEDIR)
@@ -86,16 +87,7 @@ install: build
 	ln -s vlc.1.gz debian/vlc-gtk/usr/share/man/man1/gvlc.1.gz
 	ln -s vlc.1.gz debian/vlc-gnome/usr/share/man/man1/gnome-vlc.1.gz
 	ln -s vlc.1.gz debian/vlc-qt/usr/share/man/man1/qvlc.1.gz
-
-# libdvdcss start
-	mv debian/vlc/usr/include/videolan/dvdcss.h \
-				debian/libdvdcss$(major)-dev/usr/include/videolan
-	rm -Rf debian/vlc/usr/include
-	mv debian/vlc/usr/lib/*.a debian/libdvdcss$(major)-dev/usr/lib
-	mv debian/vlc/usr/lib/*.so debian/libdvdcss$(major)-dev/usr/lib
-	mv debian/vlc/usr/lib/*.so.* debian/libdvdcss$(major)/usr/lib
-	ln -s libdvdcss$(major) debian/libdvdcss$(major)-dev/usr/share/doc/libdvdcss$(major)-dev
-# libdvdcss stop
+	#ln -s vlc.1.gz debian/vlc-kde/usr/share/man/man1/kvlc.1.gz
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -117,10 +109,7 @@ binary-arch: build install
 	dh_installman doc/vlc.1
 #	dh_installinfo
 #	dh_undocumented
-	dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-arts -Nvlc-mad -Nvlc-lirc -Nvlc-a52 ChangeLog
-# libdvdcss start
-	dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-arts -Nvlc-mad -Nvlc-lirc -Nvlc-a52 ChangeLog.libdvdcss
-# libdvdcss stop
+	dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-arts -Nvlc-mad -Nvlc-lirc -Nvlc-aa ChangeLog
 	dh_link
 	dh_strip
 	dh_compress