r1220 - in /videolan/vlc/debian: libvlc1-dev.links libvlc2-dev.install libvlc2-dev.links libvlccore0-dev.links libvlccore0.links rules

[xtophe-guest at users.alioth.debian.org]

Author: xtophe-guest
Date: Sun Jun  1 20:29:17 2008
New Revision: 1220

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1220
Log:
Second part of libvlc2+libvlccore0

Added:
    videolan/vlc/debian/libvlc2-dev.links
      - copied, changed from r1215, videolan/vlc/debian/libvlc1-dev.links
    videolan/vlc/debian/libvlccore0-dev.links
      - copied, changed from r1215, videolan/vlc/debian/libvlc1-dev.links
    videolan/vlc/debian/libvlccore0.links
Removed:
    videolan/vlc/debian/libvlc1-dev.links
Modified:
    videolan/vlc/debian/libvlc2-dev.install
    videolan/vlc/debian/rules

Modified: videolan/vlc/debian/libvlc2-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/libvlc2-dev.install?rev=1220&op=diff
==============================================================================
--- videolan/vlc/debian/libvlc2-dev.install (original)
+++ videolan/vlc/debian/libvlc2-dev.install Sun Jun  1 20:29:17 2008
@@ -1,6 +1,6 @@
 usr/lib/libvlc.so
 usr/lib/libvlc.a
-usr/lib/pkgconfig/vlc-control.pc
+usr/lib/pkgconfig/libvlc.pc
 usr/include/vlc/*.h
 #usr/include/vlc/common.h
 #usr/include/vlc/deprecated.h

Copied: videolan/vlc/debian/libvlc2-dev.links (from r1215, videolan/vlc/debian/libvlc1-dev.links)
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/libvlc2-dev.links?rev=1220&op=diff
==============================================================================
--- videolan/vlc/debian/libvlc1-dev.links (original)
+++ videolan/vlc/debian/libvlc2-dev.links Sun Jun  1 20:29:17 2008
@@ -1,2 +1,2 @@
-/usr/share/doc/libvlc1 /usr/share/doc/libvlc1-dev
-/usr/share/bug/libvlc1 /usr/share/bug/libvlc1-dev
+/usr/share/doc/libvlc2 /usr/share/doc/libvlc2-dev
+/usr/share/bug/libvlc2 /usr/share/bug/libvlc2-dev

Copied: videolan/vlc/debian/libvlccore0-dev.links (from r1215, videolan/vlc/debian/libvlc1-dev.links)
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/libvlccore0-dev.links?rev=1220&op=diff
==============================================================================
--- videolan/vlc/debian/libvlc1-dev.links (original)
+++ videolan/vlc/debian/libvlccore0-dev.links Sun Jun  1 20:29:17 2008
@@ -1,2 +1,2 @@
-/usr/share/doc/libvlc1 /usr/share/doc/libvlc1-dev
-/usr/share/bug/libvlc1 /usr/share/bug/libvlc1-dev
+/usr/share/doc/libvlc2 /usr/share/doc/libvlccore0-dev
+/usr/share/bug/libvlc2 /usr/share/bug/libvlccore0-dev

Added: videolan/vlc/debian/libvlccore0.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/libvlccore0.links?rev=1220&op=file
==============================================================================
--- videolan/vlc/debian/libvlccore0.links (added)
+++ videolan/vlc/debian/libvlccore0.links Sun Jun  1 20:29:17 2008
@@ -1,0 +1,2 @@
+/usr/share/doc/libvlc2 /usr/share/doc/libvlccore0
+/usr/share/bug/libvlc2 /usr/share/bug/libvlccore0

Modified: videolan/vlc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/rules?rev=1220&op=diff
==============================================================================
--- videolan/vlc/debian/rules (original)
+++ videolan/vlc/debian/rules Sun Jun  1 20:29:17 2008
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
+
+#DH_VERBOSE=1
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
@@ -122,9 +124,12 @@
 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 --no-color  
-endif
-endif
+	./vlc --reset-plugins-cache --list --no-color  
+endif
+endif
+	# As it is the upstream packaging script, we might built from a git tree
+	# Make sure we have ChangeLog
+	$(MAKE) ChangeLog
 	touch $@
 
 clean:
@@ -211,7 +216,7 @@
 	dh_installmenu -s
 	dh_installmime -s
 	dh_installman doc/vlc.1 -p vlc-nox
-	dh_installman doc/vlc-config.1 -p libvlc2-dev
+	dh_installman doc/vlc-config.1 -p libvlccore0-dev
 	dh_installchangelogs ChangeLog -p vlc-nox
 	dh_installchangelogs ChangeLog -p libvlc2
 	dh_desktop