diff --git a/debian/control b/debian/control index a344886..a090506 100644 --- a/debian/control +++ b/debian/control @@ -1,59 +1,56 @@ Source: xapp +Maintainer: Debian Cinnamon Team +Uploaders: Maximiliano Curia , + Margarita Manterola , + Norbert Preining Section: x11 Priority: optional -Maintainer: Debian Cinnamon Team -Uploaders: - Maximiliano Curia , - Margarita Manterola , - Norbert Preining -Build-Depends: - debhelper-compat (= 13), - dh-python, - dpkg-dev (>= 1.15.1), - gobject-introspection (>= 0.10.2-1~), - gtk-doc-tools (>= 1.4), - intltool (>= 0.40.6), - libdbusmenu-gtk3-dev, - libgdk-pixbuf2.0-dev (>= 2.22.0), - libgirepository1.0-dev (>= 0.10.2-1~), - libglib2.0-dev (>= 2.37.3), - libgnomekbd-dev, - libgtk-3-dev (>= 3.3.16), - libx11-dev, - libxkbfile-dev, - meson (>= 0.40.0), - python-gi-dev, - python3, - valac, -Standards-Version: 4.5.0 -Homepage: http://cinnamon.linuxmint.com/ +Build-Depends: debhelper-compat (= 13), + dh-python, + dpkg-dev, + gobject-introspection, + gtk-doc-tools, + intltool, + libdbusmenu-gtk3-dev, + libgdk-pixbuf2.0-dev, + libgirepository1.0-dev, + libglib2.0-dev, + libgnomekbd-dev, + libgtk-3-dev, + libx11-dev, + libxkbfile-dev, + meson (>= 0.40.0), + python-gi-dev, + python3, + valac +Standards-Version: 4.5.1 Vcs-Browser: https://salsa.debian.org/cinnamon-team/xapp Vcs-Git: https://salsa.debian.org/cinnamon-team/xapp.git +Homepage: http://cinnamon.linuxmint.com/ Package: gir1.2-xapp-1.0 +Architecture: any Section: introspection -Architecture: any -Depends: - ${gir:Depends}, - ${misc:Depends}, - ${python3:Depends} +Depends: ${gir:Depends}, + ${misc:Depends}, + ${python3:Depends} +Breaks: cinnamon (<< 4.0), + cinnamon-screensaver (<< 4.0) Description: Introspection data for Xapp Xapp provides components which are common to multiple desktop environments and required to implement cross-DE solutions. . This package contains the introspection data for Xapp. -Breaks: cinnamon (<< 4.0), cinnamon-screensaver (<< 4.0) Package: libxapp-dev +Architecture: any Section: libdevel -Architecture: any -Depends: - gir1.2-xapp-1.0 (= ${binary:Version}), - libgnomekbd-dev, - libgtk-3-dev (>= 3.3.16), - libxapp1 (= ${binary:Version}), - libxkbfile-dev, - ${misc:Depends}, +Depends: gir1.2-xapp-1.0 (= ${binary:Version}), + libgnomekbd-dev, + libgtk-3-dev, + libxapp1 (= ${binary:Version}), + libxkbfile-dev, + ${misc:Depends} Description: XApp library - development files Xapp provides components which are common to multiple desktop environments and required to implement cross-DE solutions. @@ -62,40 +59,46 @@ library functions. Package: libxapp1 -Section: libs Architecture: any Multi-Arch: same +Section: libs +Depends: libgnomekbd8, + xapps-common (>= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} -Depends: - libgnomekbd8, - xapps-common (>= ${source:Version}), - ${misc:Depends}, - ${shlibs:Depends}, +Breaks: nemo (<< 4.0), + xapps-common (<< 2.0.6-2~) +Replaces: xapps-common (<< 2.0.6-2~) Description: XApp library Xapp provides components which are common to multiple desktop environments and required to implement cross-DE solutions. . This library is used by several Xapp apps. -Replaces: xapps-common (<< 2.0.6-2~) -Breaks: nemo (<< 4.0), xapps-common (<< 2.0.6-2~) Package: xapps-common Architecture: all Multi-Arch: foreign -Depends: python3, python3-gi, xdg-utils, ${misc:Depends}, ${python3:Depends} -Recommends: gist, inxi +Depends: python3, + python3-gi, + xdg-utils, + ${misc:Depends}, + ${python3:Depends} +Recommends: gist, + inxi +Breaks: cinnamon (<< 4.0) Description: Files that are common across Xapp desktop applications Xapp provides components which are common to multiple desktop environments and required to implement cross-DE solutions. . This package includes files that are shared between several XApp apps (i18n files and configuration schemas). -Breaks: cinnamon (<< 4.0) Package: xapps-doc +Architecture: all Section: doc -Architecture: all -Depends: devhelp, ${misc:Depends} +Depends: devhelp, + ${misc:Depends} Description: Libxapp documentation Xapp provides components which are common to multiple desktop environments and required to implement cross-DE solutions. diff --git a/debian/patches/remap-archall-libexec b/debian/patches/remap-archall-libexec index c8b31be..a331725 100644 --- a/debian/patches/remap-archall-libexec +++ b/debian/patches/remap-archall-libexec @@ -1,13 +1,14 @@ -We are building with --Dlibexecdir=lib/$(DEB_TARGET_MULTIARCH) so that the -xapp-sn-watcher binary is correctly placed in an arch-dependent directory. - -The other libexec files (applet_constants.py mate-xapp-status-applet.py) -are installed into arch-deps but arch-all package xapp1-common, and thus -cannot use the $(DEB_TARGET_MULTIARCH) directory. - -Since the location of the Python files are not hard-coded in the source but -only in the service and desktop file, we install the .py into /usr/libexec, -and patch the service and aplet files to use the updated path. +Description: Remap archall libexec + We are building with --Dlibexecdir=lib/$(DEB_TARGET_MULTIARCH) so that the + xapp-sn-watcher binary is correctly placed in an arch-dependent directory. + . + The other libexec files (applet_constants.py mate-xapp-status-applet.py) + are installed into arch-deps but arch-all package xapp1-common, and thus + cannot use the $(DEB_TARGET_MULTIARCH) directory. + . + Since the location of the Python files are not hard-coded in the source but + only in the service and desktop file, we install the .py into /usr/libexec, + and patch the service and aplet files to use the updated path. --- status-applets/mate/org.mate.panel.applet.MateXAppStatusAppletFactory.service.in | 2 +- status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in | 2 +-