Fix deb GPG singing (#190)

Fix deb GPG signing

Makefile

@@ -84,6 +84,7 @@ rpm: tarball
 
 .PHONY: deb
 deb: tarball
+	apt-get install --only-upgrade build-essential
 	mkdir -p $(WORKSPACE)/target
 	mkdir -p $(WORKSPACE)/packages/deb/$(ARCH)
 	tar -xvf /tmp/$(BINARY_NAME)-$(VERSION)-$(UNAME_M).tar.gz -C $(WORKSPACE)/packages/deb/$(ARCH)

config/config.yml

@@ -15,7 +15,6 @@ storage:
 
 backup-policies:
   policy1:
-    type: 1
     parallel: 1
     remove-files: KeepAll
 

packages/config/aerospike-backup-service.yml

@@ -11,12 +11,11 @@ aerospike-clusters:
 
 storage:
   local1:
-    type: 0
+    type: "local"
     path: "/var/lib/aerospike-backup-service"
 
 backup-policies:
   policy1:
-    type: 1
     parallel: 1
     remove-files: KeepAll
 
@@ -27,4 +26,6 @@ backup-routines:
     backup-policy: "policy1"
     source-cluster: "cluster1"
     storage: "local1"
-    namespace: "test"
+    namespaces: ["test"]
+    set-list:
+      - set1

packages/deb/Makefile

@@ -4,17 +4,14 @@ SOURCE_DIR:=$(CURDIR)/$(ARCH)/$(BINARY_NAME)-$(VERSION)
 all: deb
 
 .PHONY: deb
-deb: gen-substvars install-manpage
+deb: install-manpage
 	cd $(CURDIR)/$(ARCH)/$(BINARY_NAME)-$(VERSION)/packages/deb && \
-	SOURCE_DIR=$(SOURCE_DIR) BINARY_NAME=$(BINARY_NAME) GIT_COMMIT=$(GIT_COMMIT) VERSION=$(VERSION) ARCH=$(ARCH) dpkg-buildpackage -Zxz
+	SOURCE_DIR=$(SOURCE_DIR) BINARY_NAME=$(BINARY_NAME) GIT_COMMIT=$(GIT_COMMIT) VERSION=$(VERSION) ARCH=$(ARCH) \
+	dpkg-buildpackage -b -rfakeroot -us -uc -Zxz
 	mv $(CURDIR)/$(ARCH)/$(BINARY_NAME)-$(VERSION)/packages/$(BINARY_NAME)_$(VERSION)-1_$(ARCH).deb \
     ../../target/$(BINARY_NAME)_$(VERSION)-1_$(ARCH).deb
 	$(MAKE) clean
 
-.PHONY: gen-substvars
-gen-substvars:
-	@echo "abs:version=$(VERSION)" > $(CURDIR)/$(ARCH)/$(BINARY_NAME)-$(VERSION)/packages/deb/debian/substvars
-
 .PHONY: install-manpage
 install-manpage:
 	cp $(CURDIR)/$(ARCH)/$(BINARY_NAME)-$(VERSION)/packages/man/$(BINARY_NAME).1 \

packages/deb/debian/control

@@ -1,7 +1,6 @@
 Source: aerospike-backup-service
 Section: misc
 Priority: optional
-Version: ${abs:version}
 Maintainer: Aerospike <[email protected]>
 Build-Depends: debhelper, debhelper-compat (= 13)
 

packages/deb/debian/rules

@@ -16,11 +16,13 @@ override_dh_installdocs:
 override_dh_auto_build:
 	(cd $(SOURCE_DIR); $(MAKE) build-submodules; $(MAKE) build)
 override_dh_dwz:
-
-override_dh_installsystemd:
-	dh_installsystemd $(BINARY_NAME).service
+	dh_dwz --exclude=libasbackup.so --exclude=libasrestore.so --exclude=$(BINARY_NAME)
 override_dh_strip:
 	dh_strip --no-automatic-dbgsym
+override_dh_installsystemd:
+	dh_installsystemd $(BINARY_NAME).service
+override_dh_builddeb:
+	dh_builddeb -- -Zxz
 
 override_dh_clean:
 	dh_clean

packages/deb/debian/source/format

@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)