Debian: Restore packaging

debian/control

@@ -2,163 +2,127 @@ Source: muffin
 Section: x11
 Priority: optional
 Maintainer: Linux Mint <root@linuxmint.com>
-Build-Depends: debhelper-compat (= 12),
-               dh-sequence-gir,
-               at-spi2-core <!nocheck>,
-               adwaita-icon-theme <!nocheck>,
-               dbus <!nocheck>,
-               dmz-cursor-theme <!nocheck>,
-               gnome-control-center-data,
-               gnome-pkg-tools (>= 0.10),
-               gnome-settings-daemon-common <!nocheck>,
-               gobject-introspection (>= 1.41.3),
-               gsettings-desktop-schemas-dev (>= 3.33.0),
-               gtk-doc-tools (>= 1.15),
-               libcairo2-dev (>= 1.10.0),
-               libcanberra-gtk3-dev,
-               libdrm-dev (>= 2.4.83) [linux-any],
-               libegl-dev,
-               libegl1-mesa-dev (>= 17) [linux-any],
-               libfribidi-dev (>= 1.0.0),
-               libgbm-dev (>= 10.3) [linux-any],
-               libgirepository1.0-dev (>= 0.9.12),
-               libgl1-mesa-dev (>= 7.1~rc3-1~),
-               libgles2-mesa-dev (>= 7.1~rc3-1~) | libgles2-dev,
-               libglib2.0-dev (>= 2.61.1),
-               libcinnamon-desktop-dev,
-               libgraphene-1.0-dev (>= 1.9.3),
-               libgtk-3-dev (>= 3.19.8),
-               libgudev-1.0-dev (>= 232) [linux-any],
-               libice-dev,
-               libinput-dev (>= 1.7) [linux-any],
-               libjson-glib-dev (>= 0.13.2-1~),
-               libnvidia-egl-wayland-dev [linux-any],
-               libpam0g-dev,
-               libpango1.0-dev (>= 1.2.0),
-               libpipewire-0.2-dev (>= 0.2.2) [linux-any],
-               libsm-dev,
-               libstartup-notification0-dev (>= 0.7),
-               libsystemd-dev (>= 212) [linux-any],
-               libwacom-dev (>= 0.13) [linux-any],
-               libwayland-dev (>= 1.13.0) [linux-any],
-               libxau-dev,
-               libx11-dev,
-               libx11-xcb-dev,
-               libxcb-randr0-dev,
-               libxcb-res0-dev,
-               libxcomposite-dev (>= 1:0.4),
-               libxcursor-dev,
-               libxdamage-dev,
-               libxext-dev,
-               libxfixes-dev,
-               libxi-dev (>= 2:1.7.4),
-               libxinerama-dev,
-               libxkbcommon-dev (>= 0.4.3),
-               libxkbcommon-x11-dev,
-               libxkbfile-dev,
-               libxrandr-dev,
-               libxrender-dev,
-               libxt-dev,
-               meson (>= 0.50),
-               pkg-config (>= 0.22),
-               wayland-protocols (>= 1.19) [linux-any],
-               xauth <!nocheck>,
-               xkb-data,
-               xserver-xorg-core [linux-any],
-               xvfb <!nocheck>,
-               xwayland [linux-any],
-               zenity
+Build-Depends:
+        debhelper-compat (= 12),
+        dh-sequence-gir,
+        at-spi2-core <!nocheck>,
+        adwaita-icon-theme <!nocheck>,
+        dbus <!nocheck>,
+        dmz-cursor-theme <!nocheck>,
+        gnome-control-center-data,
+        gnome-pkg-tools (>= 0.10),
+        gnome-settings-daemon-common <!nocheck>,
+        gobject-introspection (>= 1.41.3),
+        gsettings-desktop-schemas-dev (>= 3.33.0),
+        gtk-doc-tools (>= 1.15),
+        libcairo2-dev (>= 1.10.0),
+        libcanberra-gtk3-dev,
+        libdrm-dev (>= 2.4.83) [linux-any],
+        libegl-dev,
+        libegl1-mesa-dev (>= 17) [linux-any],
+        libfribidi-dev (>= 1.0.0),
+        libgbm-dev (>= 10.3) [linux-any],
+        libgirepository1.0-dev (>= 0.9.12),
+        libgl1-mesa-dev (>= 7.1~rc3-1~),
+        libgles2-mesa-dev (>= 7.1~rc3-1~) | libgles2-dev,
+        libglib2.0-dev (>= 2.61.1),
+        libcinnamon-desktop-dev,
+        libgraphene-1.0-dev (>= 1.9.3),
+        libgtk-3-dev (>= 3.19.8),
+        libgudev-1.0-dev (>= 232) [linux-any],
+        libice-dev,
+        libinput-dev (>= 1.7) [linux-any],
+        libjson-glib-dev (>= 0.13.2-1~),
+        libnvidia-egl-wayland-dev [linux-any],
+        libpam0g-dev,
+        libpango1.0-dev (>= 1.2.0),
+        libpipewire-0.2-dev (>= 0.2.2) [linux-any],
+        libsm-dev,
+        libstartup-notification0-dev (>= 0.7),
+        libsystemd-dev (>= 212) [linux-any],
+        libwacom-dev (>= 0.13) [linux-any],
+        libwayland-dev (>= 1.13.0) [linux-any],
+        libxau-dev,
+        libx11-dev,
+        libx11-xcb-dev,
+        libxcb-randr0-dev,
+        libxcb-res0-dev,
+        libxcomposite-dev (>= 1:0.4),
+        libxcursor-dev,
+        libxdamage-dev,
+        libxext-dev,
+        libxfixes-dev,
+        libxi-dev (>= 2:1.7.4),
+        libxinerama-dev,
+        libxkbcommon-dev (>= 0.4.3),
+        libxkbcommon-x11-dev,
+        libxkbfile-dev,
+        libxrandr-dev,
+        libxrender-dev,
+        libxt-dev,
+        meson (>= 0.50),
+        pkg-config (>= 0.22),
+        wayland-protocols (>= 1.19) [linux-any],
+        xauth <!nocheck>,
+        xkb-data,
+        xserver-xorg-core [linux-any],
+        xvfb <!nocheck>,
+        xwayland [linux-any],
+        zenity
 Rules-Requires-Root: no
 Standards-Version: 4.5.0
 
-Package: muffin
-Architecture: any
-Depends: adwaita-icon-theme,
-         gnome-settings-daemon-common,
-         gsettings-desktop-schemas (>= 3.33.0),
-         muffin-common (>= ${source:Version}),
-         zenity,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Provides: x-window-manager
-Suggests: gnome-control-center (>= 1:3.25.2),
-          xdg-user-dirs
-Description: Example window manager using GNOME's window manager library
- Mutter is a Wayland display server and X11 window manager and
- compositor library. It contains functionality related to, among other
- things, window management, window compositing, focus tracking, workspace
- management, keybindings and monitor configuration.
- .
- Internally it uses a fork of Cogl, a hardware acceleration abstraction
- library used to simplify usage of OpenGL pipelines, as well as a fork
- of Clutter, a scene graph and user interface toolkit.
- .
- This package contains the muffin executable. It can be used as a
- standalone window manager, but is primarily intended for debugging.
-
 Package: gir1.2-meta-muffin-0.0
 Section: introspection
 Architecture: any
-Multi-Arch: same
+Breaks: gir1.2-muffin-3.0
+Replaces: gir1.2-muffin-3.0
 Depends: libmuffin0 (= ${binary:Version}),
          ${gir:Depends},
          ${misc:Depends},
          ${shlibs:Depends}
-Description: GObject introspection data for Mutter
- Mutter is a Wayland display server and X11 window manager and
- compositor library. It contains functionality related to, among other
- things, window management, window compositing, focus tracking, workspace
- management, keybindings and monitor configuration.
- .
- Internally it uses a fork of Cogl, a hardware acceleration abstraction
- library used to simplify usage of OpenGL pipelines, as well as a fork
- of Clutter, a scene graph and user interface toolkit.
+Description: GObject introspection data for Muffin
+ Muffin is a window manager performing compositing as well based on
+ GTK+ and Clutter and used in Cinnamon desktop environment.
  .
  This package contains the GObject introspection data which may be
  used to generate dynamic bindings.
 
 Package: libmuffin0
 Section: libs
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: adwaita-icon-theme,
-         gsettings-desktop-schemas (>= 3.33.0),
-         muffin-common (>= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
 Replaces: libmuffin-dev
-Breaks: apparmor (<< 2.13.3-5~),
-        gnome-control-center (<< 1:3.25.2),
-        gnome-settings-daemon (<< 3.31.91),
-        gnome-shell (<< 3.36)
-Description: window manager library from the Mutter window manager
- Mutter is a Wayland display server and X11 window manager and
- compositor library. It contains functionality related to, among other
- things, window management, window compositing, focus tracking, workspace
- management, keybindings and monitor configuration.
+Pre-Depends: ${misc:Pre-Depends}
+Depends: muffin-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: window and compositing manager (shared library)
+ Muffin is a window manager performing compositing as well based on
+ GTK+ and Clutter and used in Cinnamon desktop environment.
  .
- Internally it uses a fork of Cogl, a hardware acceleration abstraction
- library used to simplify usage of OpenGL pipelines, as well as a fork
- of Clutter, a scene graph and user interface toolkit.
+ This package contains the shared library.
+
+Package: muffin
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ muffin-common (= ${source:Version}),
+ zenity,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Provides: x-window-manager
+Suggests: gnome-themes, xdg-user-dirs
+Description: window and compositing manager
+ Muffin is a window manager performing compositing as well based on
+ GTK+ and Clutter and used in Cinnamon desktop environment.
  .
- This package contains the window manager shared library, used by muffin
- itself, and gnome-shell.
+ This package contains the core binaries.
 
 Package: muffin-common
 Section: misc
 Architecture: all
-Multi-Arch: foreign
 Depends: ${misc:Depends}
-Description: shared files for the Mutter window manager
- Mutter is a Wayland display server and X11 window manager and
- compositor library. It contains functionality related to, among other
- things, window management, window compositing, focus tracking, workspace
- management, keybindings and monitor configuration.
- .
- Internally it uses a fork of Cogl, a hardware acceleration abstraction
- library used to simplify usage of OpenGL pipelines, as well as a fork
- of Clutter, a scene graph and user interface toolkit.
+Description: window and compositing manager (data files)
+ Muffin is a window manager performing compositing as well based on
+ GTK+ and Clutter and used in Cinnamon desktop environment.
  .
  This package contains the shared files.