From fbaa95f8bb29775ac0f1acf52ae782813fdf79ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 22 Feb 2021 11:53:09 +0100 Subject: [PATCH] Use Meson in debian/rules and debian/control --- nemo-dropbox/debian/control | 3 +-- nemo-fileroller/debian/control | 1 + nemo-fileroller/debian/rules | 8 -------- nemo-image-converter/debian/control | 7 ++----- nemo-image-converter/debian/rules | 4 ---- nemo-repairer/debian/control | 4 +--- nemo-repairer/debian/rules | 15 --------------- nemo-seahorse/debian/control | 8 ++------ nemo-seahorse/debian/control.in | 6 +----- nemo-seahorse/debian/rules | 14 -------------- nemo-share/debian/control | 5 +---- nemo-share/debian/rules | 20 +------------------- 12 files changed, 10 insertions(+), 85 deletions(-) diff --git a/nemo-dropbox/debian/control b/nemo-dropbox/debian/control index 7a302c00..d2031ab4 100644 --- a/nemo-dropbox/debian/control +++ b/nemo-dropbox/debian/control @@ -3,9 +3,9 @@ Section: non-free/gnome Priority: optional Maintainer: Clement Lefebvre Build-Depends: debhelper (>= 9), + meson, libnemo-extension-dev (>= 1.0.0), libglib2.0-dev (>= 2.14.0), - dh-autoreconf, Standards-Version: 3.9.6 XS-Autobuild: yes Homepage: http://www.dropbox.com/ @@ -21,4 +21,3 @@ Depends: nemo, Description: Dropbox integration for Nemo Nemo Dropbox is an extension that integrates the Dropbox web service with your Cinnamon Desktop. - diff --git a/nemo-fileroller/debian/control b/nemo-fileroller/debian/control index b24f943a..bc6b5fc4 100644 --- a/nemo-fileroller/debian/control +++ b/nemo-fileroller/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Clement Lefebvre Build-Depends: debhelper (>= 10), + meson, libglib2.0-dev (>= 2.14.0), libnemo-extension-dev (>= 1.0.0), Standards-Version: 3.9.6 diff --git a/nemo-fileroller/debian/rules b/nemo-fileroller/debian/rules index ae9f6465..682c3ebe 100755 --- a/nemo-fileroller/debian/rules +++ b/nemo-fileroller/debian/rules @@ -6,13 +6,5 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow %: dh $@ -override_dh_auto_configure: - dh_auto_configure -- --disable-static - -override_dh_auto_install: - dh_auto_install - # Drop useless files - find debian/ -name '*.la' -delete - # Don't generate a shlibs file for the plugin override_dh_makeshlibs: diff --git a/nemo-image-converter/debian/control b/nemo-image-converter/debian/control index f0020807..e6a18e54 100644 --- a/nemo-image-converter/debian/control +++ b/nemo-image-converter/debian/control @@ -4,12 +4,9 @@ Priority: optional Maintainer: Julien Lavergne Homepage: http://github.com/linuxmint/nemo-extensions Build-Depends: debhelper (>= 9), - autotools-dev, - dh-autoreconf, - intltool, - gnome-common, - libxml-parser-perl, + meson, pkg-config, + libxml-parser-perl, libnemo-extension-dev (>= 2.0.8), libglib2.0-dev (>= 2.37.3), libgtk-3-dev (>= 3.0.0) diff --git a/nemo-image-converter/debian/rules b/nemo-image-converter/debian/rules index d3552745..8edbcb60 100755 --- a/nemo-image-converter/debian/rules +++ b/nemo-image-converter/debian/rules @@ -21,9 +21,5 @@ endif override_dh_autoreconf: dh_autoreconf --as-needed -override_dh_install: - rm `find $(CURDIR)/debian -name '*.la'` - dh_install - override_dh_makeshlibs: #Pass, the .so is a plugin, not a library. diff --git a/nemo-repairer/debian/control b/nemo-repairer/debian/control index ba1e1795..8ef813de 100644 --- a/nemo-repairer/debian/control +++ b/nemo-repairer/debian/control @@ -5,10 +5,8 @@ Maintainer: Clement Lefebvre Homepage: https://github.com/linuxmint/nemo-extensions Build-Depends: cdbs, debhelper (>= 9), - autotools-dev, - gnome-common, + meson, libnemo-extension-dev (>= 2.2.0), - intltool, libglib2.0-dev (>= 2.24.0), libgtk-3-dev (>= 3.0.0) Standards-Version: 3.9.6 diff --git a/nemo-repairer/debian/rules b/nemo-repairer/debian/rules index 67ac91b8..0d41c994 100755 --- a/nemo-repairer/debian/rules +++ b/nemo-repairer/debian/rules @@ -3,18 +3,3 @@ %: dh $@ - -override_dh_auto_configure: - NOCONFIGURE=1 ./autogen.sh - dh_auto_configure -- - -override_dh_makeshlibs: - dh_makeshlibs -Xlibnemo-filename-repairer - -override_dh_install: - dh_install --list-missing - -override_dh_auto_install: - dh_auto_install - find debian -name "*.la" -delete - diff --git a/nemo-seahorse/debian/control b/nemo-seahorse/debian/control index f9a5ddfc..25045a4f 100644 --- a/nemo-seahorse/debian/control +++ b/nemo-seahorse/debian/control @@ -1,5 +1,5 @@ # This file is autogenerated. DO NOT EDIT! -# +# # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: nemo-seahorse @@ -7,16 +7,13 @@ Section: gnome Priority: optional Maintainer: Clement Lefebvre Build-Depends: debhelper (>= 9), - autotools-dev, - intltool, + meson, libgpgme11-dev (>= 1.2.0), libnotify-dev (>= 0.7.0), libdbus-glib-1-dev (>= 0.78), libcryptui-dev, libglib2.0-dev (>= 2.37.3), libgtk-3-dev (>= 3.0.0), - gnome-pkg-tools, - gnome-common, libnemo-extension-dev, libgcr-3-dev (>= 3.4.0) Standards-Version: 3.9.6 @@ -32,4 +29,3 @@ Description: seahorse plugins and utilities for encryption Nemo-Seahorse is an extension for Nemo which allows encryption and decryption of OpenPGP files using GnuPG - the GNU Privacy Guard program. - diff --git a/nemo-seahorse/debian/control.in b/nemo-seahorse/debian/control.in index 7d670c3b..b39f5e23 100644 --- a/nemo-seahorse/debian/control.in +++ b/nemo-seahorse/debian/control.in @@ -3,8 +3,7 @@ Section: gnome Priority: optional Maintainer: Clement Lefebvre Build-Depends: debhelper (>= 9), - autotools-dev, - intltool, + meson, libgpgme11-dev (>= 1.2.0), libnotify-dev (>= 0.7.0), libdbus-glib-1-dev (>= 0.78), @@ -12,8 +11,6 @@ Build-Depends: debhelper (>= 9), libcryptui-dev, libglib2.0-dev (>= 2.37.3), libgtk-3-dev (>= 3.0.0), - gnome-pkg-tools, - gnome-common, libnemo-extension-dev, libgcr-3-dev (>= 3.4.0) Standards-Version: 3.9.6 @@ -29,4 +26,3 @@ Description: seahorse plugins and utilities for encryption Nemo-Seahorse is an extension for Nemo which allows encryption and decryption of OpenPGP files using GnuPG - the GNU Privacy Guard program. - diff --git a/nemo-seahorse/debian/rules b/nemo-seahorse/debian/rules index ae831db6..54369d41 100755 --- a/nemo-seahorse/debian/rules +++ b/nemo-seahorse/debian/rules @@ -4,17 +4,3 @@ LDFLAGS += -Wl,-O1 -Wl,--as-needed %: dh $@ - -override_dh_auto_configure: - NOCONFIGURE=1 ./autogen.sh - dh_auto_configure -- - -override_dh_makeshlibs: - # libnemo-seahorse.so is a plugin, not a shared library - dh_makeshlibs -Xlibnemo-seahorse - -override_dh_auto_install: - dh_auto_install - find debian -name "*.a" -delete - find debian -name "*.la" -delete - diff --git a/nemo-share/debian/control b/nemo-share/debian/control index fee4ccde..131ddaf5 100644 --- a/nemo-share/debian/control +++ b/nemo-share/debian/control @@ -3,10 +3,7 @@ Section: gnome Priority: optional Maintainer: Clement Lefebvre Build-Depends: debhelper (>= 9), - autotools-dev, - gnome-common, - intltool (>= 0.29), - dh-autoreconf, + meson, libglib2.0-dev (>= 2.35.9), libnemo-extension-dev, libcinnamon-desktop-dev (>= 3.0.0) diff --git a/nemo-share/debian/rules b/nemo-share/debian/rules index 20fe4ce9..d25510d6 100755 --- a/nemo-share/debian/rules +++ b/nemo-share/debian/rules @@ -5,22 +5,4 @@ export LDFLAGS += -Wl,-z,defs -Wl,--as-needed %: - dh $@ --parallel --with=autoreconf - -override_dh_autoreconf: - dh_autoreconf --as-needed - -override_dh_auto_build: - dh_auto_build - cd po; intltool-update -p --verbose - -override_dh_auto_install: - dh_auto_install - find debian/nemo-share -name '*.*a' -delete - -override_dh_auto_test: - # disable tests - -override_dh_makeshlibs: - # disable shlibs - + dh $@