1 files changed, 8 insertions, 8 deletions
diff --git a/debian/rules b/debian/rules
index 193f2a9..7bfad39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-export DH_GOPKG = 0xacab.org/leap/riseup_vpn
+export DH_GOPKG = 0xacab.org/leap/bitmask-vpn
 export DH_GOLANG_EXCLUDES = vendor
 
 %:
@@ -13,11 +13,9 @@ export DH_GOLANG_EXCLUDES = vendor
 override_dh_auto_test:
 
 override_dh_auto_build:
-	# FIXME how ugly is this?
-	# this is the only way I found of having a quilt package made for the customized builds that gets
-	# in place the sources for bitmask-vpn
-	# XXX What var can I use instead of the hardcoded build dir?
-	ln -s `pwd` obj-x86_64-linux-gnu/src/0xacab.org/leap/bitmask-systray
+	rm -rf src/0xacab.org/leap/bitmask-vpn/tools/transifex
+	rm -rf obj-x86_64-linux-gnu/src/0xacab.org/leap/bitmask-vpn/tools/transifex
+	rm -rf tools
 	dh_auto_build
 
 override_dh_install:
@@ -26,6 +24,8 @@ override_dh_install:
 	mkdir -p $(CURDIR)/debian/riseup-vpn/usr/share/polkit-1/actions
 	cp $(CURDIR)/helpers/se.leap.bitmask.policy   $(CURDIR)/debian/riseup-vpn/usr/share/polkit-1/actions
 	rm -fr $(CURDIR)/debian/riseup-vpn/usr/share/gocode
-	rm -fr $(CURDIR)/debian/riseup-vpn/usr/bin/transifex
-	strip $(CURDIR)/debian/riseup-vpn/usr/bin/riseup_vpn
+	strip $(CURDIR)/debian/riseup-vpn/usr/bin/bitmask-vpn
+	rm $(CURDIR)/debian/riseup-vpn/usr/bin/bitmask-helper
+	rm $(CURDIR)/debian/riseup-vpn/usr/bin/bitmask-connect
+	mv $(CURDIR)/debian/riseup-vpn/usr/bin/bitmask-vpn $(CURDIR)/debian/riseup-vpn/usr/bin/riseup-vpn
 	dh_install