[SCM] vlc/experimental: Package clean up

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Thu Mar 23 15:44:21 UTC 2017 

The following commit has been merged in the experimental branch:
commit b4d805250529d1ff085f20c3243b699c58c6e2e8
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Mar 23 16:43:27 2017 +0100

    Package clean up
    
    * Remove vlc-nox.
    * Remove maintscripts for symlink_to_dir conversions.
    * Update tests for new package layout.

diff --git a/debian/control b/debian/control
index 667b3d9..01de4b6 100644
--- a/debian/control
+++ b/debian/control
@@ -227,8 +227,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Recommends: libproxy-tools
-Breaks: vlc-nox (<< 2.2.4-7~),
-        vlc (<< 2.2.4-7~)
+Breaks: vlc (<< 2.2.4-7~)
 Description: base library for VLC and its modules
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
  DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs,
@@ -241,8 +240,6 @@ Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Breaks: vlc-nox (<< 2.2.4-7~)
-Replaces: vlc-nox (<< 2.2.4-7~)
 Description: tools for VLC's base library
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
  DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs,
@@ -255,8 +252,6 @@ Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libvlc-bin (= ${binary:Version})
-Breaks: vlc-nox (<< 2.2.4-7~)
-Replaces: vlc-nox (<< 2.2.4-7~)
 Description: binaries from VLC
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
  DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs,
@@ -496,15 +491,3 @@ Description: Samba plugin for VLC
  podcasts, and multimedia streams from various network sources.
  .
  This plugin adds support to access Samba shares from the VLC media player.
-
-Package: vlc-nox
-Architecture: any
-Section: oldlibs
-Priority: extra
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
-         vlc-plugin-base (= ${binary:Version}),
-         vlc-bin (= ${binary:Version})
-Description: transitional dummy package
- This is a transitional dummy package for vlc-bin and vlc-plugin-base. This
- package can safely be removed.
diff --git a/debian/libvlc-dev.maintscript b/debian/libvlc-dev.maintscript
deleted file mode 100644
index 5aceb56..0000000
--- a/debian/libvlc-dev.maintscript
+++ /dev/null
@@ -1,2 +0,0 @@
-symlink_to_dir /usr/share/doc/libvlc-dev libvlc5 2.2.5-1~z
-symlink_to_dir /usr/share/bug/libvlc-dev libvlc5 2.2.5-1~z
diff --git a/debian/libvlc5.maintscript b/debian/libvlc5.maintscript
deleted file mode 100644
index f3a8313..0000000
--- a/debian/libvlc5.maintscript
+++ /dev/null
@@ -1,2 +0,0 @@
-symlink_to_dir /usr/share/doc/libvlc5 libvlccore8 2.2.5-1~z
-symlink_to_dir /usr/share/bug/libvlc5 libvlccore8 2.2.5-1~z
diff --git a/debian/libvlccore-dev.maintscript b/debian/libvlccore-dev.maintscript
deleted file mode 100644
index 2f1c5a6..0000000
--- a/debian/libvlccore-dev.maintscript
+++ /dev/null
@@ -1,2 +0,0 @@
-symlink_to_dir /usr/share/doc/libvlccore-dev libvlccore8 2.2.5-1~z
-symlink_to_dir /usr/share/bug/libvlccore-dev libvlccore8 2.2.5-1~z
diff --git a/debian/libvlccore8.maintscript b/debian/libvlccore8.maintscript
deleted file mode 100644
index c8e0e00..0000000
--- a/debian/libvlccore8.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/doc/libvlccore8 vlc-data 2.2.5-1~z
diff --git a/debian/tests/control b/debian/tests/control
index c79b198..138cfad 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
-Tests: vlc-nox
-Depends: vlc-nox
+Tests: vlc-bin
+Depends: vlc-bin
 Restrictions: allow-stderr
 
 Tests: vlc
@@ -15,5 +15,8 @@ Depends:
  vlc-plugin-sdl,
  vlc-plugin-svg,
  vlc-plugin-zvbi,
- vlc-plugin-samba
+ vlc-plugin-samba,
+ vlc-plugin-skins2,
+ vlc-plugin-video-splitter,
+ vlc-plugin-visualization
 Restrictions: allow-stderr
diff --git a/debian/tests/vlc-nox b/debian/tests/vlc-bin
similarity index 100%
rename from debian/tests/vlc-nox
rename to debian/tests/vlc-bin
diff --git a/debian/vlc-nox.maintscript b/debian/vlc-nox.maintscript
deleted file mode 100644
index 7e77d19..0000000
--- a/debian/vlc-nox.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/bug/vlc-nox libvlccore8 2.2.5-1~z
diff --git a/debian/vlc-plugin-fluidsynth.maintscript b/debian/vlc-plugin-fluidsynth.maintscript
deleted file mode 100644
index c2aa1c6..0000000
--- a/debian/vlc-plugin-fluidsynth.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/bug/vlc-plugin-fluidsynth vlc-nox 2.2.5-1~z
diff --git a/debian/vlc-plugin-jack.maintscript b/debian/vlc-plugin-jack.maintscript
deleted file mode 100644
index 079f1da..0000000
--- a/debian/vlc-plugin-jack.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/bug/vlc-plugin-jack vlc-nox 2.2.5-1~z
diff --git a/debian/vlc-plugin-notify.maintscript b/debian/vlc-plugin-notify.maintscript
deleted file mode 100644
index 438ea00..0000000
--- a/debian/vlc-plugin-notify.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/bug/vlc-plugin-notify vlc-nox 2.2.5-1~z
diff --git a/debian/vlc-plugin-samba.maintscript b/debian/vlc-plugin-samba.maintscript
deleted file mode 100644
index 8fe6b8c..0000000
--- a/debian/vlc-plugin-samba.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/bug/vlc-plugin-samba vlc-nox 2.2.5-1~z
diff --git a/debian/vlc-plugin-sdl.maintscript b/debian/vlc-plugin-sdl.maintscript
deleted file mode 100644
index 6b8aadb..0000000
--- a/debian/vlc-plugin-sdl.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/bug/vlc-plugin-sdl vlc-nox 2.2.5-1~z
diff --git a/debian/vlc-plugin-svg.maintscript b/debian/vlc-plugin-svg.maintscript
deleted file mode 100644
index 5405592..0000000
--- a/debian/vlc-plugin-svg.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/bug/vlc-plugin-svg vlc-nox 2.2.5-1~z
diff --git a/debian/vlc-plugin-zvbi.maintscript b/debian/vlc-plugin-zvbi.maintscript
deleted file mode 100644
index 455516e..0000000
--- a/debian/vlc-plugin-zvbi.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/bug/vlc-plugin-zvbi vlc-nox 2.2.5-1~z
diff --git a/debian/vlc.maintscript b/debian/vlc.maintscript
deleted file mode 100644
index 08f8d63..0000000
--- a/debian/vlc.maintscript
+++ /dev/null
@@ -1,2 +0,0 @@
-symlink_to_dir /usr/share/doc/vlc vlc-nox 2.2.5-1~z
-symlink_to_dir /usr/share/bug/vlc vlc-nox 2.2.5-1~z

-- 
VLC media player packaging

More information about the pkg-multimedia-commits mailing list