Rework debian/ to follow current best practices and drop deprecated symlinks

* Switch to minimal debhelper approach (which also drops the
  the deprecated /etc/rc*.d/important_notice and /etc/init.d/grml-halt symlinks)
  and use Makefile
* Switch all Homepage and Vcs-* headers to
  https://github.com/grml/grml-etc-core/ (this avoids having a strange
  mixture of our self-hosted git repositories and github and
  also fixes vcs-field-uses-insecure-uri lintian warning)
* Drop debian/overrides and provide up2date debian/grml-etc.lintian-overrides
* Bump Standards-Version to 4.5.1
* Convert debian/copyright to machine-readable format

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..dec580b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,6 @@
+all:
+
+install:
+       cp -a etc $(DESTDIR)/
+
+.PHONY: install

diff --git a/debian/control b/debian/control
index 869d0e5..3226003 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: grml
 Priority: optional
 Maintainer: Michael Prokop <mika@grml.org>
 Build-Depends: debhelper (>= 10~)
-Standards-Version: 4.3.0
-Homepage: https://git.grml.org/?p=grml-etc.git
-Vcs-git: git://git.grml.org/grml-etc.git
-Vcs-Browser: https://git.grml.org/?p=grml-etc.git
+Standards-Version: 4.5.1
+Homepage: https://github.com/grml/grml-etc-core/
+Vcs-git: https://github.com/grml/grml-etc-core/
+Vcs-Browser: https://github.com/grml/grml-etc-core/
 Origin: Grml
 Bugs: mailto:bugs@grml.org
 

diff --git a/debian/copyright b/debian/copyright
index 60cad75..938264b 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,27 +1,23 @@
-This package was debianized by Michael Prokop <mika@grml.org> on
-Mon, 27 Sep 2004 00:38:03 +0200.
-
-It was downloaded from http://grml.org/
-
-Copyright Holder: Michael Prokop <mika@grml.org>
-
-Copyright:
-
-   This software is copyright (c) 2004-2009 by Michael Prokop.
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: grml-etc
+Upstream-Contact: Michael Prokop <mika@grml.org>
+Source: https://github.com/grml/grml-etc-core/
+
+Files: *
+Copyright: 2004-2021, Michael Prokop <mika@grml.org>
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General Public License,
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.

diff --git a/debian/grml-etc.lintian-overrides b/debian/grml-etc.lintian-overrides
new file mode 100644 (file)
index 0000000..8ed879b
--- /dev/null
+++ b/debian/grml-etc.lintian-overrides
@@ -0,0 +1,28 @@
+grml-etc: package-contains-file-in-etc-skel etc/skel/.channels/
+grml-etc: package-contains-file-in-etc-skel etc/skel/.channels/at-austria
+grml-etc: package-contains-file-in-etc-skel etc/skel/.channels/at-graz
+grml-etc: package-contains-file-in-etc-skel etc/skel/.channels/at-klagenfurt
+grml-etc: package-contains-file-in-etc-skel etc/skel/.channels/channels.conf-AT-graz
+grml-etc: package-contains-file-in-etc-skel etc/skel/.channels/channels.conf-AT-klagenfurt
+grml-etc: package-contains-file-in-etc-skel etc/skel/.channels/channels.conf-AT-vienna
+grml-etc: package-contains-file-in-etc-skel etc/skel/.irbrc
+grml-etc: package-contains-file-in-etc-skel etc/skel/.irssi/
+grml-etc: package-contains-file-in-etc-skel etc/skel/.irssi/config
+grml-etc: package-contains-file-in-etc-skel etc/skel/.irssi/scripts/
+grml-etc: package-contains-file-in-etc-skel etc/skel/.irssi/scripts/osd.pl
+grml-etc: package-contains-file-in-etc-skel etc/skel/.irssi/scripts/queryresume.pl
+grml-etc: package-contains-file-in-etc-skel etc/skel/.irssi/scripts/screen_away.pl
+grml-etc: package-contains-file-in-etc-skel etc/skel/.lftprc
+grml-etc: package-contains-file-in-etc-skel etc/skel/.links2/
+grml-etc: package-contains-file-in-etc-skel etc/skel/.links2/bookmarks.html
+grml-etc: package-contains-file-in-etc-skel etc/skel/.msmtprc
+grml-etc: package-contains-file-in-etc-skel etc/skel/.muttrc
+grml-etc: package-contains-file-in-etc-skel etc/skel/.screenrc
+grml-etc: package-contains-file-in-etc-skel etc/skel/.signature
+grml-etc: package-contains-file-in-etc-skel etc/skel/.terminfo/
+grml-etc: package-contains-file-in-etc-skel etc/skel/.terminfo/m/
+grml-etc: package-contains-file-in-etc-skel etc/skel/.terminfo/m/mostlike
+grml-etc: package-contains-file-in-etc-skel etc/skel/.terminfo/mostlike.txt
+grml-etc: package-contains-file-in-etc-skel etc/skel/.zlogin
+grml-etc: bugs-field-does-not-refer-to-debian-infrastructure mailto:bugs@grml.org
+grml-etc: unknown-section grml

diff --git a/debian/overrides b/debian/overrides
deleted file mode 100644 (file)
index f105a4a..0000000
--- a/debian/overrides
+++ /dev/null
@@ -1,54 +0,0 @@
-grml-etc: file-in-etc-rc.d-marked-as-conffile etc/rcS.d/important_notice
-grml-etc: init.d-script-depends-on-all-virtual-facility etc/init.d/grml-home required-start
-grml-etc: init.d-script-depends-on-all-virtual-facility etc/init.d/grml-misc required-start
-grml-etc: init.d-script-does-not-implement-optional-option etc/init.d/grml-halt status
-grml-etc: init.d-script-does-not-implement-optional-option etc/init.d/grml-home status
-grml-etc: init.d-script-does-not-implement-optional-option etc/init.d/grml-misc status
-grml-etc: init.d-script-does-not-implement-optional-option etc/init.d/grml-reboot status
-grml-etc: init.d-script-does-not-implement-required-option etc/init.d/firewall force-reload
-grml-etc: init.d-script-does-not-implement-required-option etc/init.d/grml-halt force-reload
-grml-etc: init.d-script-does-not-implement-required-option etc/init.d/grml-halt restart
-grml-etc: init.d-script-does-not-implement-required-option etc/init.d/grml-halt start
-grml-etc: init.d-script-does-not-implement-required-option etc/init.d/grml-home force-reload
-grml-etc: init.d-script-does-not-implement-required-option etc/init.d/grml-home restart
-grml-etc: init.d-script-does-not-implement-required-option etc/init.d/grml-home start
-grml-etc: init.d-script-does-not-implement-required-option etc/init.d/grml-home stop
-grml-etc: init.d-script-does-not-implement-required-option etc/init.d/grml-misc force-reload
-grml-etc: init.d-script-does-not-implement-required-option etc/init.d/grml-misc restart
-grml-etc: init.d-script-does-not-implement-required-option etc/init.d/grml-misc stop
-grml-etc: init.d-script-does-not-implement-required-option etc/init.d/grml-reboot force-reload
-grml-etc: init.d-script-does-not-implement-required-option etc/init.d/grml-reboot restart
-grml-etc: init.d-script-does-not-implement-required-option etc/init.d/grml-reboot start
-grml-etc: init.d-script-does-not-provide-itself etc/init.d/grml-halt
-grml-etc: init.d-script-does-not-provide-itself etc/init.d/ssh
-grml-etc: init.d-script-does-not-source-init-functions etc/init.d/firewall
-grml-etc: init.d-script-does-not-source-init-functions etc/init.d/grml-halt
-grml-etc: init.d-script-does-not-source-init-functions etc/init.d/grml-home
-grml-etc: init.d-script-does-not-source-init-functions etc/init.d/grml-misc
-grml-etc: init.d-script-does-not-source-init-functions etc/init.d/grml-reboot
-grml-etc: init.d-script-missing-lsb-short-description etc/init.d/firewall
-grml-etc: init.d-script-missing-lsb-short-description etc/init.d/grml-halt
-grml-etc: init.d-script-missing-lsb-short-description etc/init.d/grml-home
-grml-etc: init.d-script-missing-lsb-short-description etc/init.d/grml-misc
-grml-etc: init.d-script-missing-lsb-short-description etc/init.d/grml-reboot
-grml-etc: init.d-script-needs-depends-on-lsb-base etc/init.d/ssh (line 35)
-grml-etc: package-installs-into-etc-rc.d etc/rc0.d/important_notice
-grml-etc: package-installs-into-etc-rc.d etc/rc1.d/important_notice
-grml-etc: package-installs-into-etc-rc.d etc/rc2.d/important_notice
-grml-etc: package-installs-into-etc-rc.d etc/rc3.d/important_notice
-grml-etc: package-installs-into-etc-rc.d etc/rc4.d/important_notice
-grml-etc: package-installs-into-etc-rc.d etc/rc5.d/important_notice
-grml-etc: package-installs-into-etc-rc.d etc/rc6.d/important_notice
-grml-etc: package-installs-into-etc-rc.d etc/rcS.d/important_notice
-grml-etc: script-calls-init-script-directly etc/init.d/grml-reboot:222
-grml-etc: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/firewall
-grml-etc: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/grml-halt
-grml-etc: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/grml-home
-grml-etc: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/grml-misc
-grml-etc: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/grml-reboot
-grml-etc: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/ssh
-grml-etc: script-not-executable etc/resolv.conf.template
-grml-etc: systemd-no-service-for-init-rcS-script firewall
-grml-etc: systemd-no-service-for-init-rcS-script grml-home
-grml-etc: systemd-no-service-for-init-rcS-script grml-misc
-grml-etc: unknown-section grml

diff --git a/debian/rules b/debian/rules
index e03aa1d..218df65 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,63 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build: build-stamp
-
-build-stamp:
-       dh_testdir
-
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-
-       dh_clean 
-       rm -rf debian/grml-etc/
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_prep
-       dh_installdirs
-
-       # Add here commands to install the package into debian/grml-etc.
-       cp -a etc/                       debian/grml-etc/
-
-# Build architecture-dependent files here.
-binary-arch: build install
-
-# Build architecture-independent files here.
-binary-indep: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_link /etc/rcS.d/important_notice /etc/rc0.d/important_notice
-       dh_link /etc/rcS.d/important_notice /etc/rc1.d/important_notice
-       dh_link /etc/rcS.d/important_notice /etc/rc2.d/important_notice
-       dh_link /etc/rcS.d/important_notice /etc/rc3.d/important_notice
-       dh_link /etc/rcS.d/important_notice /etc/rc4.d/important_notice
-       dh_link /etc/rcS.d/important_notice /etc/rc5.d/important_notice
-       dh_link /etc/rcS.d/important_notice /etc/rc6.d/important_notice
-       dh_link /etc/init.d/grml-reboot     /etc/init.d/grml-halt
-       dh_compress
-       mkdir -p debian/grml-etc/usr/share/lintian/overrides/
-       cp -av debian/overrides debian/grml-etc/usr/share/lintian/overrides/grml-etc
-       dh_fixperms
-       dh_installdeb
-       find debian/grml-etc/etc -type f ! -name \*.xpm ! -name \*.png -print | \
-       sed -e 's#^debian/grml-etc##g' > debian/grml-etc/DEBIAN/conffiles
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+       dh $@

diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644 (file)
index 7510bfd..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-grml-etc source: vcs-field-uses-insecure-uri vcs-git git://git.grml.org/grml-etc.git
-grml-etc source: debian-rules-missing-recommended-target build-arch
-grml-etc source: debian-rules-missing-recommended-target build-indep