Renaming binary package to open-infrastructure-apache-tools for consistency and future-proofing.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 25 insertions, 9 deletions

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-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-icons.postinst b/debian/open-infrastructure-apache-tools.postinst
index 0aad571..0aad571 100755
--- a/debian/open-infrastructure-apache-icons.postinst
+++ b/debian/open-infrastructure-apache-tools.postinst
diff --git a/debian/open-infrastructure-apache-icons.prerm b/debian/open-infrastructure-apache-tools.prerm
index ade38b2..ade38b2 100755
--- a/debian/open-infrastructure-apache-icons.prerm
+++ b/debian/open-infrastructure-apache-tools.prerm
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)