[SCM] vlc/master: Clean up doc dirs

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed Jan 20 22:43:47 UTC 2016 

The following commit has been merged in the master branch:
commit 862bb31e1b5e5d75c758dd3df66649003d35df3b
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Jan 11 23:21:32 2016 +0100

    Clean up doc dirs
    
    * Remove symlinked doc directories.
    * Ship programming examples only in libvlc-dev.
    * Install reportbug control files everywhere.
    * Reduce amount of inter-package dependencies.

diff --git a/debian/libvlccore8.bug-control b/debian/bug-control
similarity index 100%
rename from debian/libvlccore8.bug-control
rename to debian/bug-control
diff --git a/debian/libvlccore8.bug-presubj b/debian/bug-presubj
similarity index 100%
rename from debian/libvlccore8.bug-presubj
rename to debian/bug-presubj
diff --git a/debian/control b/debian/control
index e5e176e..e497534 100644
--- a/debian/control
+++ b/debian/control
@@ -127,6 +127,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/vlc.git
 Package: libvlc-dev
 Section: libdevel
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libvlc5 (= ${binary:Version}), pkg-config, ${misc:Depends}
 Description: development files for libvlc
  This package contains headers and a static library required to build
@@ -139,7 +140,8 @@ Description: development files for libvlc
 Package: libvlc5
 Section: libs
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libvlccore8 (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: multimedia player and streamer library
  This package contains the shared library required by applications using VLC
  features.
@@ -151,6 +153,7 @@ Description: multimedia player and streamer library
 Package: libvlccore-dev
 Section: libdevel
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libvlccore8 (= ${binary:Version}), pkg-config, ${misc:Depends}
 Description: development files for libvlccore
  This package contains headers and a static library required to build plugins
@@ -163,6 +166,7 @@ Description: development files for libvlccore
 Package: libvlccore8
 Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libproxy-tools,
          vlc-data (= ${source:Version}),
          ${misc:Depends},
@@ -176,6 +180,7 @@ Description: base library for VLC and its modules
 
 Package: vlc
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: fonts-freefont-ttf,
          vlc-nox (= ${binary:Version}),
          ${misc:Depends},
@@ -216,7 +221,8 @@ Description: Common data for VLC
 
 Package: vlc-nox
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: libdvdcss2
 Provides: mp3-decoder
 Description: multimedia player and streamer (without X support)
@@ -240,7 +246,6 @@ Description: multimedia player and streamer (without X support)
 Package: vlc-plugin-fluidsynth
 Architecture: any
 Depends: fluid-soundfont-gm | musescore-soundfont-gm,
-         vlc-nox (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Enhances: vlc
@@ -254,7 +259,7 @@ Description: FluidSynth plugin for VLC
 
 Package: vlc-plugin-jack
 Architecture: any
-Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Enhances: vlc
 Description: Jack audio plugins for VLC
  These plugins add support for JACK to the VLC media player. To
@@ -268,7 +273,7 @@ Description: Jack audio plugins for VLC
 
 Package: vlc-plugin-notify
 Architecture: any
-Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Enhances: vlc
 Description: LibNotify plugin for VLC
  This plugin adds support for libnotify track change notification to the
@@ -280,7 +285,7 @@ Description: LibNotify plugin for VLC
 
 Package: vlc-plugin-sdl
 Architecture: any
-Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Enhances: vlc
 Description: SDL video and audio output plugin for VLC
  This plugin adds support for the Simple DirectMedia Layer library to
@@ -294,7 +299,7 @@ Description: SDL video and audio output plugin for VLC
 
 Package: vlc-plugin-svg
 Architecture: any
-Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Enhances: vlc
 Description: SVG plugin for VLC
  This plugin allows you to render SVG graphics on top of the video. It is a text
@@ -308,7 +313,7 @@ Description: SVG plugin for VLC
 
 Package: vlc-plugin-zvbi
 Architecture: any
-Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Enhances: vlc
 Description: VBI teletext plugin for VLC
  This plugin adds support for VBI teletext to the VLC media player.
@@ -319,9 +324,9 @@ Description: VBI teletext plugin for VLC
 
 Package: vlc-plugin-samba
 Architecture: linux-any kfreebsd-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: vlc-nox (<< 2.2.0~pre2-2~)
 Replaces: vlc-nox (<< 2.2.0~pre2-2~)
-Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Enhances: vlc
 Description: Samba plugin for VLC
  This plugin adds support to access Samba shares from the VLC media player.
diff --git a/debian/libvlc-dev.examples b/debian/libvlc-dev.examples
new file mode 100644
index 0000000..4b0149d
--- /dev/null
+++ b/debian/libvlc-dev.examples
@@ -0,0 +1,5 @@
+doc/libvlc/QtPlayer
+doc/libvlc/gtk_player.c
+doc/libvlc/libvlc_DVD_ripper.c
+doc/libvlc/wx_player.cpp
+doc/libvlc/vlc-thumb.c
diff --git a/debian/libvlc-dev.links b/debian/libvlc-dev.links
deleted file mode 100644
index 0217aaf..0000000
--- a/debian/libvlc-dev.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/libvlc5 /usr/share/doc/libvlc-dev
-/usr/share/bug/libvlc5 /usr/share/bug/libvlc-dev
diff --git a/debian/libvlc-dev.maintscript b/debian/libvlc-dev.maintscript
new file mode 100644
index 0000000..d3640d1
--- /dev/null
+++ b/debian/libvlc-dev.maintscript
@@ -0,0 +1 @@
+symlink_to_dir usr/share/doc/libvlc-dev usr/share/doc/libvlc5 2.2.1-6~
diff --git a/debian/libvlc5.links b/debian/libvlc5.links
deleted file mode 100644
index af7f3aa..0000000
--- a/debian/libvlc5.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/libvlccore8 /usr/share/doc/libvlc5
-/usr/share/bug/libvlccore8 /usr/share/bug/libvlc5
diff --git a/debian/libvlccore-dev.links b/debian/libvlccore-dev.links
deleted file mode 100644
index e0c58f8..0000000
--- a/debian/libvlccore-dev.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/libvlccore8 /usr/share/doc/libvlccore-dev
-/usr/share/bug/libvlccore8 /usr/share/bug/libvlccore-dev
diff --git a/debian/libvlccore-dev.maintscript b/debian/libvlccore-dev.maintscript
new file mode 100644
index 0000000..ee186b6
--- /dev/null
+++ b/debian/libvlccore-dev.maintscript
@@ -0,0 +1 @@
+symlink_to_dir usr/share/doc/libvlccore-dev usr/share/doc/libvlccore8 2.2.1-6~
diff --git a/debian/libvlccore8.links b/debian/libvlccore8.links
deleted file mode 100644
index 1490f5d..0000000
--- a/debian/libvlccore8.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/vlc-data /usr/share/doc/libvlccore8
diff --git a/debian/libvlccore8.maintscript b/debian/libvlccore8.maintscript
new file mode 100644
index 0000000..dcaa017
--- /dev/null
+++ b/debian/libvlccore8.maintscript
@@ -0,0 +1 @@
+symlink_to_dir usr/share/doc/libvlccore8 usr/share/doc/vlc-data 2.2.1-6~
diff --git a/debian/rules b/debian/rules
index f90887a..d15663b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,13 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 include /usr/share/dpkg/pkg-info.mk
 include /usr/share/dpkg/architecture.mk
 
+pluginpackages  = fluidsynth
+pluginpackages += jack
+pluginpackages += notify
+pluginpackages += sdl
+pluginpackages += svg
+pluginpackages += zvbi
+
 ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
 confflags += --enable-debug
 endif
@@ -21,7 +28,7 @@ confflags += \
 	--disable-update-check \
 	--enable-fast-install \
 	--prefix=/usr \
-	--docdir=/usr/share/doc/vlc-nox \
+	--docdir=/usr/share/doc/vlc-data \
 	--libdir=/usr/lib \
 	--sysconfdir=/etc \
 	--with-binary-version=$(DEB_VERSION) \
@@ -168,6 +175,7 @@ endif
 # Linux and kFreeBSD specific flags (disabled on Hurd)
 ifeq (,$(filter-out linux kfreebsd,$(DEB_HOST_ARCH_OS)))
 confflags += --enable-libva --enable-vcd --enable-smbclient
+pluginpackages += samba
 else
 confflags += --disable-libva --disable-vcd --disable-smbclient
 removeplugins += cdda libvaapi smbclient vcd
@@ -273,7 +281,11 @@ override_dh_install:
 	rm -f debian/tmp/usr/share/man/man1/vlc-config.1
 	# Remove additional license files
 	find debian/tmp -name LICENSE -delete
-	# Install stuff
+	# Remove examples installed in -dev packages
+	rm -rf debian/tmp/usr/share/doc/vlc-data/libvlc
+	# Contains only a 404 link
+	find debian/tmp -name bugreport-howto.txt -delete
+	# Install
 	dh_install --fail-missing
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	# Check that we did not install a plugin linked with libX11 or
@@ -296,13 +308,15 @@ endif
 override_dh_strip:
 	dh_strip --ddeb-migration='vlc-dbg (<< 2.2.1-6)'
 
-override_dh_installdocs:
-	dh_installdocs -p vlc-data
-	dh_installdocs -p vlc-nox
-
 override_dh_installchangelogs:
-	dh_installchangelogs NEWS -p vlc-data
-	dh_installchangelogs NEWS -p vlc-nox
+	dh_installchangelogs NEWS $(pluginpackages:%=-Nvlc-plugin-%)
+
+override_dh_installdocs:
+	dh_installdocs $(pluginpackages:%=-Nvlc-plugin-%)
+	dh_installdocs --link-doc=libvlccore8 --remaining-packages
 
 override_dh_makeshlibs:
 	dh_makeshlibs -Xusr/lib/vlc/libvlc_vdpau
+
+override_dh_bugfiles:
+	dh_bugfiles -A
diff --git a/debian/vlc-data.install b/debian/vlc-data.install
index 0bd59ba..357b0a0 100644
--- a/debian/vlc-data.install
+++ b/debian/vlc-data.install
@@ -1,4 +1,4 @@
-usr/share/doc
+usr/share/doc/vlc-data
 usr/share/icons
 usr/share/locale
 usr/share/vlc
diff --git a/debian/vlc-nox.links b/debian/vlc-nox.links
index 1cb6abf..6f94ada 100644
--- a/debian/vlc-nox.links
+++ b/debian/vlc-nox.links
@@ -1,4 +1,3 @@
-/usr/share/bug/libvlccore8 /usr/share/bug/vlc-nox
 /usr/share/man/man1/vlc.1.gz /usr/share/man/man1/cvlc.1.gz
 /usr/share/man/man1/vlc.1.gz /usr/share/man/man1/rvlc.1.gz
 /usr/share/man/man1/vlc.1.gz /usr/share/man/man1/nvlc.1.gz
diff --git a/debian/vlc-plugin-fluidsynth.links b/debian/vlc-plugin-fluidsynth.links
deleted file mode 100644
index d0e00e5..0000000
--- a/debian/vlc-plugin-fluidsynth.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-fluidsynth
-/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-fluidsynth
diff --git a/debian/vlc-plugin-jack.links b/debian/vlc-plugin-jack.links
deleted file mode 100644
index bb2f5bb..0000000
--- a/debian/vlc-plugin-jack.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-jack
-/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-jack
diff --git a/debian/vlc-plugin-notify.links b/debian/vlc-plugin-notify.links
deleted file mode 100644
index 2f5ed0b..0000000
--- a/debian/vlc-plugin-notify.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-notify
-/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-notify
diff --git a/debian/vlc-plugin-samba.links b/debian/vlc-plugin-samba.links
deleted file mode 100644
index 11bdbd9..0000000
--- a/debian/vlc-plugin-samba.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-samba
-/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-samba
diff --git a/debian/vlc-plugin-sdl.links b/debian/vlc-plugin-sdl.links
deleted file mode 100644
index 530b58c..0000000
--- a/debian/vlc-plugin-sdl.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-sdl
-/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-sdl
diff --git a/debian/vlc-plugin-svg.links b/debian/vlc-plugin-svg.links
deleted file mode 100644
index e625341..0000000
--- a/debian/vlc-plugin-svg.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-svg
-/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-svg
diff --git a/debian/vlc-plugin-zvbi.links b/debian/vlc-plugin-zvbi.links
deleted file mode 100644
index a2d172d..0000000
--- a/debian/vlc-plugin-zvbi.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-zvbi
-/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-zvbi
diff --git a/debian/vlc.links b/debian/vlc.links
index 726f71d..a406a23 100644
--- a/debian/vlc.links
+++ b/debian/vlc.links
@@ -1,4 +1,2 @@
-/usr/share/bug/vlc-nox /usr/share/bug/vlc
-/usr/share/doc/vlc-nox /usr/share/doc/vlc
 /usr/share/man/man1/vlc.1.gz /usr/share/man/man1/svlc.1.gz
 /usr/share/man/man1/vlc.1.gz /usr/share/man/man1/qvlc.1.gz
diff --git a/debian/vlc.maintscript b/debian/vlc.maintscript
new file mode 100644
index 0000000..2f548bb
--- /dev/null
+++ b/debian/vlc.maintscript
@@ -0,0 +1 @@
+symlink_to_dir usr/share/doc/vlc usr/share/doc/vlc-nox 2.2.1-6~

-- 
VLC media player packaging

More information about the pkg-multimedia-commits mailing list