diff -Nru notion-3+2015061300/debian/changelog notion-3+2015061300/debian/changelog
--- notion-3+2015061300/debian/changelog	2015-12-10 21:01:18.000000000 +0000
+++ notion-3+2015061300/debian/changelog	2016-07-15 06:07:51.000000000 +0000
@@ -1,3 +1,11 @@
+notion (3+2015061300-2) unstable; urgency=medium
+
+  * Fixed dh_install rules to work properly with arch:all-only and
+    arch:any-only builds. Thanks to Santiago Vila for the patch.
+    (Closes: #830577, #830848)
+
+ -- Dima Kogan <dkogan@debian.org>  Thu, 14 Jul 2016 23:06:27 -0700
+
 notion (3+2015061300-1) unstable; urgency=medium
 
   * New upstream version
diff -Nru notion-3+2015061300/debian/control notion-3+2015061300/debian/control
--- notion-3+2015061300/debian/control	2015-11-25 09:04:31.000000000 +0000
+++ notion-3+2015061300/debian/control	2016-07-15 05:59:12.000000000 +0000
@@ -2,7 +2,7 @@
 Section: non-free/x11
 Priority: extra
 Maintainer: Arnout Engelen <arnouten@bzzt.net>
-Uploaders: Dima Kogan <dima@secretsauce.net>
+Uploaders: Dima Kogan <dkogan@debian.org>
 Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 9), pkg-config, lua5.2, liblua5.2-dev, libx11-dev, libxext-dev, libsm-dev, libxinerama-dev, libxrandr-dev
 XS-Autobuild: yes
diff -Nru notion-3+2015061300/debian/rules notion-3+2015061300/debian/rules
--- notion-3+2015061300/debian/rules	2015-11-25 09:04:31.000000000 +0000
+++ notion-3+2015061300/debian/rules	2016-07-15 04:15:11.000000000 +0000
@@ -9,7 +9,7 @@
 override_dh_auto_build:
 	CFLAGS="$(CFLAGS) $(CPPFLAGS)" dh_auto_build
 
-override_dh_installman:
+override_dh_installman-arch:
 	for langdir in debian/tmp/usr/share/man/*; do								\
 		lang=`basename $$langdir`;									\
 		test $$lang = "man1" || dh_installman --language $$lang debian/tmp/usr/share/man/$$lang/man1/*;	\
@@ -21,12 +21,12 @@
 override_dh_auto_test:
 	true
 
-override_dh_installmenu:
+override_dh_installmenu-arch:
 	dh_installmenu
 	install -m644 debian/notion.menu-method.i18n \
 		debian/notion/etc/menu-methods/notion-i18n
 
-override_dh_install:
+override_dh_install-indep:
 	dh_install
 
 	# install headers
@@ -34,8 +34,12 @@
 		-prune -o -name '*.h' -exec install -m644 -D {} \
 		debian/notion-dev/usr/include/notion/{} \;
 
+override_dh_fixperms-indep:
+	dh_fixperms
 	# this needs to be executable
 	chmod a+x debian/notion-dev/usr/lib/notion/libextl/libextl-mkexports
 
+override_dh_install-arch:
+	dh_install
 	# notionflux should go into /usr/bin. The upstream install should probably do this
 	mv debian/notion/usr/lib/notion/notionflux debian/notion/usr/bin