From: Michael Prokop Date: Wed, 9 Jun 2021 13:03:19 +0000 (+0200) Subject: Rework debian/ to follow current best practices X-Git-Tag: v0.12.0~1 X-Git-Url: http://git.grml.org/?p=grml-network.git;a=commitdiff_plain;h=fe2884b84d7f428f8630c1ebb939312ee18ef287 Rework debian/ to follow current best practices * Switch to minimal debhelper approach * Provide debian/source/format * Bump Standards-Version to 4.5.1 * Switch all Homepage and Vcs-* headers to https://github.com/grml/grml-network (this avoids having a strange mixture of our self-hosted git repositories and github and also fixes vcs-field-uses-insecure-uri lintian warning) * Convert debian/copyright to machine-readable format Gbp-Dch: Full --- diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e367abb --- /dev/null +++ b/Makefile @@ -0,0 +1,12 @@ +all: doc + +doc: + $(MAKE) -C docs + +install: doc + install -m 755 sbin/* $(DESTDIR)/usr/sbin/ + install -m 644 net-functions debian/grml-network/etc/grml/ + install -m 644 routersetup debian/grml-network/etc/grml/ + $(MAKE) -C docs install + +.PHONY: doc install diff --git a/debian/control b/debian/control index 10fa997..3174164 100644 --- a/debian/control +++ b/debian/control @@ -7,10 +7,10 @@ Build-Depends: debhelper-compat (= 12), docbook-xsl, xsltproc, -Standards-Version: 4.5.0 -Homepage: https://git.grml.org/?p=grml-network.git -Vcs-git: git://git.grml.org/grml-network.git -Vcs-Browser: https://git.grml.org/?p=grml-network.git +Standards-Version: 4.5.1 +Homepage: https://github.com/grml/grml-network/ +Vcs-git: https://github.com/grml/grml-network/ +Vcs-Browser: https://github.com/grml/grml-network/ Origin: Grml Bugs: mailto:bugs@grml.org @@ -47,4 +47,5 @@ Description: network related helper scripts * grml-network: interface for several network related tasks * grml-router: set up your box as NAT-router * grml-sniff: script for configuring a network sniffing setup + * grml-vnet: create tun/tap devices and add them to a bridge * netcardconfig: console based network configuration tool diff --git a/debian/copyright b/debian/copyright index 59e5aee..de8b865 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,19 +1,44 @@ -This package was debianized by Michael Prokop on -Sat, 28 Oct 2006 00:36:01 +0200. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: grml-network +Upstream-Contact: Michael Prokop +Source: https://github.com/grml/grml-network/ -It was downloaded from http://grml.org/repos/ +Files: * +Copyright: 2004-2021, Michael Prokop +License: GPL-2 -Upstream Author: Michael Prokop +Files: sbin/grml-network +Copyright: 2004-2014, Michael Prokop + 2020, Darshaka Pathirana + 2004, Klaus Knopper +License: GPL-2 -Copyright: (c) 2003+ Michael Prokop +Files: sbin/grml-vnet +Copyright: 2007-2010, Michael Gebetsroither +License: GPL-2 -License: +Files: sbin/netcardconfig +Copyright: 2004-2021, Michael Prokop + 2018, Mykola Malkov + 2013, frenbu + 2004-2007, Stefan Lippers-Hollmann + 2004-2007, Niall Walsh + 2002, Klaus Knopper +License: GPL-2 -The scripts written by the grml-team are available under the -conditions of the GPL. - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - -The Debian packaging is (C) 2006, Michael Prokop and -is licensed under the GPL, see above. +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-network.dirs b/debian/grml-network.dirs new file mode 100644 index 0000000..1fb9c1e --- /dev/null +++ b/debian/grml-network.dirs @@ -0,0 +1,2 @@ +/etc/grml/ +/usr/sbin/ diff --git a/debian/grml-network.docs b/debian/grml-network.docs new file mode 100644 index 0000000..1333ed7 --- /dev/null +++ b/debian/grml-network.docs @@ -0,0 +1 @@ +TODO diff --git a/debian/grml-network.manpages b/debian/grml-network.manpages new file mode 100644 index 0000000..144aa53 --- /dev/null +++ b/debian/grml-network.manpages @@ -0,0 +1,3 @@ +man/grml-ap.8 +man/grml-bridge.8 +man/grml-router.8 diff --git a/debian/rules b/debian/rules index db8fe62..218df65 100755 --- a/debian/rules +++ b/debian/rules @@ -1,61 +1,8 @@ #!/usr/bin/make -f # -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -build: build-stamp - -build-stamp: - dh_testdir - ( cd docs && $(MAKE) ) - touch $@ - -clean: - dh_testdir - dh_testroot - ( cd docs && $(MAKE) clean ) - rm -f build-stamp - dh_prep - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs usr/sbin etc/grml - - install -m 755 sbin/* debian/grml-network/usr/sbin/ - install -m 644 net-functions debian/grml-network/etc/grml/ - install -m 644 routersetup debian/grml-network/etc/grml/ - - ( cd docs && $(MAKE) install DESTDIR=../debian/grml-network ) - -# Build architecture-independent files here. -binary-arch: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-indep: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs TODO - dh_installexamples - dh_installman man/grml-ap.8 man/grml-bridge.8 man/grml-router.8 - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - 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/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native)