1 files changed, 18 insertions, 31 deletions
diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/rules b/ubuntu/_base/applications/misc/fusion-icon/debian/rules
index a0c6906dd..af04bd776 100755
--- a/ubuntu/_base/applications/misc/fusion-icon/debian/rules
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/rules
@@ -1,16 +1,9 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-DEB_PYTHON2_MODULE_PACKAGES=fusion-icon-trinity
+DEB_PYTHON3_MODULE_PACKAGES=fusion-icon-trinity
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-  include debian/python-distutils-custom.mk
-else
-  include /usr/share/cdbs/1/class/python-distutils.mk
-endif
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
 
 # The default gzip compressor has been changed in dpkg >= 1.17.0.
 deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -22,30 +15,24 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 endif
 
-post-patches::
-	# make sure that python binary exists
-	# since the existing code is still dependent on python2
-	# and cdbs uses python as the default binary name
-	test -x /usr/bin/python || ln -s python2 /usr/bin/python
-
 binary-install/fusion-icon-trinity::
-	mkdir -p debian/fusion-icon-trinity/usr/local/lib
-	cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/
-	rm -rf debian/fusion-icon-trinity/usr/local
-	mkdir -p debian/fusion-icon-trinity/temp
-	mv debian/fusion-icon-trinity/usr/lib debian/fusion-icon-trinity/temp
-	mkdir -p debian/fusion-icon-trinity/opt/trinity
-	cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
-	rm -rf debian/fusion-icon-trinity/usr
-	${DH_PYTHON2} -pfusion-icon-trinity
-	### 
+	mkdir -p debian/$(cdbs_curpkg)/usr/local/lib
+	cp -Rp debian/$(cdbs_curpkg)/usr/local/* debian/$(cdbs_curpkg)/usr/
+	rm -rf debian/$(cdbs_curpkg)/usr/local
+	mkdir -p debian/$(cdbs_curpkg)/temp
+	mv debian/$(cdbs_curpkg)/usr/lib debian/$(cdbs_curpkg)/temp
+	mkdir -p debian/$(cdbs_curpkg)/opt/trinity
+	cp -Rp debian/$(cdbs_curpkg)/usr/* debian/$(cdbs_curpkg)/opt/trinity/
+	rm -rf debian/$(cdbs_curpkg)/usr
+	dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin
+	###
 	# Must be done after invoking dh_pysupport, otherwise python scripts will
 	# end up in /usr/share/pyshare instead of dist-packages
-	mkdir -p debian/fusion-icon-trinity/usr
-	mv debian/fusion-icon-trinity/temp/lib debian/fusion-icon-trinity/usr
-	rm -rf debian/fusion-icon-trinity/temp
+	mkdir -p debian/$(cdbs_curpkg)/usr
+	mv debian/$(cdbs_curpkg)/temp/lib debian/$(cdbs_curpkg)/usr
+	rm -rf debian/$(cdbs_curpkg)/temp
 	###
-	mkdir -p debian/fusion-icon-trinity/usr/share/doc/fusion-icon-trinity
-	mv debian/fusion-icon-trinity/opt/trinity/share/doc/fusion-icon-trinity/* debian/fusion-icon-trinity/usr/share/doc/fusion-icon-trinity/
-	rmdir -p --ignore-fail-on-non-empty debian/fusion-icon-trinity/opt/trinity/share/doc/fusion-icon-trinity
+	mkdir -p debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)
+	mv debian/$(cdbs_curpkg)/opt/trinity/share/doc/$(cdbs_curpkg)/* debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/
+	rmdir -p --ignore-fail-on-non-empty debian/$(cdbs_curpkg)/opt/trinity/share/doc/$(cdbs_curpkg)
 	dh_icons