From 5f8965df25cc21d2b6ce91f9e85eab5909f5136f Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Thu, 27 Dec 2018 22:56:13 -0800 Subject: [PATCH] debian: Rename plinth package to freedombox Reviewed-by: James Valleroy --- .gitignore | 13 +++++++----- data/etc/plinth/plinth.config | 2 +- data/etc/update-motd.d/50-freedombox | 5 +++-- debian/control | 21 +++++++++++++++++-- debian/freedombox.doc-base | 17 +++++++++++++++ debian/{plinth.docs => freedombox.docs} | 0 ...overrides => freedombox.lintian-overrides} | 6 +++--- ...nth.maintscript => freedombox.maintscript} | 0 debian/plinth.doc-base | 16 -------------- debian/rules | 4 ++-- setup.py | 2 +- 11 files changed, 54 insertions(+), 32 deletions(-) create mode 100644 debian/freedombox.doc-base rename debian/{plinth.docs => freedombox.docs} (100%) rename debian/{plinth.lintian-overrides => freedombox.lintian-overrides} (79%) rename debian/{plinth.maintscript => freedombox.maintscript} (100%) delete mode 100644 debian/plinth.doc-base diff --git a/.gitignore b/.gitignore index 82b2d0ef1..7e6fafbd2 100644 --- a/.gitignore +++ b/.gitignore @@ -31,11 +31,14 @@ plinth/tests/coverage/report/ debian/.debhelper/ debian/debhelper-build-stamp debian/files +debian/freedombox.debhelper.log +debian/freedombox.postinst.debhelper +debian/freedombox.postrm.debhelper +debian/freedombox.preinst.debhelper +debian/freedombox.prerm.debhelper +debian/freedombox.substvars +debian/freedombox/ debian/plinth.debhelper.log -debian/plinth.postinst.debhelper -debian/plinth.postrm.debhelper -debian/plinth.preinst.debhelper -debian/plinth.prerm.debhelper debian/plinth.substvars debian/plinth/ -*.pytest_cache/ \ No newline at end of file +*.pytest_cache/ diff --git a/data/etc/plinth/plinth.config b/data/etc/plinth/plinth.config index bb553e870..a3a373462 100644 --- a/data/etc/plinth/plinth.config +++ b/data/etc/plinth/plinth.config @@ -5,7 +5,7 @@ config_dir = /etc/plinth data_dir = /var/lib/plinth server_dir = /plinth actions_dir = /usr/share/plinth/actions -doc_dir = /usr/share/doc/plinth +doc_dir = /usr/share/doc/freedombox custom_static_dir = /var/www/plinth/custom/static # file locations diff --git a/data/etc/update-motd.d/50-freedombox b/data/etc/update-motd.d/50-freedombox index 3dfa48419..e4567b798 100755 --- a/data/etc/update-motd.d/50-freedombox +++ b/data/etc/update-motd.d/50-freedombox @@ -12,6 +12,7 @@ cat <<"EOF" FreedomBox -FreedomBox is a pure blend of Debian GNU/Linux. FreedomBox manual is -available in /usr/share/doc/plinth. +FreedomBox is a pure blend of Debian GNU/Linux. Web interface is available at +https://localhost/ . FreedomBox manual is available in /usr/share/doc/freedombox +and from the web interace. EOF diff --git a/debian/control b/debian/control index 1eb945713..6857e88c5 100644 --- a/debian/control +++ b/debian/control @@ -44,14 +44,15 @@ Homepage: https://salsa.debian.org/freedombox-team/plinth Vcs-Git: https://salsa.debian.org/freedombox-team/plinth.git Vcs-Browser: https://salsa.debian.org/freedombox-team/plinth -Package: plinth +Package: freedombox Breaks: freedombox-setup (<< 0.13~) Replaces: freedombox-setup (<< 0.13~) Architecture: all +Provides: plinth Depends: ${python3:Depends}, ${misc:Depends}, - ${plinth:Depends}, + ${freedombox:Depends}, adduser, augeas-tools, curl, @@ -156,3 +157,19 @@ Description: easy to manage, privacy oriented home server This package provides the FreedomBox Service (Plinth) which installs, configures and manages all functions of FreedomBox. The service is managed using a web interface available at https://localhost/. + +Package: plinth +Architecture: all +Priority: optional +Section: oldlibs +Depends: + ${misc:Depends}, + freedombox, +Description: easy to manage, privacy oriented home server (transitional package) + FreedomBox is designed to be your own inexpensive server at home. It runs free + software and offers an increasing number of services ranging from a calendar or + jabber server to a wiki or VPN. A web interface allows you to easily install + and configure your apps. + . + This is a transitional package. It can safely be removed. plinth package has + been renamed to freedombox. diff --git a/debian/freedombox.doc-base b/debian/freedombox.doc-base new file mode 100644 index 000000000..1ce72d4b0 --- /dev/null +++ b/debian/freedombox.doc-base @@ -0,0 +1,17 @@ +Document: freedombox +Title: FreedomBox Documentation +Author: FreedomBox Authors +Abstract: easy to manage, privacy oriented home server + FreedomBox is designed to be your own inexpensive server at home. It runs free + software and offers an increasing number of services ranging from a calendar or + jabber server to a wiki or VPN. A web interface allows you to easily install + and configure your apps. + . + This package provides the FreedomBox Service (Plinth) which installs, + configures and manages all functions of FreedomBox. The service is managed + using a web interface available at https://localhost/. +Section: Network/Communication + +Format: HTML +Index: /usr/share/doc/freedombox/freedombox-manual.part.html +Files: /usr/share/doc/freedombox/* diff --git a/debian/plinth.docs b/debian/freedombox.docs similarity index 100% rename from debian/plinth.docs rename to debian/freedombox.docs diff --git a/debian/plinth.lintian-overrides b/debian/freedombox.lintian-overrides similarity index 79% rename from debian/plinth.lintian-overrides rename to debian/freedombox.lintian-overrides index 649a9cad9..13f87a95e 100644 --- a/debian/plinth.lintian-overrides +++ b/debian/freedombox.lintian-overrides @@ -1,6 +1,6 @@ # debconf is used only to display a message, and not to get # configuration. -plinth binary: no-debconf-config +freedombox binary: no-debconf-config # Apache configuration for the Plinth itself is shipped with proper # name plinth.conf. However, due to the nature of the package, Plinth @@ -8,10 +8,10 @@ plinth binary: no-debconf-config # behind Apache. The upstream hence ships various Apache # configuration files which are enabled and disabled when user # requests. -plinth binary: non-standard-apache2-configuration-name * +freedombox binary: non-standard-apache2-configuration-name * # Plinth depends on Apache2 and cannot work with just any web server. Instead of # being a simple web application it is an administration console that configures # web servers. At some point we would like to work with other web servers but # that requires significant effort. -plinth binary: web-application-should-not-depend-unconditionally-on-apache2 +freedombox binary: web-application-should-not-depend-unconditionally-on-apache2 diff --git a/debian/plinth.maintscript b/debian/freedombox.maintscript similarity index 100% rename from debian/plinth.maintscript rename to debian/freedombox.maintscript diff --git a/debian/plinth.doc-base b/debian/plinth.doc-base deleted file mode 100644 index 12d0b8a5e..000000000 --- a/debian/plinth.doc-base +++ /dev/null @@ -1,16 +0,0 @@ -Document: plinth -Title: Plinth Documentation -Author: Plinth Authors -Abstract: web front end for administering every aspect of a FreedomBox - The FreedomBox is a net appliance conceived by Eben Moglen. It - contains free software and is designed to allow you to interface with - the rest of the net under conditions of protected privacy and data - security. - The Plinth front end is a web interface to administer the functions of - the FreedomBox. For example, the FreedomBox is a wireless router, - and the front end is where you can adjust its settings. -Section: Network/Communication - -Format: HTML -Index: /usr/share/doc/plinth/freedombox-manual.part.html -Files: /usr/share/doc/plinth/* diff --git a/debian/rules b/debian/rules index 0b67cf9f8..aecb9872a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f export DH_VERBOSE=1 -export PYBUILD_NAME=plinth +export PYBUILD_DESTDIR=debian/freedombox %: dh $@ --with python3 --buildsystem=pybuild @@ -9,7 +9,7 @@ export PYBUILD_NAME=plinth override_dh_auto_install-indep: dh_auto_install ./run --list-dependencies 2> /dev/null | sort | tr '\n' ', ' | \ - sed -e 's/^/plinth:Depends=/' >> debian/plinth.substvars + sed -e 's/^/freedombox:Depends=/' >> debian/freedombox.substvars override_dh_auto_test: PYBUILD_SYSTEM=custom \ diff --git a/setup.py b/setup.py index 2ad29a791..ef61b15e5 100755 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ DIRECTORIES_TO_CREATE = [ ] DIRECTORIES_TO_COPY = [ - ('/usr/share/doc/plinth', 'doc'), + ('/usr/share/doc/freedombox', 'doc'), ('/usr/share/plinth/static', 'static'), ]