Cleanup debian control/compat/rules

Salamandar · mtwebster · commit dbca573b576f · 2021-04-29T09:54:48.000-04:00
diff --git a/nemo-audio-tab/debian/rules b/nemo-audio-tab/debian/rules
@@ -4,4 +4,3 @@ export PYBUILD_NAME=nemo-audio-tab
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
-
diff --git a/nemo-dropbox/debian/compat b/nemo-dropbox/debian/compat
diff --git a/nemo-dropbox/debian/control b/nemo-dropbox/debian/control
@@ -2,7 +2,7 @@ Source: nemo-dropbox
 Section: non-free/gnome
 Priority: optional
 Maintainer: Clement Lefebvre <root@linuxmint.com>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper-compat (= 12),
                meson,
                libnemo-extension-dev (>= 1.0.0),
                libglib2.0-dev (>= 2.14.0),
diff --git a/nemo-dropbox/debian/nemo-dropbox.postinst b/nemo-dropbox/debian/nemo-dropbox.postinst
@@ -6,16 +6,16 @@ UPDATENOTIFIERDIR=/var/lib/update-notifier/user.d
 
 case "$1" in
     configure)
-	unset DISPLAY # No GUI launched from postinst please
+        unset DISPLAY # No GUI launched from postinst please
 
         echo "Please restart all running instances of Nemo, or you will experience problems. i.e. nemo --quit"
 
         if [ -d $UPDATENOTIFIERDIR ] ; then
-          # pgrep matches application names from /proc/<pid>/status which is
-          # truncated according to sys/procfs.h definition. Problem is it's
-          # platform dependent. Either 15 or 16 chars.
-          if pgrep -x nemo > /dev/null 2>&1 ;  then
-            cat > $UPDATENOTIFIERDIR/dropbox-restart-required <<DROPBOXEND
+            # pgrep matches application names from /proc/<pid>/status which is
+            # truncated according to sys/procfs.h definition. Problem is it's
+            # platform dependent. Either 15 or 16 chars.
+            if pgrep -x nemo > /dev/null 2>&1 ;  then
+                cat > $UPDATENOTIFIERDIR/dropbox-restart-required <<DROPBOXEND
 Name: Nemo Restart Required
 Priority: High
 Terminal: False
@@ -25,9 +25,9 @@ DontShowAfterReboot: True
 DisplayIf: pgrep -x nemo -U \$(id -u) > /dev/null
 Description: Dropbox requires Nemo to be restarted to function properly.
 DROPBOXEND
-          else
-            rm -f $UPDATENOTIFIERDIR/dropbox-restart-required
-          fi
+            else
+                rm -f $UPDATENOTIFIERDIR/dropbox-restart-required
+            fi
         fi
 
         echo 'Dropbox installation successfully completed! You can start Dropbox from your applications menu.'
@@ -45,7 +45,7 @@ ButtonText: _Start Dropbox
 DROPBOXEND
         fi
 
-	;;
+    ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;
diff --git a/nemo-dropbox/debian/nemo-dropbox.postrm b/nemo-dropbox/debian/nemo-dropbox.postrm
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
     purge)
-	rm -rf /var/lib/dropbox
+        rm -rf /var/lib/dropbox
     ;;
 esac
 
diff --git a/nemo-dropbox/debian/nemo-dropbox.prerm b/nemo-dropbox/debian/nemo-dropbox.prerm
@@ -4,10 +4,10 @@ set -e
 
 case "$1" in
     remove)
-	dropbox stop || true
-	killall dropbox || true
-	rm -f /var/lib/update-notifier/user.d/dropbox-restart-required
-	rm -f /var/lib/update-notifier/user.d/dropbox-start-required
+        dropbox stop || true
+        killall dropbox || true
+        rm -f /var/lib/update-notifier/user.d/dropbox-restart-required
+        rm -f /var/lib/update-notifier/user.d/dropbox-start-required
     ;;
 esac
 
diff --git a/nemo-dropbox/debian/rules b/nemo-dropbox/debian/rules
@@ -1,19 +1,14 @@
 #!/usr/bin/make -f
 
-%:
-	dh $@ --with=autoreconf
+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 
-override_dh_autoreconf:
-	dh_autoreconf --as-needed
+%:
+	dh $@ --buildsystem=meson
 
+# Don't generate a shlibs file for the plugin
 override_dh_makeshlibs:
-	# Don't generate a shlibs file for the plugin
-	dh_makeshlibs -X/usr/lib/nemo/
 
 override_dh_auto_install:
 	dh_auto_install
 	# Drop useless files
-	rm -f debian/nemo-dropbox/usr/lib/nemo/extensions-*/libnemo-dropbox.a
-	rm -f debian/nemo-dropbox/usr/lib/nemo/extensions-*/libnemo-dropbox.la
 	rm -rf debian/nemo-dropbox/usr/share/icons/*
-
diff --git a/nemo-fileroller/debian/compat b/nemo-fileroller/debian/compat
diff --git a/nemo-fileroller/debian/control b/nemo-fileroller/debian/control
@@ -3,10 +3,10 @@ Section: misc
 Priority: optional
 Maintainer: Clement Lefebvre <root@linuxmint.com>
 Build-Depends:
- debhelper (>= 10),
- meson,
- libglib2.0-dev (>= 2.14.0),
- libnemo-extension-dev (>= 1.0.0),
+    debhelper-compat (= 12),
+    meson,
+    libglib2.0-dev (>= 2.14.0),
+    libnemo-extension-dev (>= 1.0.0),
 Standards-Version: 3.9.6
 
 Package: nemo-fileroller
diff --git a/nemo-fileroller/debian/rules b/nemo-fileroller/debian/rules
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 
 %:
-	dh $@
+	dh $@ --buildsystem=meson
 
 # Don't generate a shlibs file for the plugin
 override_dh_makeshlibs:
diff --git a/nemo-image-converter/debian/compat b/nemo-image-converter/debian/compat
diff --git a/nemo-image-converter/debian/control b/nemo-image-converter/debian/control
@@ -3,7 +3,7 @@ Section: gnome
 Priority: optional
 Maintainer: Julien Lavergne <julien.lavergne@gmail.com>
 Homepage: http://github.com/linuxmint/nemo-extensions
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper-compat (= 12),
                meson,
                pkg-config,
                libxml-parser-perl,
diff --git a/nemo-image-converter/debian/rules b/nemo-image-converter/debian/rules
@@ -1,25 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 
 %:
-	dh $@ --with=autoreconf
-
-override_dh_autoreconf:
-	dh_autoreconf --as-needed
+	dh $@ --buildsystem=meson
 
+# Don't generate a shlibs file for the plugin
 override_dh_makeshlibs:
-	#Pass, the .so is a plugin, not a library.
diff --git a/nemo-preview/debian/compat b/nemo-preview/debian/compat
diff --git a/nemo-preview/debian/control b/nemo-preview/debian/control
@@ -2,7 +2,7 @@ Source: nemo-preview
 Section: gnome
 Priority: extra
 Maintainer: Clement Lefebvre <root@linuxmint.com>
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper-compat (= 12),
                meson,
                gir1.2-xreader,
                gnome-pkg-tools (>= 0.11),
diff --git a/nemo-preview/debian/rules b/nemo-preview/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 
 %:
-	dh $@
+	dh $@ --buildsystem=meson
diff --git a/nemo-python/debian/compat b/nemo-python/debian/compat
diff --git a/nemo-python/debian/control b/nemo-python/debian/control
@@ -3,12 +3,12 @@ Section: python
 Priority: optional
 Maintainer: Clement Lefebvre <root@linuxmint.com>
 Build-Depends:
- debhelper (>= 10),
- gtk-doc-tools,
- meson,
- libnemo-extension-dev (>= 3.6),
- python3-dev,
- python-gi-dev,
+    debhelper-compat (= 12),
+    gtk-doc-tools,
+    meson,
+    libnemo-extension-dev (>= 3.6),
+    python3-dev,
+    python-gi-dev,
 Standards-Version: 3.9.6
 
 Package: python-nemo
@@ -26,4 +26,3 @@ Depends: python-nemo (= ${binary:Version}), ${misc:Depends}
 Description: Debug packages for python-nemo
  This development package contains unstripped binaries compiled with
  debugging symbols needed by gdb.
-
diff --git a/nemo-python/debian/rules b/nemo-python/debian/rules
@@ -1,31 +1,12 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 
 %:
-	dh $@
+	dh $@ --buildsystem=meson
 
 override_dh_auto_configure:
-	mkdir -p debian/build
-	meson debian/build \
-		--prefix=/usr \
-		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
-		--buildtype=plain \
-		-D gtk_doc=true \
-		--errorlogs
-
-override_dh_auto_build:
-	ninja -C debian/build
-
-override_dh_auto_test:
-	# disable tests
-
-override_dh_strip:
-	dh_strip --dbg-package=python-nemo-dbg
-
-override_dh_auto_install:
-	DESTDIR=${CURDIR}/debian/python-nemo \
-	ninja -C debian/build install
+	dh_auto_configure -- -D gtk_doc=true --errorlogs
 
+# Don't generate a shlibs file for the plugin
 override_dh_makeshlibs:
-	# disabled
diff --git a/nemo-repairer/debian/compat b/nemo-repairer/debian/compat
diff --git a/nemo-repairer/debian/control b/nemo-repairer/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Clement Lefebvre <root@linuxmint.com>
 Homepage: https://github.com/linuxmint/nemo-extensions
 Build-Depends: cdbs,
-               debhelper (>= 9),
+               debhelper-compat (= 12),
                meson,
                libnemo-extension-dev (>= 2.2.0),
                libglib2.0-dev (>= 2.24.0),
diff --git a/nemo-repairer/debian/rules b/nemo-repairer/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 
 %:
-	dh $@
+	dh $@ --buildsystem=meson
diff --git a/nemo-seahorse/debian/compat b/nemo-seahorse/debian/compat
diff --git a/nemo-seahorse/debian/control b/nemo-seahorse/debian/control
@@ -1,12 +1,8 @@
-# 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 <root@linuxmint.com>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper-compat (= 12),
                meson,
                libgpgme11-dev (>= 1.2.0),
                libnotify-dev (>= 0.7.0),
diff --git a/nemo-seahorse/debian/control.in b/nemo-seahorse/debian/control.in
diff --git a/nemo-seahorse/debian/rules b/nemo-seahorse/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-LDFLAGS += -Wl,-O1 -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 
 %:
-	dh $@
+	dh $@ --buildsystem=meson
diff --git a/nemo-share/debian/compat b/nemo-share/debian/compat
diff --git a/nemo-share/debian/control b/nemo-share/debian/control
@@ -2,7 +2,7 @@ Source: nemo-share
 Section: gnome
 Priority: optional
 Maintainer: Clement Lefebvre <root@linuxmint.com>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper-compat (= 12),
                meson,
                libglib2.0-dev (>= 2.35.9),
                libnemo-extension-dev,
diff --git a/nemo-share/debian/rules b/nemo-share/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
-
-export LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 
 %:
-	dh $@
+	dh $@ --buildsystem=meson

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,3 @@ export PYBUILD_NAME=nemo-audio-tab`
`4`	`4`
`5`	`5`	`%:`
`6`	`6`	`dh $@ --with python3 --buildsystem=pybuild`
`7`		`-`