debian: update control syntax for python nautilus

Update Makefile and travis

.gitignore

@@ -2,3 +2,4 @@ rpm/
 deb/
 pkgs/
 *.gz
+debian/changelog.*

.travis.yml

@@ -1,16 +1,7 @@
-sudo: required
-dist: bionic
-language: generic
-install: git clone https://github.com/QubesOS/qubes-builder ~/qubes-builder
-script: ~/qubes-builder/scripts/travis-build
-env:
- - DIST_DOM0=fc25 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
- - DISTS_VM=fc30 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
- - DISTS_VM=fc31 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
- - DISTS_VM=stretch USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
- - DISTS_VM=buster USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
- - DIST_DOM0=fc31 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
- - DISTS_VM=bullseye USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
+import:
+  - source: QubesOS/qubes-continuous-integration:R4.1/travis-base-r4.1.yml
+  - source: QubesOS/qubes-continuous-integration:R4.1/travis-dom0-r4.1.yml
+  - source: QubesOS/qubes-continuous-integration:R4.1/travis-vms-r4.1.yml
 
 jobs:
   include:

Makefile

@@ -19,60 +19,6 @@
 #
 #
 
-RPMS_DIR=rpm/
-VERSION := $(shell cat version)
-
-help:
-	@echo "Qubes addons main Makefile:" ;\
-	    echo "make rpms                 <--- make rpms and sign them";\
-	    echo; \
-	    echo "make clean                <--- clean all the binary files";\
-	    echo "make update-repo-current  <-- copy newly generated rpms to qubes yum repo";\
-	    echo "make update-repo-current-testing <-- same, but for -current-testing repo";\
-	    echo "make update-repo-unstable <-- same, but to -testing repo";\
-	    echo "make update-repo-installer -- copy dom0 rpms to installer repo"
-	    @exit 0;
-
-rpms: rpms-vm
-
-rpms-dom0:
-	rpmbuild --define "_rpmdir rpm/" -bb rpm_spec/qpdf-converter-dom0.spec
-	rpm --addsign rpm/x86_64/qubes-pdf-converter-dom0*$(VERSION)*.rpm
-
-rpms-vm:
-	rpmbuild --define "_rpmdir rpm/" -bb rpm_spec/qpdf-converter.spec
-	rpm --addsign rpm/x86_64/qubes-pdf-converter*$(VERSION)*.rpm
-
-update-repo-current:
-	for vmrepo in ../yum/current-release/current/vm/* ; do \
-		dist=$$(basename $$vmrepo) ;\
-		ln -f $(RPMS_DIR)/x86_64/qubes-pdf-converter*$(VERSION)*$$dist*.rpm $$vmrepo/rpm/ ;\
-	done
-	ln -f $(RPMS_DIR)/x86_64/qubes-pdf-converter-dom0-*$(VERSION)*.rpm ../yum/current-release/current/dom0/rpm/
-
-update-repo-current-testing:
-	for vmrepo in ../yum/current-release/current-testing/vm/* ; do \
-		dist=$$(basename $$vmrepo) ;\
-		ln -f $(RPMS_DIR)/x86_64/qubes-pdf-converter*$(VERSION)*$$dist*.rpm $$vmrepo/rpm/ ;\
-	done
-	ln -f $(RPMS_DIR)/x86_64/qubes-pdf-converter-dom0-*$(VERSION)*.rpm ../yum/current-release/current-testing/dom0/rpm/
-
-update-repo-unstable:
-	for vmrepo in ../yum/current-release/unstable/vm/* ; do \
-		dist=$$(basename $$vmrepo) ;\
-		ln -f $(RPMS_DIR)/x86_64/qubes-pdf-converter*$(VERSION)*$$dist*.rpm $$vmrepo/rpm/ ;\
-	done
-	ln -f $(RPMS_DIR)/x86_64/qubes-pdf-converter-dom0-*$(VERSION)*.rpm ../yum/current-release/unstable/dom0/rpm/
-
-update-repo-template:
-	for vmrepo in ../template-builder/yum_repo_qubes/* ; do \
-		dist=$$(basename $$vmrepo) ;\
-		ln -f $(RPMS_DIR)/x86_64/qubes-pdf-converter*$(VERSION)*$$dist*.rpm $$vmrepo/rpm/ ;\
-	done
-
-update-repo-installer:
-	ln -f $(RPMS_DIR)/x86_64/qubes-pdf-converter-dom0-*$(VERSION)*.rpm ../installer/yum/qubes-dom0/rpm/
-
 build:
 	make manpages -C doc
 
@@ -93,3 +39,5 @@ install-dom0:
 	python3 setup.py install -O1 --root $(DESTDIR)
 
 clean:
+	rm -rf debian/changelog.*
+	rm -rf pkgs

debian/control

@@ -10,5 +10,5 @@ Homepage: http://www.qubes-os.org
 Package: qubes-pdf-converter
 Section: admin
 Architecture: any
-Depends: poppler-utils, imagemagick, ${pythonver:Depends}-nautilus, ${misc:Depends}
+Depends: poppler-utils, imagemagick, python3-nautilus | python-nautilus, ${misc:Depends}
 Description: The Qubes service for converting untrusted PDF files into trusted ones

debian/rules

@@ -12,10 +12,3 @@ export DESTDIR=$(shell readlink -m .)/debian/tmp
 override_dh_auto_install:
 	make install-vm
 
-override_dh_gencontrol:
-ifneq ($(shell grep -o 'stretch\|buster' /etc/debian_version),)
-	echo "pythonver:Depends=python" >> debian/qubes-pdf-converter.substvars
-else
-	echo "pythonver:Depends=python3" >> debian/qubes-pdf-converter.substvars
-endif
-	dh_gencontrol