core/jammy: update main files

Cairo-Dock · Mar 9, 2024 · 97c1d02 · 97c1d02
1 parent 302e093
commit 97c1d02
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 49 deletions.
diff --git a/jammy/debian/cairo-dock-core.install b/jammy/debian/cairo-dock-core.install
@@ -1,11 +1,9 @@
 usr/bin/cairo-dock
-usr/bin/cairo-dock-session
-usr/share/cairo-dock
+usr/lib/*/cairo-dock/libcd-Help.so
+usr/lib/*/libgldi.so.*
+usr/lib/systemd/user/cairo-dock.service
 usr/share/applications
-usr/share/gnome-session
+usr/share/cairo-dock
 usr/share/locale
 usr/share/man
 usr/share/pixmaps
-usr/share/xsessions
-usr/lib/*/libgldi.so.*
-usr/lib/*/cairo-dock/libcd-Help.so
diff --git a/jammy/debian/cairo-dock-gnome-session.install b/jammy/debian/cairo-dock-gnome-session.install
@@ -0,0 +1,5 @@
+usr/bin/cairo-dock-session
+usr/lib/systemd/user/gnome-session-x11@cairo-dock-compiz.target
+usr/lib/systemd/user/gnome-session-x11@cairo-dock-metacity.target
+usr/share/gnome-session
+usr/share/xsessions
diff --git a/jammy/debian/control b/jammy/debian/control
@@ -1,33 +1,43 @@
 Source: cairo-dock
 Section: x11
 Priority: optional
-Maintainer: Debian Cairo-dock Maintainers <team+pkg-cairo-dock-devel@tracker.debian.org>
-Uploaders: Nobuhiro Iwamatsu <iwamatsu@debian.org>,
- Youhei SASAKI <uwabami@gfd-dennou.org>
-Build-Depends: cdbs, quilt, debhelper (>= 10), dpkg-dev (>= 1.16.1~),
-	cmake (>= 2.8.0), autotools-dev, intltool, pkg-config,
-	libcairo2-dev | libcairo-dev,
-	libcurl4-gnutls-dev,
-	libdbus-glib-1-dev,
-	libgl1-mesa-dev | libgl-dev,
-	libglib2.0-dev,
-	libglu1-mesa-dev | libglu-dev,
-	libgtk-3-dev (>= 3.4.0),
-	libpango1.0-dev,
-	librsvg2-dev,
-	libxcomposite-dev,
-	libxrandr-dev,
-	libxml2-dev,
-	libxrender-dev,
-	libxtst-dev
-Standards-Version: 4.1.4
+Maintainer: Daniel Kondor <kondor.dani@gmail.com>
+Build-Depends: autotools-dev,
+               cmake (>= 3.16.0),
+               debhelper (>= 10),
+               debhelper-compat (= 12),
+               dpkg-dev (>= 1.16.1~),
+               extra-cmake-modules,
+               intltool,
+               libcairo2-dev | libcairo-dev,
+               libcurl4-gnutls-dev,
+               libdbus-glib-1-dev,
+               libgl1-mesa-dev | libgl-dev,
+               libglib2.0-dev,
+               libglu1-mesa-dev | libglu-dev,
+               libgtk-3-dev (>= 3.22.0),
+               libgtk-layer-shell-dev (>= 0.6.0),
+               libpango1.0-dev,
+               librsvg2-dev,
+               libwayland-bin,
+               libxcomposite-dev,
+               libxml2-dev,
+               libxrandr-dev,
+               libxrender-dev,
+               libxtst-dev,
+               pkg-config,
+               systemd,
+               quilt
+Standards-Version: 4.5.0
 Homepage: http://www.glx-dock.org/
-Vcs-Git:  https://salsa.debian.org/cairo-dock-team/cairo-dock.git
-Vcs-Browser: https://salsa.debian.org/cairo-dock-team/cairo-dock
 
 Package: cairo-dock
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, cairo-dock-core (= ${binary:Version}), cairo-dock-plug-ins (>= 3.4.1), gnome-settings-daemon (>= 3.24)
+Depends: cairo-dock-core (= ${binary:Version}),
+         cairo-dock-plug-ins (>= 3.4.1),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: cairo-dock-gnome-session
 Description: Metapackage for cairo-dock
  Cairo-dock has a family-likeness with OS X dock, but with more options.
  It uses cairo to render nice graphics, and Glitz to use hardware acceleration.
@@ -37,18 +47,14 @@ Description: Metapackage for cairo-dock
  This is metapackage that provides the components necessary for running
  Cairo-dock. This installs a cairo-dock-core application and cairo-dock-plugins
  package easily.
- .
- And Cairo-dock installs cairo-dock-core and plugins and makes sense as
- Cairo-dock.
 
 Package: cairo-dock-core
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libwayland-egl1, ${misc:Depends}, ${shlibs:Depends}
 Breaks: cairo-dock (<= 2.1.3.5-2)
 Replaces: cairo-dock (<= 2.1.3.5-2)
 Provides: cairo-dock
-Suggests: xcompmgr, empathy, f-spot, gnome-calculator, gimp, inkscape
 Recommends: cairo-dock-plugins (>= 2.1.3.10), curl
 Description: Light eye-candy fully themable animated dock for Linux desktop
  Cairo-dock has a family-likeness with OS X dock, but with more options.
@@ -58,11 +64,45 @@ Description: Light eye-candy fully themable animated dock for Linux desktop
  .
  This package provides Cairo-dock-core application.
 
+Package: cairo-dock-gnome-session
+Architecture: any
+Depends: cairo-dock-core (>= 3.4.1),
+         cairo-dock-gnome-integration-plug-in,
+         cairo-dock-plug-ins (>= 3.4.1),
+         compiz | metacity,
+         gnome-flashback,
+         gnome-session-bin,
+         gnome-settings-daemon (>= 3.24)
+Description: An X11 desktop session for Cairo-Dock
+ Cairo-dock has a family-likeness with OS X dock, but with more options.
+ It uses cairo to render nice graphics, and Glitz to use hardware acceleration.
+ It's fully configurable and can be a taskbar too.
+ You can easily plug applets into it.
+ .
+ This package provides a desktop environment using Cairo-Dock, either the
+ Compiz or Metacity window manager and GNOME components.
+
 Package: cairo-dock-dev
 Section: devel
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: cairo-dock-core (= ${binary:Version}), ${misc:Depends}
+Depends: cairo-dock-core (= ${binary:Version}),
+         libcairo2-dev | libcairo-dev,
+         libcurl4-gnutls-dev,
+         libdbus-glib-1-dev,
+         libgl1-mesa-dev | libgl-dev,
+         libglib2.0-dev,
+         libglu1-mesa-dev | libglu-dev,
+         libgtk-3-dev (>= 3.22.0),
+         libgtk-layer-shell-dev (>= 0.6.0),
+         librsvg2-dev,
+         libwayland-dev,
+         libxcomposite-dev,
+         libxml2-dev,
+         libxrandr-dev,
+         libxrender-dev,
+         libxtst-dev,
+         ${misc:Depends}
 Description: Cairo-dock development file
  Cairo-dock has a family-likeness with OS X dock, but with more options.
  It uses cairo to render nice graphics, and Glitz to use hardware acceleration.

diff --git a/jammy/debian/rules b/jammy/debian/rules
@@ -1,19 +1,16 @@
 #!/usr/bin/make -f
 
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-CFLAGS+=$(CPPFLAGS)
-CXXFLAGS+=$(CPPFLAGS)
+%:
+	dh $@
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+override_dh_auto_configure:
+	dh_auto_configure -- -Denable-desktop-manager=True
 
-# DEB_CONFIGURE_USER_FLAGS= --enable-xextend
-DEB_CMAKE_EXTRA_FLAGS += \
-	-Denable-desktop-manager=ON \
-	-DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH)
-clean::
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -f src/config.h
 	rm -f src/gldit/gldi-config.h
 	rm -f src/gldit/gldi-module-config.h
+
+override_dh_installsystemduser:
+	dh_installsystemduser --no-enable
diff --git a/jammy/debian/watch b/jammy/debian/watch
@@ -1,2 +1,8 @@
-version=3
-https://launchpad.net/cairo-dock-core/+download .*/cairo-dock-([\d\.]+.*)?.tar.gz
+version=4
+opts="searchmode=plain, \
+  pgpmode=none, \
+  dversionmangle=auto" \
+https://api.github.com/repos/Cairo-Dock/cairo-dock-core/releases \
+https://api.github.com/repos/Cairo-Dock/cairo-dock-core/tarball/@ANY_VERSION@ \
+debian
+