debian: add debian packaging from upstream

- add integration with qubes-builder
- refactor spec and makefile

QubesOS/qubes-issues#4186

Makefile

@@ -1,2 +1,37 @@
-SPECFILE := garcon.spec
-include Makefile.common
+DIST ?= fc32
+VERSION := $(shell cat version)
+MINOR_VERSION := $(word 1,$(subst ., ,$(VERSION))).$(word 2,$(subst ., ,$(VERSION)))
+REL := $(shell cat rel)
+
+FEDORA_SOURCES := https://src.fedoraproject.org/rpms/garcon/raw/f$(subst fc,,$(DIST))/f/sources
+SRC_FILE := garcon-$(VERSION).tar.bz2
+
+BUILDER_DIR ?= ../..
+SRC_DIR ?= qubes-src
+
+DISTFILES_MIRROR ?= http://archive.xfce.org/src/xfce/garcon/$(MINOR_VERSION)/
+UNTRUSTED_SUFF := .UNTRUSTED
+FETCH_CMD := wget --no-use-server-timestamps -q -O
+
+SHELL := /bin/bash
+
+%: %.sha512
+	@$(FETCH_CMD) $@$(UNTRUSTED_SUFF) $(DISTFILES_MIRROR)$@
+	@sha512sum --status -c <(printf "$$(cat $<)  -\n") <$@$(UNTRUSTED_SUFF) || \
+		{ echo "Wrong SHA512 checksum on $@$(UNTRUSTED_SUFF)!"; exit 1; }
+	@mv $@$(UNTRUSTED_SUFF) $@
+
+.PHONY: get-sources
+get-sources: $(SRC_FILE)
+
+.PHONY: verify-sources
+verify-sources:
+	@true
+
+# This target is generating content locally from upstream project
+# 'sources' file. Sanitization is done but it is encouraged to perform
+# update of component in non-sensitive environnements to prevent
+# any possible local destructions due to shell rendering
+.PHONY: update-sources
+update-sources:
+	@$(BUILDER_DIR)/$(SRC_DIR)/builder-rpm/scripts/generate-hashes-from-sources $(FEDORA_SOURCES)

Makefile.builder

@@ -1 +1,19 @@
 RPM_SPEC_FILES := garcon.spec
+DEBIAN_BUILD_DIRS := debian-pkg/debian
+
+NO_ARCHIVE := 1
+
+ifneq ($(filter $(DISTRIBUTION), debian qubuntu),)
+SOURCE_COPY_IN := source-debian-copy-in
+endif
+
+source-debian-copy-in: VERSION = $(shell cat $(ORIG_SRC)/version)
+source-debian-copy-in: ORIG_FILE = $(CHROOT_DIR)/$(DIST_SRC)/garcon_$(VERSION).orig.tar.bz2
+source-debian-copy-in: SRC_FILE  = $(ORIG_SRC)/garcon-$(VERSION).tar.bz2
+source-debian-copy-in:
+	mkdir -p "$(CHROOT_DIR)/$(DIST_SRC)/debian/patches"
+	$(ORIG_SRC)/debian-quilt $(ORIG_SRC)/series-debian.conf $(CHROOT_DIR)/$(DIST_SRC)/debian/patches
+	cp -p $(SRC_FILE) $(ORIG_FILE)
+	tar jxvf $(SRC_FILE) -C $(CHROOT_DIR)/$(DIST_SRC)/debian-pkg --strip-components=1
+
+# vim: ft=make

debian

@@ -0,0 +1 @@
+debian-pkg/debian/

debian-pkg/debian/changelog

@@ -0,0 +1,243 @@
+garcon (0.6.4-1) unstable; urgency=medium
+
+  [ Unit 193 ]
+  * New upstream version 0.6.4
+  * d/rules:
+    - Pass '--enable-gtk-doc' during configure to fix consecutive builds.
+
+ -- Yves-Alexis Perez <[email protected]>  Thu, 15 Aug 2019 11:10:10 +0200
+
+garcon (0.6.3-1) unstable; urgency=medium
+
+  [ Unit 193 ]
+  * New upstream version 0.6.3
+  * d/compat, d/control:
+    - Drop d/compat in favor of debhelper-compat, bump to 11.
+  * d/control: Build-depend on gtk-doc-tools and xfce4-dev-tools.
+  * d/rules:
+    - Drop the now-default options '--parallel' and '--disable-silent-rules'.
+    - Drop dbgsym migration, it is complete.
+    - Use dh_missing instead of dh_install --fail-missing.
+  * Bump Standards-Version to 4.4.0.
+
+  [ Helmut Grohne ]
+  * Fix cross build issues:                                     closes: #890223
+    + Switch transitional package libgarcon-1-0-dev to Architecture: any to
+      allow satisfying dependencies from non-native architectures. It cannot
+      be Multi-Arch: foreign due to its dependency on libgarcon-1-dev.
+    + Mark libgarcon-common Multi-Arch: foreign to allow satisfying
+      dependencies from non-native architectures.
+    + Mark all other packages Multi-Arch: same to allow coinstallation.
+
+ -- Yves-Alexis Perez <[email protected]>  Sat, 13 Jul 2019 13:26:02 +0200
+
+garcon (0.6.2-1) unstable; urgency=medium
+
+  * Moved the package to git on salsa.debian.org
+  * Updated the maintainer address to [email protected]
+                                                                closes: #899857
+  * d/gbp.conf added, following DEP-14
+  * d/watch: use HTTPS protocol
+  * New upstream version 0.6.2
+  * d/control: drop Lionel from uploaders, thanks!
+  * d/control: update standards version to 4.3.0
+  * d/libgarcon-1-0.symbols updated for new release
+  * d/control: drop priority for libgarcon-1-0-dev
+
+ -- Yves-Alexis Perez <[email protected]>  Thu, 27 Dec 2018 13:23:47 +0100
+
+garcon (0.6.1-2) unstable; urgency=medium
+
+  [ Unit 193 ]
+  * d/control:
+    - Add versioned breaks/replaces on libgarcon-1-0-dev.       closes: #868626
+
+ -- Yves-Alexis Perez <[email protected]>  Sun, 03 Sep 2017 19:14:03 +0200
+
+garcon (0.6.1-1) unstable; urgency=medium
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * debian/control:
+    - add build-dep on libgtk-3-dev and libxfce4ui-2 for the GTK3 variant
+    - run wrap-and-sort
+    - update standards version to 3.9.8.
+  * debian/copyright: run wrap-and-sort.
+  * debian/libgarcon-common.install: run wrap-and-sort.
+  * debian/control:
+    - introduce libgarcon-gtk3 and -dev packages.
+    - rename libgarcon-1-0-dev to libgarcon-1-dev for consistency.
+    - update standards version to 4.0.0. 
+
+  [ Unit 193 ]
+  * d/control, d/rules: Migrate to dbgsym packages.
+
+ -- Yves-Alexis Perez <[email protected]>  Wed, 21 Jun 2017 15:04:21 +0200
+
+garcon (0.4.0-2) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Yves-Alexis Perez <[email protected]>  Wed, 06 May 2015 15:52:08 +0200
+
+garcon (0.4.0-1) experimental; urgency=medium
+
+  [ Mateusz Łukasik ]
+  * New upstream release.
+  * Bump standards version to 3.9.6
+
+ -- Yves-Alexis Perez <[email protected]>  Sun, 08 Mar 2015 20:22:03 +0100
+
+garcon (0.3.0-1) experimental; urgency=low
+
+  [ Evgeni Golov ]
+  * Correct Vcs-* URLs to point to anonscm.debian.org
+
+  [ Jackson Doak ]
+  * Bump standards version to 3.9.5
+  * debian/rules: Use disable-silent-rules
+  * New upstream release
+  * Update symbols
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - add build-dep on libxfce4ui-1-dev.
+
+ -- Yves-Alexis Perez <[email protected]>  Sun, 23 Feb 2014 21:05:05 +0100
+
+garcon (0.2.1-2) unstable; urgency=medium
+
+  [ Evgeni Golov ]
+  * Correct Vcs-* URLs to point to anonscm.debian.org
+
+  [ Jackson Doak ]
+  * Bump standards version to 3.9.5
+  * debian/rules: Use disable-silent-rules
+
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - call dh-autoreconf to regenerate config.{guess,sub} and fix FTBFS on
+      ppc64el.                                                  closes: #757334
+    - call xdt-autogen before configure
+  * debian/control:
+    - add build-dep on xfce4-dev-tools, dh-autoreconf, gtk-doc-tools and
+      intltool for all the above.
+
+ -- Yves-Alexis Perez <[email protected]>  Sun, 31 Aug 2014 23:15:46 +0200
+
+garcon (0.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upload to unstable.
+  * debian/rules:
+    - enable all hardening flags.
+  * debian/libgarcon-1-0-dev.install:
+    - static files are not built anymore, don't try to install them.
+
+ -- Yves-Alexis Perez <[email protected]>  Tue, 21 May 2013 22:12:35 +0200
+
+garcon (0.2.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control: revert b-dep to unversioned libxfce4util -dev package, and
+    require >= 4.10.
+
+ -- Lionel Le Folgoc <[email protected]>  Sat, 05 May 2012 09:43:43 +0200
+
+garcon (0.1.12-1+exp1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/copyright: replace CRLFs with LFs…
+
+ -- Lionel Le Folgoc <[email protected]>  Sun, 15 Apr 2012 15:36:53 +0200
+
+garcon (0.1.12-1) unstable; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * New upstream release.
+
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - build with --parallel.
+
+ -- Yves-Alexis Perez <[email protected]>  Sat, 05 May 2012 14:45:29 +0200
+
+garcon (0.1.11-1+exp1) experimental; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * New upstream release.
+  * debian/README.source: dropped, unneeded.
+  * debian/rules: fix path to .la files to ignore.
+  * debian/control: build-dep on libxfce4util6-dev to start using the new API.
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - update standards version to 3.9.3.
+  * debian/rules:
+    - build with --parallel.
+
+ -- Lionel Le Folgoc <[email protected]>  Sun, 08 Apr 2012 16:24:43 +0200
+
+garcon (0.1.11-1) unstable; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * New upstream release.
+  * debian/README.source: dropped, unneeded.
+  * debian/rules: fix path to .la files to ignore.
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - update standards version to 3.9.3.
+
+ -- Yves-Alexis Perez <[email protected]>  Sun, 01 Apr 2012 14:25:19 +0200
+
+garcon (0.1.10-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/rules:
+    - use debhelper 9 hardening support.
+  * Fix paths for multiarch dirs.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - drop hardening-includes build-dep.
+    - update debhelper build-dep to 9 for hardening support.
+    - add dpkg-dev 1.16.1 build-dep for hardening support.
+    - pre-depends on multiarch-support.
+  * debian/watch: updated, garcon moved to core.
+
+ -- Lionel Le Folgoc <[email protected]>  Sun, 19 Feb 2012 18:59:34 +0100
+
+garcon (0.1.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - add build-dep on libxfce4util.
+
+ -- Yves-Alexis Perez <[email protected]>  Mon, 12 Sep 2011 22:59:30 +0200
+
+garcon (0.1.8-1) unstable; urgency=low
+
+  * New upstream release.
+    - remove science toplevel category.                         closes: #315085
+
+ -- Lionel Le Folgoc <[email protected]>  Mon, 20 Jun 2011 22:39:08 +0200
+
+garcon (0.1.7-1) unstable; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * debian/libgarcon-1-0.symbols: added.
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * Upload to unstable.
+  * debian/control:
+    - remove Emanuele, Simon and Mike from uploaders.
+    - update standards version to 3.9.2.
+
+ -- Yves-Alexis Perez <[email protected]>  Tue, 19 Apr 2011 16:07:51 +0200
+
+garcon (0.1.5-1) experimental; urgency=low
+
+  * Initial release.                                            Closes: #612090
+
+ -- Yves-Alexis Perez <[email protected]>  Sun, 06 Feb 2011 17:05:17 +0100