[neon/qt/qtsystems] debian: debian/{rules,copyright,watch}: Use uscan to obtain Git snapshot. Drop self-scripted (thanks to @onlyjob) get-orig-source target.

[Mike Gabriel]

Git commit 6dadd7ca15e7988e3fc9c22131b712efc83081ef by Mike Gabriel.
Committed on 25/12/2021 at 17:56.
Pushed by carlosdem into branch 'master'.

debian/{rules,copyright,watch}: Use uscan to obtain Git snapshot. Drop self-scripted (thanks to @onlyjob) get-orig-source target.

M  +2    -0    debian/copyright
M  +8    -43   debian/rules
M  +4    -2    debian/watch

https://invent.kde.org/neon/qt/qtsystems/commit/6dadd7ca15e7988e3fc9c22131b712efc83081ef

diff --git a/debian/copyright b/debian/copyright
index 9fce784..31777e0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,8 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qtsystems
 Upstream-Contact: development at qt-project.org
 Source: https://code.qt.io/qt/qtsystems.git
+Files-Excluded:
+ doc/config/*/scripts/jquery.js
 
 Files: .qmake.conf
  .tag
diff --git a/debian/rules b/debian/rules
index 94c98a0..fb93dfb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,10 +18,16 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
 	CONFIG += udisks
 endif
 
+QT_MODULE_VERSION = $(shell cat .qmake.conf | grep MODULE_VERSION | sed -re 's/MODULE_VERSION\s*=\s*([^\s]+)\s*/\1/')
+
 %:
 	dh $@ --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
+	@echo "# Running syncqt.pl (QT_MODULE_VERSION=$(QT_MODULE_VERSION))"
+	cd src/systeminfo/ && perl /usr/lib/qt5/bin/syncqt.pl -module QtSystemInfo -version $(QT_MODULE_VERSION) -outdir $(CURDIR) -builddir $(CURDIR) $(CURDIR) && cd - 1>/dev/null
+	cd src/publishsubscribe/ && perl /usr/lib/qt5/bin/syncqt.pl -module QtPublishSubscribe -version $(QT_MODULE_VERSION) -outdir $(CURDIR) -builddir $(CURDIR) $(CURDIR) && cd - 1>/dev/null
+	cd src/serviceframework/ && perl /usr/lib/qt5/bin/syncqt.pl -module QtServiceFramework -version $(QT_MODULE_VERSION) -outdir $(CURDIR) -builddir $(CURDIR)/$(PKG)-$(VER) $(CURDIR)/$(PKG)-$(VER) && cd - 1>/dev/null
 	dh_auto_configure -- CONFIG+="$(CONFIG)" QT_BUILD_PARTS+=tests
 
 override_dh_auto_install:
@@ -56,46 +62,5 @@ override_dh_clean:
 
 include /usr/share/dpkg/pkg-info.mk
 
-PKD   = $(word 1,$(abspath $(dir $(MAKEFILE_LIST))))
-PKG   = $(DEB_SOURCE)
-UVER  = $(shell echo $(DEB_VERSION) | cut -d "-" -f1)
-DTYPE =
-VER  ?= $(subst $(DTYPE),,$(UVER))
-
-UURL = https://code.qt.io/qt/qtsystems.git
-UREV = $(shell echo $(VER) | cut -d"." -f3)
-
-QT_MODULE_VERSION = $(shell cat .qmake.conf | grep MODULE_VERSION | sed -re 's/MODULE_VERSION\s*=\s*([^\s]+)\s*/\1/')
-
-## http://wiki.debian.org/onlyjob/get-orig-source
-.PHONY: get-orig-source
-get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE))
-	@
-
-$(PKG)_$(VER)$(DTYPE).orig.tar.xz: $(info I: GIT Revision=$(UREV))
-	$(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..))
-	@echo "# Downloading..."
-	git clone $(UURL) $(PKG)-$(VER) \
-	    || $(RM) -r $(PKG)-$(VER)
-	cd $(PKG)-$(VER) \
-	    && git checkout "$(UREV)" \
-	    && ( echo "# Generating ChangeLog..." \
-	       ; git --no-pager log --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%n" > ChangeLog \
-	       ; touch -d "$$(git log -1 --format='%ci')" ChangeLog) \
-	    && echo "# Setting times..." \
-	    && for F in $$(git ls-tree -r --name-only HEAD); do touch --no-dereference -d "$$(git log -1 --format="%ai" -- $$F)" "$$F"; done \
-	    && echo "# Cleaning-up..." \
-	    && $(RM) doc/config/*/scripts/jquery.js \
-	    && $(RM) -r .git .git* \
-	    $(NULL)
-	@echo "# Running syncqt.pl (QT_MODULE_VERSION=$(QT_MODULE_VERSION))"
-	cd $(PKG)-$(VER) \
-	    && cd src/systeminfo/ && perl /usr/lib/qt5/bin/syncqt.pl -module QtSystemInfo -version $(QT_MODULE_VERSION) -outdir $(CURDIR)/$(PKG)-$(VER) -builddir $(CURDIR)/$(PKG)-$(VER) $(CURDIR)/$(PKG)-$(VER) && cd - 1>/dev/null \
-	    && cd src/publishsubscribe/ && perl /usr/lib/qt5/bin/syncqt.pl -module QtPublishSubscribe -version $(QT_MODULE_VERSION) -outdir $(CURDIR)/$(PKG)-$(VER) -builddir $(CURDIR)/$(PKG)-$(VER) $(CURDIR)/$(PKG)-$(VER) && cd - 1>/dev/null \
-	    && cd src/serviceframework/ && perl /usr/lib/qt5/bin/syncqt.pl -module QtServiceFramework -version $(QT_MODULE_VERSION) -outdir $(CURDIR)/$(PKG)-$(VER) -builddir $(CURDIR)/$(PKG)-$(VER) $(CURDIR)/$(PKG)-$(VER) && cd - 1>/dev/null \
-	    $(NULL)
-	@echo "# Packing..."
-	find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
-	    | XZ_OPT="-6v" tar -caf "../$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
-	    && $(RM) -r "$(PKG)-$(VER)" \
-	    $(NULL)
+get-orig-source:
+	uscan --noconf --force-download --rename --download-current-version --destdir=..
diff --git a/debian/watch b/debian/watch
index 771b8c1..a1e0cba 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
-version=3
-https://download.qt.io/official_releases/qt/([\d\.]*)/([\d\.]*)/submodules/qtsystems-everywhere-src-([^-]*)\.tar\.xz
+version=4
+opts="mode=git, pgpmode=none,  pretty=5.0~git%cd.%h" \
+https://code.qt.io/qt/qtsystems.git \
+HEAD