debian: fix postrm

5 files changed, 8 insertions, 84 deletions

diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice
-Subproject fe987187e178816d42ed12178d430c8771cb5a7
+Subproject 4320467db1392e5f48a4acd079f7e2a253cf998
diff --git a/debian/changelog b/debian/changelog
index c9d126cd..153033d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+taler-merchant (0.9.0-12) unstable; urgency=low
+
+  * Fix broken postrm script.
+
+ -- Florian Dold <florian@dold.me>  Sat, 31 Jul 2021 16:51:32 +0200
+
 taler-merchant (0.9.0-11) unstable; urgency=low
 
   * Various packaging bugfixes.
diff --git a/debian/libtalermerchant-dev.install b/debian/libtalermerchant-dev.install
index cc6e2800..08045798 100644
--- a/debian/libtalermerchant-dev.install
+++ b/debian/libtalermerchant-dev.install
@@ -2,3 +2,4 @@ usr/bin/taler-merchant-benchmark
 usr/include
 usr/lib/*/*.so
 usr/lib/*/libtalermerchanttesting.so.*
+usr/lib/*/libtalermerchanttesting.so
diff --git a/debian/rules b/debian/rules
index af1170d0..92663194 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ override_dh_installsystemd:
 	# final invocation to generate daemon reload
 	dh_installsystemd
 
-# Remove files already present in libtalerexchange from main taler-exchange package
+# Remove files already present in libtalermerchant from main taler-merchant package
 override_dh_install:
 	dh_install
 	cd debian/libtalermerchant-dev; find . -type f -exec rm -f ../taler-merchant/{} \;
diff --git a/debian/taler-merchant.postrm b/debian/taler-merchant.postrm
index a39e64b9..bf628b36 100644
--- a/debian/taler-merchant.postrm
+++ b/debian/taler-merchant.postrm
@@ -2,33 +2,6 @@
 
 set -e
 
-pathfind() {
-	OLDIFS="$IFS"
-	IFS=:
-	for p in $PATH; do
-		if [ -x "$p/$*" ]; then
-			IFS="$OLDIFS"
-			return 0
-		fi
-	done
-	IFS="$OLDIFS"
-	return 1
-}
-
-apache_remove() {
-    if [ diff /etc/taler-merchant/apache.conf /etc/apache2/conf-available/taler-merchant.conf >/dev/null 2>&1 ];
-    then
-	    rm -f /etc/apache2/conf-available/taler-merchant.conf
-    fi
-}
-
-nginx_remove() {
-    if [ diff /etc/taler-exchange/nginx.conf /etc/apache2/conf-available/taler-exchange.conf >/dev/null 2>&1 ];
-    then
-	    rm -f /etc/nginx/conf-available/taler-merchant.conf
-    fi
-}
-
 if [ -f /usr/share/debconf/confmodule ]; then
     . /usr/share/debconf/confmodule
 fi
@@ -38,62 +11,6 @@ if [ -f /usr/share/dbconfig-common/dpkg/postrm.pgsql ]; then
     dbc_go taler-merchant "$@"
 fi
 
-
-if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
-	if [ -f /usr/share/debconf/confmodule ]; then
-		. /usr/share/debconf/confmodule
-		db_version 2.0
-		db_get taler-merchant/reconfigure-webserver
-		webservers="$RET"
-		for webserver in $webservers; do
-			webserver=${webserver%,}
-			if [ "$webserver" = "nginx" ] ; then
-				nginx_remove
-			else
-				apache_remove
-			fi
-		done
-	fi
-fi
-
-case "${1}" in
-	purge)
-    rm -f /var/lib/taler-merchant/master-api-key.txt
-    rm -rf /var/lib/taler-merchant/httpd/
-  	if [ -e /usr/share/debconf/confmodule ]
-		then
-			. /usr/share/debconf/confmodule
-			db_version 2.0
-
-			db_get taler-merchant/username
-			_USERNAME="${RET:-taler-merchant-httpd}"
-
-			db_get taler-merchant/groupname
-			_GROUPNAME="${RET:-taler-merchant-httpd}"
-		else
-			_USERNAME="taler-merchant-httpd"
-			_GROUPNAME="taler-merchant-httpd"
-		fi
-
-		if pathfind deluser
-		then
-			deluser --quiet --system ${_USERNAME} || true
-		fi
-
-		if pathfind delgroup
-		then
-			delgroup --quiet --system --only-if-empty ${_GROUPNAME} || true
-		fi
-        ;;
-    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-		;;
-
-	*)
-		echo "postrm called with unknown argument \`${1}'" >&2
-		exit 1
-		;;
-esac
-
 #DEBHELPER#
 
 exit 0