* Updated changelog.

[vlc] / debian / rules

diff --git a/debian/rules b/debian/rules
index 22f28e02dbb2ef642102f27812a07ed5490c2acd..5940d425cd57a89badee30aaddee143b986d2a00 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,15 @@
 export DH_COMPAT=3
 
 # Compilation options
-export CONFIG_FLAGS="--prefix=/usr --enable-gnome --enable-gtk --enable-fb --with-ggi --with-sdl --enable-esd --enable-qt"
+export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --with-ggi --enable-sdl --enable-esd --enable-qt --with-mad"
 export LIBDVDCSS_FLAGS="--with-dvdcss=local-shared"
 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 | cut -f2 -d=)
-major=$(shell echo $(version) | cut -f1 -d.)
+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:
@@ -59,11 +59,11 @@ install: build
        # make symlinks for packages and install plugins
        case $(DEB_BUILD_ARCH) in \
        i386) \
-               ARCH_ALIASES="ggi gtk gnome esd sdl qt alsa glide" ;; \
+               ARCH_ALIASES="ggi gtk gnome esd sdl qt mad alsa glide" ;; \
        alpha|ia64|m68k|powerpc) \
-               ARCH_ALIASES="ggi gtk gnome esd sdl qt alsa" ;; \
+               ARCH_ALIASES="ggi gtk gnome esd sdl qt mad alsa" ;; \
        *) \
-               ARCH_ALIASES="ggi gtk gnome esd sdl qt" ;; \
+               ARCH_ALIASES="ggi gtk gnome esd sdl qt mad" ;; \
        esac ;\
        for alias in $$ARCH_ALIASES ; do \
                ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \
@@ -93,13 +93,12 @@ install: build
 
 # libdvdcss start
        mv debian/vlc/usr/include/videolan/dvdcss.h \
-                               debian/libdvdcss$(version)-dev/usr/include/videolan
-       rmdir debian/vlc/usr/include/videolan
-       rmdir debian/vlc/usr/include
-       mv debian/vlc/usr/lib/*.a debian/libdvdcss$(version)-dev/usr/lib
-       mv debian/vlc/usr/lib/*.so debian/libdvdcss$(version)-dev/usr/lib
-       mv debian/vlc/usr/lib/*.so.* debian/libdvdcss$(version)/usr/lib
-       ln -s libdvdcss$(version) debian/libdvdcss$(version)-dev/usr/share/doc/libdvdcss$(version)-dev
+                               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
 
 # Build architecture-independent files here.
@@ -122,9 +121,9 @@ 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 ChangeLog
+       dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-mad ChangeLog
 # libdvdcss start
-       dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt ChangeLog.libdvdcss
+       dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-mad ChangeLog.libdvdcss
 # libdvdcss stop
        dh_link
        dh_strip