summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/control22
-rw-r--r--debian/open-infrastructure-apache-tools.lintian-overrides4
-rw-r--r--debian/open-infrastructure-service-tools.lintian-overrides4
-rwxr-xr-xdebian/open-infrastructure-service-tools.postinst (renamed from debian/open-infrastructure-apache-tools.postinst)0
-rwxr-xr-xdebian/open-infrastructure-service-tools.prerm (renamed from debian/open-infrastructure-apache-tools.prerm)0
-rwxr-xr-xdebian/rules20
6 files changed, 26 insertions, 24 deletions
diff --git a/debian/control b/debian/control
index ac19626..c179703 100644
--- a/debian/control
+++ b/debian/control
@@ -14,22 +14,34 @@ 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-tools
+Package: open-infrastructure-service-tools
Section: admin
Architecture: all
Depends:
apache2-data,
${misc:Depends},
-Provides:
- apache-tools,
Enhances:
apache2,
-Description: additional tools for Apache HTTP server
- This package contains additional tools for the Apache HTTP server:
+Description: additional tools to ease system administration and integration
+ This package contains some usefull tools, e.g.:
.
* alternative icons for Apache autoindex (Tango Icons and Font Awesome
based themes)
+Package: open-infrastructure-apache-tools
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends:
+ open-infrastructure-service-tools,
+ ${misc:Depends},
+Description: additional tools for Apache HTTP server (transitional package)
+ Package to ease upgrading from older open-infrastructure-apache-tools package
+ to the new open-infrastructure-service-tools package.
+ .
+ This package can be purged at anytime once the open-infrastructure-service-tools
+ package has been installed.
+
#Package: open-infrastructure-dehydrated-tools
#Section: admin
#Architecture: all
diff --git a/debian/open-infrastructure-apache-tools.lintian-overrides b/debian/open-infrastructure-apache-tools.lintian-overrides
deleted file mode 100644
index a73033e..0000000
--- a/debian/open-infrastructure-apache-tools.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# '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-service-tools.lintian-overrides b/debian/open-infrastructure-service-tools.lintian-overrides
new file mode 100644
index 0000000..9970e45
--- /dev/null
+++ b/debian/open-infrastructure-service-tools.lintian-overrides
@@ -0,0 +1,4 @@
+# '000-' prefix is required to keep order of apache parsing working
+open-infrastructure-service-tools: non-standard-apache2-configuration-name
+# service-tools is for apache2 only
+open-infrastructure-service-tools: web-application-depends-on-apache2-data-package
diff --git a/debian/open-infrastructure-apache-tools.postinst b/debian/open-infrastructure-service-tools.postinst
index 2cd7822..2cd7822 100755
--- a/debian/open-infrastructure-apache-tools.postinst
+++ b/debian/open-infrastructure-service-tools.postinst
diff --git a/debian/open-infrastructure-apache-tools.prerm b/debian/open-infrastructure-service-tools.prerm
index b580074..b580074 100755
--- a/debian/open-infrastructure-apache-tools.prerm
+++ b/debian/open-infrastructure-service-tools.prerm
diff --git a/debian/rules b/debian/rules
index b3924c0..62c4dda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,13 @@
#!/usr/bin/make -f
-PACKAGES := $(shell dh_listpackages | cut -d '-' -f 3- | sed -e 's|-tools$$||')
-
%:
dh ${@} --with apache2
override_dh_auto_install:
- for PACKAGE in $(PACKAGES); \
- do \
- $(MAKE) -C $${PACKAGE} DESTDIR=$(CURDIR)/debian/open-infrastructure-$${PACKAGE}-tools install; \
- done
-
# apache-tools
- rm -f debian/open-infrastructure-apache-tools/usr/share/doc/apache-tools/CHANGELOG.txt
- rm -f debian/open-infrastructure-apache-tools/usr/share/doc/apache-tools/LICENSE.txt
- -mv debian/open-infrastructure-apache-tools/usr/share/doc/* debian/open-infrastructure-apache-tools/usr/share/doc/open-infrastructure-apache-tools
+ $(MAKE) -C apache DESTDIR=$(CURDIR)/debian/open-infrastructure-service-tools install
-ifeq (open-infrastructure-linux-tools,$(findstring open-infrastructure-linux-tools,$(PACKAGES)))
-override_dh_installsystemd:
- dh_installsystemd -p open-infrastructure-linux-tools --no-restart-after-upgrade --no-start --no-stop-on-upgrade
- dh_installsystemd --remaining-packages
-endif
+ # service-tools
+ rm -f debian/open-infrastructure-service-tools/usr/share/doc/service-tools/CHANGELOG.txt
+ rm -f debian/open-infrastructure-service-tools/usr/share/doc/service-tools/LICENSE.txt
+ -mv debian/open-infrastructure-service-tools/usr/share/doc/* debian/open-infrastructure-service-tools/usr/share/doc/open-infrastructure-service-tools