r1016 - in /unstable/vlc/debian: changelog control rules

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Jan 11 17:21:07 2008
New Revision: 1016

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1016
Log:
* Add /svn to Vcs-Svn.
* Don't run ./vlc as a test if nocheck is given.
* Cleanup rules.

Modified:
    unstable/vlc/debian/changelog
    unstable/vlc/debian/control
    unstable/vlc/debian/rules

Modified: unstable/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/changelog?rev=1016&op=diff
==============================================================================
--- unstable/vlc/debian/changelog (original)
+++ unstable/vlc/debian/changelog Fri Jan 11 17:21:07 2008
@@ -24,6 +24,9 @@
     differ.
   * Pass --quiltrc /dev/null to quilt and use $(QUILT) to invoke quilt.
   * Bump up Debhelper compatibility level to 6; drop dpkg-dev build-dep.
+  * Add /svn to Vcs-Svn.
+  * Don't run ./vlc as a test if nocheck is given.
+  * Cleanup rules.
 
  -- Loic Minier <lool at dooz.org>  Fri, 11 Jan 2008 17:32:36 +0100
 

Modified: unstable/vlc/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/control?rev=1016&op=diff
==============================================================================
--- unstable/vlc/debian/control (original)
+++ unstable/vlc/debian/control Fri Jan 11 17:21:07 2008
@@ -81,7 +81,7 @@
                libjack-dev
 Standards-Version: 3.7.3
 Homepage: http://www.videolan.org/vlc
-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/vlc
+Vcs-Svn: svn://svn.debian.org/svn/pkg-multimedia/unstable/vlc
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/
 
 Package: vlc

Modified: unstable/vlc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/rules?rev=1016&op=diff
==============================================================================
--- unstable/vlc/debian/rules (original)
+++ unstable/vlc/debian/rules Fri Jan 11 17:21:07 2008
@@ -1,13 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules for the VLC media player - uses debhelper.
-# $Id$
-# based on Joey Hess's one.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
+
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -22,9 +14,7 @@
 # how to call quilt
 QUILT := QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
 
-#
-# Compilation options
-#
+# configure flags
 confflags += --enable-release --prefix=/usr
 confflags += \
 	--enable-libtool \
@@ -87,7 +77,7 @@
 	--disable-x264 \
 	$(NULL)
 
-# These ones are only for Linux
+# Linux specific flags
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 confflags += --enable-alsa --enable-dv --enable-v4l --enable-pvr
 endif
@@ -106,8 +96,8 @@
 confflags += --enable-dvd --without-dvdcss
 
 # A few shortcuts
-VIDDIR = usr/share/vlc
-PIXDIR = usr/share/pixmaps
+VIDDIR := usr/share/vlc
+PIXDIR := usr/share/pixmaps
 
 build: build-stamp
 build-stamp:
@@ -118,17 +108,19 @@
 	cp src/.libs/libvlc.a src/libvlc.a
 	./configure --mandir=$${prefix}/share/man $(confflags)
 	$(MAKE)
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	# Check which plugins were built and whether they load properly.
 	./vlc --reset-plugins-cache -l -I rc vlc:quit
 endif
-	touch build-stamp
+endif
+	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
 	sed -e '/lib\(alsa\|dvb\|v4l\|pvr\)_/d' debian/vlc-nox.install \
-	  > debian/vlc-nox.install.kfreebsd-i386
+	  >debian/vlc-nox.install.kfreebsd-i386
 	cp debian/vlc-nox.install.kfreebsd-i386 \
 	  debian/vlc-nox.install.kfreebsd-amd64
 	rm -f build-stamp
@@ -151,7 +143,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp/
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
 	cp src/libvlc.a debian/tmp/usr/lib
 	# Clean up libtool crap
 	find debian/tmp -name '*.la' -exec rm '{}' ';'
@@ -219,5 +211,4 @@
 	dh_builddeb -s
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
+.PHONY: build clean install binary-indep binary-arch binary