From cb3001e7d9e4e0546cd9318bf086ace653eaa9a3 Mon Sep 17 00:00:00 2001 From: Rik Mills Date: Tue, 2 Apr 2019 17:44:44 +0100 Subject: [PATCH] merge from debian buster --- debian/bin/git-snapshot | 148 ++++++++++++++++++++++++++++++++++++--- debian/changelog | 30 ++++++++ debian/compat | 1 - debian/control | 3 +- debian/copyright | 6 +- debian/lintian-overrides | 1 + debian/upstream/metadata | 7 ++ 7 files changed, 181 insertions(+), 15 deletions(-) delete mode 100644 debian/compat create mode 100644 debian/upstream/metadata diff --git a/debian/bin/git-snapshot b/debian/bin/git-snapshot index fd80508..68d6e82 100755 --- a/debian/bin/git-snapshot +++ b/debian/bin/git-snapshot @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2015-2017 Alf Gaida +# Copyright 2015-2019 Alf Gaida # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -29,6 +29,33 @@ # Usage: get-snapshot (in package dir) # One will need a debian/repository.spec file in place + +usage() +{ +cat << EOF +usage: $0 options + +#ToDo Write some useful description + +OPTIONS: + -h Show this message + -b build (default="yes") + -c clean (default="yes") + -g git commit (default="yes") + -n dryrun (aka. do nothing default="no") + -p git push (default="yes") + -u upload (default="yes") +EOF +} + + +build="yes" +clean="yes" +gitcommit="yes" +push="yes" +upload="yes" +dryrun="no" + unset commit unset branch target_dir="snapshot" @@ -44,8 +71,41 @@ else exit 2; fi -ls | grep -v "debian" | xargs rm -rf -rm -rf .pc +while getopts “b:c:g:u:hn” OPTION; do + case ${OPTION} in + h) usage + exit + ;; + b) build=${OPTARG} + ;; + c) clean=${OPTARG} + ;; + g) gitcommit=${OPTARG} + ;; + n) dryrun="yes"; + echo -e "\n\n ... dry run ... \n\n" + ;; + p) push=${OPTARG} + ;; + u) upload=${OPTARG} + ;; + esac +done + +if [ "$dryrun" = "yes" ]; then + build="no" + clean="no" + gitcommit="no" + push="no" + upload="no" +fi + + +if [ "$dryrun" = "no" ]; then + debclean -d + ls | grep -v "debian" | xargs rm -rf + rm -rf .pc +fi echo "" echo "┌───────────────────┐" @@ -69,13 +129,85 @@ pushd "$snapdir" &>/dev/null pushd snapshot &>/dev/null [ ! -z "${commit}" ] && git reset --hard "${commit}" description=$(git describe --tags) + commitsaftertag=$(git describe --tags | sed "s#[^-]*-##") + echo "ERRORCODE $?" # cleanup must be defined in repository [ "$declared" ] && cleanup popd &>/dev/null tar cfJ snapshot.orig.tar.xz snapshot popd &>/dev/null -tar xf "$snapdir/snapshot.orig.tar.xz" --strip-components 1 -echo "" -echo "New snapshot: $description" -dch "New snapshot: $description" -rm -rf "$snapdir" + +if [ "$dryrun" = "no" ]; then + tar xf "$snapdir/snapshot.orig.tar.xz" --strip-components 1 + rm -rf "$snapdir" +fi + +# New Version +currentversion=$(dpkg-parsechangelog -S version) +newversion="${baseversion}${commitsaftertag}-1" + +if [ ! "$currentversion" "==" "$newversion" ]; then + echo -e "\n\nCurrent Version: $currentversion" + echo -e "New Version: $newversion\n\n" +else + echo -e "\n\nCurrent Version: $currentversion" + echo -e "New Version: $newversion\n\n" + echo -e "\n\nkeine neue version\n\n" + exit 0 # should be handled with a variable +fi + +# Add a new entry to debian changelog +if [ "$dryrun" = "no" ]; then + dch --newversion "$newversion" \ + --distribution "${distribution}" \ + --force-distribution \ + "New snapshot: $description" +fi + +# commit changes to git +if [ "gitcommit" = "yes" ]; then + echo "gitcommit: $gitcommit" + git add --all + git commit -m "New snapshot: $description" + git push +fi + +# clean up old builds +if [ "$clean" = "yes" ]; then + echo "clean: $clean" + echo "dryrun: $dryrun" + debclean +fi + +# build a source package +if [ "$build" = "yes" ]; then + echo "build: $build" + echo "dryrun: $dryrun" + debuild -S +fi + +# upload source package +if [ "$upload" = "yes" ]; then + echo "upload: $upload" + echo "dryrun: $dryrun" + uploads=$(ls ../*changes) + for i in $uploads; do + dput $uploadrepo $i + done +fi + +# git commit +if [ "$gitcommit" = "yes" ]; then + echo "gitcommit: $gitcommit" + echo "dryrun: $dryrun" + git add --all + git commit -m "New snapshot: $newversion" +fi + +# git push +if [ "$push" = "yes" ]; then + echo "push: $push" + echo "dryrun: $dryrun" + git push +fi + diff --git a/debian/changelog b/debian/changelog index 5bd2526..f12633a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +lxqt-build-tools (0.6.0-2ubuntu1) disco; urgency=medium + + * Merge from Debian testing. Remaining changes: + - Update Vcs-* and Maintainer to Lubuntu values. + + -- Rik Mills Wed, 27 Mar 2019 17:07:06 +0000 + +lxqt-build-tools (0.6.0-2) unstable; urgency=medium + + * Removed libqt5xdg-dev - would introduce a cycle dependency when used + with libqtxdg + + -- Alf Gaida Sun, 24 Feb 2019 15:31:13 +0100 + +lxqt-build-tools (0.6.0-1) unstable; urgency=medium + + * Cherry-picking new upstream release 0.6.0 + * Bumped Standards to 4.3.0, no changes needed + * Dropped d/compat, use debhelper-compat = 12, no changes needed + * Fixed years in d/copyright + * Fixed d/lintian-overrides + + -- Alf Gaida Sun, 27 Jan 2019 13:11:49 +0100 + lxqt-build-tools (0.6.0-0ubuntu1) disco; urgency=medium * New upstream release. @@ -6,6 +30,12 @@ lxqt-build-tools (0.6.0-0ubuntu1) disco; urgency=medium -- Simon Quigley Fri, 25 Jan 2019 22:01:43 -0600 +lxqt-build-tools (0.5.0-1) unstable; urgency=medium + + * Cherry-picking new upstream release 0.5.0 + + -- Alf Gaida Wed, 23 May 2018 02:50:35 +0200 + lxqt-build-tools (0.5.0-0ubuntu1) cosmic; urgency=medium * New upstream release. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/control b/debian/control index 4034538..1c06d7c 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Uploaders: Alf Gaida , ChangZhuo Chen (陳昌倬) Section: devel Priority: optional -Build-Depends: debhelper (>= 12), +Build-Depends: debhelper-compat (= 12), cmake, libglib2.0-dev, pkg-config, @@ -23,7 +23,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, binutils, cmake, - libqt5xdg-dev (>= 3.1.0), libglib2.0-dev (>= 2.5.0), pkg-config, qttools5-dev, diff --git a/debian/copyright b/debian/copyright index 2ae67ad..39531ba 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,14 +3,12 @@ Upstream-Name: lxqt-build-tools Source: https://github.com/lxqt/lxqt-build-tools Files: * -Copyright: 2012-2018 LXQt team +Copyright: 2012-2019 LXQt team 2010-2012 Razor team - 2017-2018 Luís Pereira - 2014 Alex Merry License: BSD-3-Clause Files: debian/* -Copyright: 2015-2018 Alf Gaida +Copyright: 2015-2019 Alf Gaida License: BSD-3-Clause License: BSD-3-Clause diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 98a5372..7d18a04 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -3,5 +3,6 @@ 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 diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..68b5046 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,7 @@ +Name: lxqt-build-tools +Bug-Database: https://github.com/lxqt/lxqt-build-tools/issues +Bug-Submit: https://github.com/lxqt/lxqt-build-tools/issues/new +Changelog: https://github.com/lxqt/lxqt-build-tools/blob/master/CHANGELOG +Repository: https://github.com/lxqt/lxqt-build-tools +Repository-Browser: https://github.com/lxqt/lxqt-build-tools +