From e936b706e7249f148773d0dee348b9bed1b9687a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 3 Feb 2019 10:34:33 +0100 Subject: Renaming binary package to open-infrastructure-apache-tools for consistency and future-proofing. Signed-off-by: Daniel Baumann --- debian/control | 22 +++++++++++++--- ...n-infrastructure-apache-icons.lintian-overrides | 4 --- debian/open-infrastructure-apache-icons.postinst | 30 ---------------------- debian/open-infrastructure-apache-icons.prerm | 26 ------------------- ...n-infrastructure-apache-tools.lintian-overrides | 4 +++ debian/open-infrastructure-apache-tools.postinst | 30 ++++++++++++++++++++++ debian/open-infrastructure-apache-tools.prerm | 26 +++++++++++++++++++ debian/rules | 4 +-- 8 files changed, 81 insertions(+), 65 deletions(-) delete mode 100644 debian/open-infrastructure-apache-icons.lintian-overrides delete mode 100755 debian/open-infrastructure-apache-icons.postinst delete mode 100755 debian/open-infrastructure-apache-icons.prerm create mode 100644 debian/open-infrastructure-apache-tools.lintian-overrides create mode 100755 debian/open-infrastructure-apache-tools.postinst create mode 100755 debian/open-infrastructure-apache-tools.prerm diff --git a/debian/control b/debian/control index a4ce064..d4fa931 100644 --- a/debian/control +++ b/debian/control @@ -18,17 +18,21 @@ Homepage: https://open-infrastructure.net/software/service-tools Vcs-Browser: https://git.progress-linux.org/users/daniel.baumann/debian/packages/open-infrastructure-service-tools Vcs-Git: https://git.progress-linux.org/users/daniel.baumann/debian/packages/open-infrastructure-service-tools -Package: open-infrastructure-apache-icons +Package: open-infrastructure-apache-tools Section: admin Architecture: all Depends: apache2-data, ${misc:Depends}, Provides: - apache-icons, + apache-tools, Enhances: apache2, -Description: alternative icons for Apache autoindex +Breaks: + open-infrastructure-apache-icons (<< 20170701-3~), +Replaces: + open-infrastructure-apache-icons, +Description: Additional utilities for Apache The Apache HTTP Server is the world's most used web server software. . apache-icons provides alternative icons for Apache autoindex: @@ -37,3 +41,15 @@ Description: alternative icons for Apache autoindex * tango-svg: Tango Icon Theme based, SVG format * awesome-png: Font Awesome based, PNG format * awesome-svg: Font Awesome based, SVG format + +Package: open-infrastructure-apache-icons +Architecture: all +Depends: + open-infrastructure-apache-tools (= ${source:Version}), + ${misc:Depends}, +Description: Additional utilities for Apache (transitional package) + Package to ease upgrading from older open-infrastructure-apache-icons package + to the new open-infrastructure-apache-tools package. + . + This package can be purged at anytime once the open-infrastructure-apache-tools + package has been installed. diff --git a/debian/open-infrastructure-apache-icons.lintian-overrides b/debian/open-infrastructure-apache-icons.lintian-overrides deleted file mode 100644 index ffcea05..0000000 --- a/debian/open-infrastructure-apache-icons.lintian-overrides +++ /dev/null @@ -1,4 +0,0 @@ -# '000-' prefix is required to keep order of apache parsing working -open-infrastructure-apache-icons: non-standard-apache2-configuration-name -# apache-icons is for apache2 only -open-infrastructure-apache-icons: web-application-depends-on-apache2-data-package diff --git a/debian/open-infrastructure-apache-icons.postinst b/debian/open-infrastructure-apache-icons.postinst deleted file mode 100755 index 0aad571..0000000 --- a/debian/open-infrastructure-apache-icons.postinst +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -set -e - -case "${1}" in - configure) - update-alternatives --quiet --install /usr/share/apache-icons/default apache-icons /usr/share/apache2/icons 1000 - update-alternatives --quiet --install /usr/share/apache-icons/default apache-icons /usr/share/apache-icons/tango-png 2000 \ - --slave /usr/share/apache-icons/default.conf apache-icons.conf /usr/share/apache-icons/tango-png.conf - update-alternatives --quiet --install /usr/share/apache-icons/default apache-icons /usr/share/apache-icons/tango-svg 3000 \ - --slave /usr/share/apache-icons/default.conf apache-icons.conf /usr/share/apache-icons/tango-svg.conf - update-alternatives --quiet --install /usr/share/apache-icons/default apache-icons /usr/share/apache-icons/awesome-png 4000 \ - --slave /usr/share/apache-icons/default.conf apache-icons.conf /usr/share/apache-icons/awesome-png.conf - update-alternatives --quiet --install /usr/share/apache-icons/default apache-icons /usr/share/apache-icons/awesome-svg 5000 \ - --slave /usr/share/apache-icons/default.conf apache-icons.conf /usr/share/apache-icons/awesome-svg.conf - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`${1}'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/open-infrastructure-apache-icons.prerm b/debian/open-infrastructure-apache-icons.prerm deleted file mode 100755 index ade38b2..0000000 --- a/debian/open-infrastructure-apache-icons.prerm +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -set -e - -case "${1}" in - remove|upgrade|deconfigure) - update-alternatives --quiet --remove apache-icons /usr/share/apache2/icons - update-alternatives --quiet --remove apache-icons /usr/share/apache-icons/tango-png - update-alternatives --quiet --remove apache-icons /usr/share/apache-icons/tango-svg - update-alternatives --quiet --remove apache-icons /usr/share/apache-icons/awesome-png - update-alternatives --quiet --remove apache-icons /usr/share/apache-icons/awesome-svg - ;; - - failed-upgrade) - - ;; - - *) - echo "prerm called with unknown argument \`${1}'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/open-infrastructure-apache-tools.lintian-overrides b/debian/open-infrastructure-apache-tools.lintian-overrides new file mode 100644 index 0000000..a73033e --- /dev/null +++ b/debian/open-infrastructure-apache-tools.lintian-overrides @@ -0,0 +1,4 @@ +# '000-' prefix is required to keep order of apache parsing working +open-infrastructure-apache-tools: non-standard-apache2-configuration-name +# apache-tools is for apache2 only +open-infrastructure-apache-tools: web-application-depends-on-apache2-data-package diff --git a/debian/open-infrastructure-apache-tools.postinst b/debian/open-infrastructure-apache-tools.postinst new file mode 100755 index 0000000..0aad571 --- /dev/null +++ b/debian/open-infrastructure-apache-tools.postinst @@ -0,0 +1,30 @@ +#!/bin/sh + +set -e + +case "${1}" in + configure) + update-alternatives --quiet --install /usr/share/apache-icons/default apache-icons /usr/share/apache2/icons 1000 + update-alternatives --quiet --install /usr/share/apache-icons/default apache-icons /usr/share/apache-icons/tango-png 2000 \ + --slave /usr/share/apache-icons/default.conf apache-icons.conf /usr/share/apache-icons/tango-png.conf + update-alternatives --quiet --install /usr/share/apache-icons/default apache-icons /usr/share/apache-icons/tango-svg 3000 \ + --slave /usr/share/apache-icons/default.conf apache-icons.conf /usr/share/apache-icons/tango-svg.conf + update-alternatives --quiet --install /usr/share/apache-icons/default apache-icons /usr/share/apache-icons/awesome-png 4000 \ + --slave /usr/share/apache-icons/default.conf apache-icons.conf /usr/share/apache-icons/awesome-png.conf + update-alternatives --quiet --install /usr/share/apache-icons/default apache-icons /usr/share/apache-icons/awesome-svg 5000 \ + --slave /usr/share/apache-icons/default.conf apache-icons.conf /usr/share/apache-icons/awesome-svg.conf + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`${1}'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/open-infrastructure-apache-tools.prerm b/debian/open-infrastructure-apache-tools.prerm new file mode 100755 index 0000000..ade38b2 --- /dev/null +++ b/debian/open-infrastructure-apache-tools.prerm @@ -0,0 +1,26 @@ +#!/bin/sh + +set -e + +case "${1}" in + remove|upgrade|deconfigure) + update-alternatives --quiet --remove apache-icons /usr/share/apache2/icons + update-alternatives --quiet --remove apache-icons /usr/share/apache-icons/tango-png + update-alternatives --quiet --remove apache-icons /usr/share/apache-icons/tango-svg + update-alternatives --quiet --remove apache-icons /usr/share/apache-icons/awesome-png + update-alternatives --quiet --remove apache-icons /usr/share/apache-icons/awesome-svg + ;; + + failed-upgrade) + + ;; + + *) + echo "prerm called with unknown argument \`${1}'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/rules b/debian/rules index b39b64b..4f3bd48 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -PACKAGE := apache-icons +PACKAGE := apache-tools %: dh ${@} --with apache2 @@ -14,4 +14,4 @@ override_dh_auto_install: rm -f debian/open-infrastructure-$(PACKAGE)/usr/share/doc/$(PACKAGE)/CHANGELOG.txt rm -f debian/open-infrastructure-$(PACKAGE)/usr/share/doc/$(PACKAGE)/LICENSE.txt - mv debian/open-infrastructure-$(PACKAGE)/usr/share/doc/$(PACKAGE) debian/open-infrastructure-$(PACKAGE)/usr/share/doc/open-infrastructure-$(PACKAGE) + mv debian/open-infrastructure-$(PACKAGE)/usr/share/doc/apache-icons debian/open-infrastructure-$(PACKAGE)/usr/share/doc/open-infrastructure-$(PACKAGE) -- cgit v1.2.3