Updating packaging for upstream rename.

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

5 files changed, 18 insertions, 17 deletions

diff --git a/debian/copyright b/debian/copyright
index 8dcfcc8..6f44735 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: apache-icons
+Upstream-Name: service-tools
 Upstream-Contact: Open Infrastructure <software@lists.open-infrastructure.net>
-Source: https://sources.open-infrastructure.net/software/apache-icons
+Source: https://git.open-infrastructure.net/software/service-tools
 
 Files: *
 Copyright: 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
diff --git a/debian/open-infrastructure-apache-tools.postinst b/debian/open-infrastructure-apache-tools.postinst
index 0aad571..b6ba70b 100755
--- a/debian/open-infrastructure-apache-tools.postinst
+++ b/debian/open-infrastructure-apache-tools.postinst
@@ -4,15 +4,15 @@ 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
+		update-alternatives --quiet --install /usr/share/open-infrastructure/apache-icons/default apache-icons /usr/share/apache2/icons 1000
+		update-alternatives --quiet --install /usr/share/open-infrastructure/apache-icons/default apache-icons /usr/share/open-infrastructure/apache-icons/tango-png 2000 \
+			--slave /usr/share/open-infrastructure/apache-icons/default.conf apache-icons.conf /usr/share/open-infrastructure/apache-icons/tango-png.conf
+		update-alternatives --quiet --install /usr/share/open-infrastructure/apache-icons/default apache-icons /usr/share/open-infrastructure/apache-icons/tango-svg 3000 \
+			--slave /usr/share/open-infrastructure/apache-icons/default.conf apache-icons.conf /usr/share/open-infrastructure/apache-icons/tango-svg.conf
+		update-alternatives --quiet --install /usr/share/open-infrastructure/apache-icons/default apache-icons /usr/share/open-infrastructure/apache-icons/awesome-png 4000 \
+			--slave /usr/share/open-infrastructure/apache-icons/default.conf apache-icons.conf /usr/share/open-infrastructure/apache-icons/awesome-png.conf
+		update-alternatives --quiet --install /usr/share/open-infrastructure/apache-icons/default apache-icons /usr/share/open-infrastructure/apache-icons/awesome-svg 5000 \
+			--slave /usr/share/open-infrastructure/apache-icons/default.conf apache-icons.conf /usr/share/open-infrastructure/apache-icons/awesome-svg.conf
 		;;
 
 	abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/open-infrastructure-apache-tools.prerm b/debian/open-infrastructure-apache-tools.prerm
index ade38b2..39aeb10 100755
--- a/debian/open-infrastructure-apache-tools.prerm
+++ b/debian/open-infrastructure-apache-tools.prerm
@@ -5,10 +5,10 @@ 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
+		update-alternatives --quiet --remove apache-icons /usr/share/open-infrastructure/apache-icons/tango-png
+		update-alternatives --quiet --remove apache-icons /usr/share/open-infrastructure/apache-icons/tango-svg
+		update-alternatives --quiet --remove apache-icons /usr/share/open-infrastructure/apache-icons/awesome-png
+		update-alternatives --quiet --remove apache-icons /usr/share/open-infrastructure/apache-icons/awesome-svg
 		;;
 
 	failed-upgrade)
diff --git a/debian/rules b/debian/rules
index 4f3bd48..1ad63c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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/apache-icons debian/open-infrastructure-$(PACKAGE)/usr/share/doc/open-infrastructure-$(PACKAGE)
+	mv debian/open-infrastructure-$(PACKAGE)/usr/share/doc/* debian/open-infrastructure-$(PACKAGE)/usr/share/doc/open-infrastructure-$(PACKAGE)
diff --git a/debian/watch b/debian/watch
index 64b1b02..2bafd3d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=4
-opts=pgpmode=auto https://files.open-infrastructure.net/software/apache-icons/upstream/apache-icons-(.+)\.tar\.lz
+opts="pgpmode=auto" \
+https://get.open-infrastructure.net/software/service-tools/upstream/service-tools-(.+)\.tar\.lz