New upstream version.

Summary: Merge was stuck in merge-o-matic due to Diff3 conflict markers. Now resolved.

Test Plan: check if this is indeed correct merge according to ubuntu standards.

Reviewers: wxl, kc2bez

Reviewed By: wxl, kc2bez

Differential Revision: https://phab.lubuntu.me/D104

debian/bin/gbp-buildpackage

@@ -0,0 +1,31 @@
+#!/bin/bash
+#=============================================================================
+# Copyright 2019 Alf Gaida <agaida@siduction.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+# Usage: gbp-buildpackage
+
+gbp buildpackage

debian/bin/gbp-import-orig

@@ -0,0 +1,31 @@
+#!/bin/bash
+#=============================================================================
+# Copyright 2019 Alf Gaida <agaida@siduction.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+# Usage: gbp-import-orig
+
+gbp import-orig --pristine-tar --uscan

debian/changelog

@@ -1,3 +1,25 @@
+lxqt-build-tools (0.8.0-1ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable. No other changes.
+
+ -- Raman Sarda <theloudspeaker@ubuntu.com>  Sat, 16 Jan 2021 02:10:00 +0530
+
+lxqt-build-tools (0.8.0-1) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Sophie Brun ]
+  * Update the debian/upstream/signing-key.asc
+  * New upstream version 0.8.0
+  * Move the specific lxqt build scripts in usr/share/lxqt-build-tools/bin
+  * Bump Standards-Version to 4.5.1 (no changes)
+  * Update debian/copyright
+
+  [ Raphael Hertzog ]
+  * Drop ${shlib:Depends} as this is an arch all package
+
+ -- Sophie Brun <sophie@offensive-security.com>  Wed, 16 Dec 2020 09:51:50 +0100
+
 lxqt-build-tools (0.7.0-0ubuntu1) groovy; urgency=medium
 
   * New upstream release.
@@ -7,6 +29,16 @@ lxqt-build-tools (0.7.0-0ubuntu1) groovy; urgency=medium
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 03 Jun 2020 22:06:40 -0500
 
+lxqt-build-tools (0.6.0-3) unstable; urgency=medium
+
+  * Switched to gbp
+  * Bumped Standards-Version to 4.4.0, no changes needed
+  * Added debin/bin/gbp-buildpackage - first iteration
+  * Added debian/bin/gbp-import-orig - first iteration
+  * Fixed .gitignore
+
+ -- Alf Gaida <agaida@siduction.org>  Mon, 26 Aug 2019 02:31:21 +0200
+
 lxqt-build-tools (0.6.0-2ubuntu1) disco; urgency=medium
 
   * Merge from Debian testing. Remaining changes:
@@ -158,3 +190,4 @@ lxqt-build-tools (0.1.0-1) unstable; urgency=medium
   * Initial release (Closes: #839943)
 
  -- Alf Gaida <agaida@siduction.org>  Fri, 14 Oct 2016 23:05:03 +0200
+

debian/control

@@ -10,7 +10,7 @@ Build-Depends: cmake,
                libglib2.0-dev,
                pkg-config,
                qtbase5-dev
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Vcs-Browser: https://phab.lubuntu.me/source/lxqt-build-tools/
 Vcs-Git: https://phab.lubuntu.me/source/lxqt-build-tools.git
 XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-build-tools
@@ -26,7 +26,6 @@ Depends: binutils,
          qttools5-dev,
          qttools5-dev-tools,
          ${misc:Depends},
-         ${shlibs:Depends}
 Recommends: git, lintian
 Description: Build tools for the LXQt desktop environment
  LXQt is an advanced, easy-to-use, and fast desktop environment based on Qt

debian/copyright

@@ -7,6 +7,13 @@ Copyright: 2012-2019 LXQt team
            2010-2012 Razor team
 License: BSD-3-Clause
 
+Files: cmake/find-modules/FindXdgEmail.cmake
+ cmake/find-modules/FindXdgMime.cmake cmake/find-modules/FindXdgOpen.cmake
+ cmake/find-modules/FindXdgScreensaver.cmake
+ cmake/find-modules/FindXdgSettings.cmake
+Copyright: 2019, Luís Pereira <luis.artur.pereira@gmail.com>
+License: BSD-3-Clause
+
 Files: debian/*
 Copyright: 2015-2019 Alf Gaida <agaida@siduction.org>
 License: BSD-3-Clause

debian/gbp.conf

@@ -0,0 +1,6 @@
+[DEFAULT]
+debian-branch = debian/sid
+upstream-branch = upstream/latest
+pristine-tar = True
+compression = xz
+

debian/install

@@ -1,2 +1,2 @@
-debian/bin/* /usr/bin
+debian/bin/* /usr/share/lxqt-build-tools/bin
 debian/usr/* /usr

debian/lintian-overrides

@@ -1,8 +0,0 @@
-# Yes, we know
-
-lxqt-build-tools: binary-without-manpage usr/bin/evil
-lxqt-build-tools: binary-without-manpage usr/bin/git-snapshot
-lxqt-build-tools: binary-without-manpage usr/bin/git-versions
-lxqt-build-tools: binary-without-manpage usr/bin/lxqt-transupdate
-lxqt-build-tools: binary-without-manpage usr/bin/mangle
-lxqt-build-tools: binary-without-manpage usr/bin/symmangle

debian/upstream/signing-key.asc

@@ -1,4 +1,5 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Signed by Sophie Brun
 
 mQINBF6cxrwBEADfl3ydxNfLBbWGPesXty2baQgixZ3D6aCxadI2kX+aikmT8rd0
 ttDKN18cXV52Ssxnj0qhgf4hwnu/b0be6BzqSEyGM+UQR3X2CYpxrMakfW32Q18K