Skip to content

Commit

Permalink
Use Meson in debian/rules and debian/control
Browse files Browse the repository at this point in the history
  • Loading branch information
Salamandar authored and mtwebster committed Mar 24, 2021
1 parent 105d379 commit fbaa95f
Show file tree
Hide file tree
Showing 12 changed files with 10 additions and 85 deletions.
3 changes: 1 addition & 2 deletions nemo-dropbox/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Section: non-free/gnome
Priority: optional
Maintainer: Clement Lefebvre <[email protected]>
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/
Expand All @@ -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.

1 change: 1 addition & 0 deletions nemo-fileroller/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Priority: optional
Maintainer: Clement Lefebvre <[email protected]>
Build-Depends:
debhelper (>= 10),
meson,
libglib2.0-dev (>= 2.14.0),
libnemo-extension-dev (>= 1.0.0),
Standards-Version: 3.9.6
Expand Down
8 changes: 0 additions & 8 deletions nemo-fileroller/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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:
7 changes: 2 additions & 5 deletions nemo-image-converter/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@ Priority: optional
Maintainer: Julien Lavergne <[email protected]>
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)
Expand Down
4 changes: 0 additions & 4 deletions nemo-image-converter/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 1 addition & 3 deletions nemo-repairer/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ Maintainer: Clement Lefebvre <[email protected]>
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
Expand Down
15 changes: 0 additions & 15 deletions nemo-repairer/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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

8 changes: 2 additions & 6 deletions nemo-seahorse/debian/control
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
# 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
Section: gnome
Priority: optional
Maintainer: Clement Lefebvre <[email protected]>
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
Expand All @@ -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.

6 changes: 1 addition & 5 deletions nemo-seahorse/debian/control.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,14 @@ Section: gnome
Priority: optional
Maintainer: Clement Lefebvre <[email protected]>
Build-Depends: debhelper (>= 9),
autotools-dev,
intltool,
meson,
libgpgme11-dev (>= 1.2.0),
libnotify-dev (>= 0.7.0),
libdbus-glib-1-dev (>= 0.78),
libgnome-keyring-dev,
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
Expand All @@ -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.

14 changes: 0 additions & 14 deletions nemo-seahorse/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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

5 changes: 1 addition & 4 deletions nemo-share/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ Section: gnome
Priority: optional
Maintainer: Clement Lefebvre <[email protected]>
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)
Expand Down
20 changes: 1 addition & 19 deletions nemo-share/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@

0 comments on commit fbaa95f

Please sign in to comment.