[neon/backports-focal/pipewire/Neon/release-lts] debian: run wrap-and-sort

Sjoerd Simons null at kde.org
Fri Mar 26 13:47:04 GMT 2021


Git commit b736c5c9b36af85e2679c4de03fd24e8092d7b3a by Sjoerd Simons.
Committed on 19/03/2021 at 15:57.
Pushed by sitter into branch 'Neon/release-lts'.

run wrap-and-sort

M  +25   -33   debian/control
M  +3    -3    debian/libspa-0.2-modules.install
M  +2    -2    debian/pipewire-bin.install
M  +2    -2    debian/pipewire.install
M  +3    -10   debian/tests/control

https://invent.kde.org/neon/backports-focal/pipewire/commit/b736c5c9b36af85e2679c4de03fd24e8092d7b3a

diff --git a/debian/control b/debian/control
index bd3bc272..f08bb553 100644
--- a/debian/control
+++ b/debian/control
@@ -37,10 +37,10 @@ Homepage: https://pipewire.org/
 Package: libpipewire-0.3-0
 Architecture: linux-any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libspa-0.2-modules (= ${binary:Version}),
-Recommends: pipewire (= ${binary:Version}),
+Depends: libspa-0.2-modules (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: pipewire (= ${binary:Version})
 Description: libraries for the PipeWire multimedia server
  PipeWire is a server and user space API to deal with multimedia
  pipelines. This includes:
@@ -54,10 +54,10 @@ Package: libpipewire-0.3-dev
 Section: libdevel
 Architecture: linux-any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         libpipewire-0.3-0 (= ${binary:Version}),
+Depends: libpipewire-0.3-0 (= ${binary:Version}),
          libspa-0.2-dev (= ${binary:Version}),
-Suggests: pipewire-doc,
+         ${misc:Depends}
+Suggests: pipewire-doc
 Description: libraries for the PipeWire multimedia server - development
  PipeWire is a server and user space API to deal with multimedia
  pipelines. This includes:
@@ -72,8 +72,7 @@ Description: libraries for the PipeWire multimedia server - development
 Package: libpipewire-0.3-modules
 Architecture: linux-any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: pipewire (<< 0.3.5)
 Replaces: pipewire (<< 0.3.5)
 Description: libraries for the PipeWire multimedia server - modules
@@ -94,7 +93,7 @@ Section: libdevel
 Architecture: linux-any
 Multi-Arch: same
 Depends: ${misc:Depends}
-Suggests: pipewire-doc,
+Suggests: pipewire-doc
 Description: libraries for the PipeWire multimedia server Simple Plugin API - development
  PipeWire is a server and user space API to deal with multimedia
  pipelines. This includes:
@@ -109,8 +108,7 @@ Description: libraries for the PipeWire multimedia server Simple Plugin API - de
 Package: libspa-0.2-modules
 Architecture: linux-any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: pipewire (<< 0.3.5)
 Replaces: pipewire (<< 0.3.5)
 Description: libraries for the PipeWire multimedia server Simple Plugin API - modules
@@ -150,10 +148,10 @@ Package: pipewire
 Section: video
 Architecture: linux-any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libpipewire-0.3-modules (= ${binary:Version}),
+Depends: libpipewire-0.3-modules (= ${binary:Version}),
          pipewire-bin (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: audio and video processing engine multimedia server
  PipeWire is a server and user space API to deal with multimedia
  pipelines. This includes:
@@ -171,9 +169,9 @@ Package: pipewire-bin
 Section: video
 Architecture: linux-any
 Multi-Arch: foreign
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libpipewire-0.3-modules (= ${binary:Version}),
+Depends: libpipewire-0.3-modules (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: pipewire (<< 0.3.5)
 Replaces: pipewire (<< 0.3.5)
 Description: PipeWire multimedia server - programs
@@ -192,9 +190,7 @@ Description: PipeWire multimedia server - programs
 Package: pipewire-audio-client-libraries
 Architecture: linux-any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         pipewire (= ${binary:Version}),
+Depends: pipewire (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}
 Breaks: pipewire (<< 0.3.5)
 Replaces: pipewire (<< 0.3.5)
@@ -214,9 +210,7 @@ Description: PipeWire multimedia server - audio client libraries
 
 Package: pipewire-tests
 Architecture: linux-any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         pipewire (= ${binary:Version}),
+Depends: pipewire (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Section: misc
 Description: PipeWire multimedia server - tests and examples
  PipeWire is a server and user space API to deal with multimedia
@@ -232,9 +226,7 @@ Description: PipeWire multimedia server - tests and examples
 Package: gstreamer1.0-pipewire
 Architecture: linux-any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         pipewire (= ${binary:Version}),
+Depends: pipewire (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: GStreamer 1.0 plugin for the PipeWire multimedia server
  PipeWire is a server and user space API to deal with multimedia
  pipelines. This includes:
@@ -250,9 +242,9 @@ Description: GStreamer 1.0 plugin for the PipeWire multimedia server
 Package: libspa-0.2-bluetooth
 Architecture: linux-any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libspa-0.2-modules (= ${binary:Version}),
+Depends: libspa-0.2-modules (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: libraries for the PipeWire multimedia server - bluetooth plugins
  PipeWire is a server and user space API to deal with multimedia
  pipelines. This includes:
@@ -270,9 +262,9 @@ Description: libraries for the PipeWire multimedia server - bluetooth plugins
 Package: libspa-0.2-jack
 Architecture: linux-any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libspa-0.2-modules (= ${binary:Version}),
+Depends: libspa-0.2-modules (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: libraries for the PipeWire multimedia server - JACK client
  PipeWire is a server and user space API to deal with multimedia
  pipelines. This includes:
diff --git a/debian/libspa-0.2-modules.install b/debian/libspa-0.2-modules.install
index 6c8f094b..db458c60 100644
--- a/debian/libspa-0.2-modules.install
+++ b/debian/libspa-0.2-modules.install
@@ -1,11 +1,11 @@
 usr/lib/*/spa-0.2/alsa
+usr/lib/*/spa-0.2/audioconvert
 usr/lib/*/spa-0.2/audiomixer
 usr/lib/*/spa-0.2/audiotestsrc
+usr/lib/*/spa-0.2/control
 usr/lib/*/spa-0.2/support
 usr/lib/*/spa-0.2/test
 usr/lib/*/spa-0.2/v4l2
+usr/lib/*/spa-0.2/videoconvert
 usr/lib/*/spa-0.2/videotestsrc
 usr/lib/*/spa-0.2/volume
-usr/lib/*/spa-0.2/control
-usr/lib/*/spa-0.2/audioconvert
-usr/lib/*/spa-0.2/videoconvert
diff --git a/debian/pipewire-bin.install b/debian/pipewire-bin.install
index b4ad4cb6..536a9b42 100644
--- a/debian/pipewire-bin.install
+++ b/debian/pipewire-bin.install
@@ -1,12 +1,12 @@
-etc/pipewire/client.conf
 etc/pipewire/client-rt.conf
+etc/pipewire/client.conf
 etc/pipewire/jack.conf
 etc/pipewire/media-session.d/alsa-monitor.conf
 etc/pipewire/media-session.d/bluez-monitor.conf
 etc/pipewire/media-session.d/media-session.conf
 etc/pipewire/media-session.d/v4l2-monitor.conf
-etc/pipewire/pipewire.conf
 etc/pipewire/pipewire-pulse.conf
+etc/pipewire/pipewire.conf
 lib/udev/rules.d
 usr/bin/pipewire
 usr/bin/pipewire-media-session
diff --git a/debian/pipewire.install b/debian/pipewire.install
index 75b3cd03..2a03161d 100644
--- a/debian/pipewire.install
+++ b/debian/pipewire.install
@@ -1,5 +1,5 @@
-usr/lib/systemd/user/pipewire.service
-usr/lib/systemd/user/pipewire.socket
 usr/lib/systemd/user/pipewire-media-session.service
 usr/lib/systemd/user/pipewire-pulse.service usr/share/doc/pipewire/examples/systemd/user
 usr/lib/systemd/user/pipewire-pulse.socket usr/share/doc/pipewire/examples/systemd/user
+usr/lib/systemd/user/pipewire.service
+usr/lib/systemd/user/pipewire.socket
diff --git a/debian/tests/control b/debian/tests/control
index 9edcd1c2..b92c7fcd 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,17 +1,10 @@
 Tests: gnome-desktop-testing
-Depends:
- gnome-desktop-testing,
- pipewire-tests,
+Depends: gnome-desktop-testing, pipewire-tests
 
 Tests: gstreamer1.0-pipewire
 Restrictions: allow-stderr, superficial
-Depends:
- gstreamer1.0-pipewire,
- gstreamer1.0-tools,
+Depends: gstreamer1.0-pipewire, gstreamer1.0-tools
 
 Tests: libpipewire-0.3-dev
 Restrictions: allow-stderr, superficial
-Depends:
- build-essential,
- libpipewire-0.3-dev,
- pkg-config,
+Depends: build-essential, libpipewire-0.3-dev, pkg-config



More information about the Neon-commits mailing list