From af398721048ff08b4a07ca83a65eff8b5adb30fc Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sat, 23 Sep 2017 14:06:36 +0200 Subject: [PATCH] Prepare upcoming release --- debian/bin/evil | 3 + debian/bin/get-snapshot | 59 ++++++++++++++++++ debian/bin/git-versions | 50 +++++++++++++++ debian/bin/mangle | 5 ++ debian/bin/symmangle | 8 +++ debian/changelog | 7 +++ debian/control | 11 ++-- debian/gbp.conf | 2 +- debian/install | 2 + .../git-versions.list.example | 61 +++++++++++++++++++ .../lxqt-build-tools/repository.spec.example | 31 ++++++++++ 11 files changed, 234 insertions(+), 5 deletions(-) create mode 100755 debian/bin/evil create mode 100755 debian/bin/get-snapshot create mode 100755 debian/bin/git-versions create mode 100755 debian/bin/mangle create mode 100755 debian/bin/symmangle create mode 100644 debian/install create mode 100644 debian/usr/share/lxqt-build-tools/git-versions.list.example create mode 100644 debian/usr/share/lxqt-build-tools/repository.spec.example diff --git a/debian/bin/evil b/debian/bin/evil new file mode 100755 index 0000000..2855257 --- /dev/null +++ b/debian/bin/evil @@ -0,0 +1,3 @@ +#!/bin/bash + +lintian -EvIL +pedantic --show-overrides --no-tag-display-limit *changes diff --git a/debian/bin/get-snapshot b/debian/bin/get-snapshot new file mode 100755 index 0000000..4f54255 --- /dev/null +++ b/debian/bin/get-snapshot @@ -0,0 +1,59 @@ +#!/bin/bash + +# Author: 2015-2017 Alf Gaida +# License: WTFPL-2.0 +# Licensetext +# Usage: +# get-snapshot (in package dir) +# one will need a debian/repository file in place + +unset commit +unset branch +target_dir="snapshot" + +[ ! -d debian ] && echo "No debian dir found!" && exit 1 + +if [ -f "debian/repository.spec" ]; then + source debian/repository.spec +else + echo "File debian/repository.spec not found!" + echo "Copied example spec to debian/" + cp /usr/share/lxqt-build-tools/repository.spec.example debian/repository.spec + exit 2; +fi + +ls | grep -v "debian" | xargs rm -rf +rm -rf .pc + +echo "" +echo "┌───────────────────┐" +echo "│ Upstream Settings │" +echo "└───────────────────┘" +[ ! -z "${repository}" ] && echo "repository: ${repository}" +[ ! -z "${branch}" ] && echo "branch: ${branch}" +[ ! -z "${commit}" ] && echo "commit: ${commit}" +[ ! -z "${target_dir}" ] && echo "target_dir: ${target_dir}" +echo "" + +declare -f "cleanup" +declared=$? +echo "" + +snapdir=$(mktemp -d) + +pushd "$snapdir" &>/dev/null + echo "git clone ${branch} ${repository} ${target_dir}" + git clone ${branch} ${repository} ${target_dir} + pushd snapshot &>/dev/null + [ ! -z "${commit}" ] && git reset --hard "${commit}" + description=$(git describe --tags) + # 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" diff --git a/debian/bin/git-versions b/debian/bin/git-versions new file mode 100755 index 0000000..cc9167e --- /dev/null +++ b/debian/bin/git-versions @@ -0,0 +1,50 @@ +#!/bin/bash + +# Copyright 2015-2017 Alf Gaida +# License: WTFPL-2 +# +# Usage: +# +# +# +# + +[ ! -d "auto" ] && mkdir auto +echo "Current Repository Versions" +echo "===========================" + +if [ ! -f ./.git-versions.list ]; then + echo "Please create a valid ./.git-verisions.list" + echo "One can find the LXQt template in /usr/share/lxqt-build-tools" +else + source ./.git-versions.list +fi + +for i in $repositories; do + if [[ "$i" =~ "==" ]]; then + echo "" + echo "$i" + else + pushd $i >/dev/null + if [ ! -d upstream ]; then + echo "$i: please clone upstream" + else + pushd upstream &>/dev/null + # cleanup possible debris and make sure we are on master + git reset --hard &>/dev/null + # git clean -ffdx &>/dev/null + git remote prune origin &>/dev/null + git checkout master &>/dev/null + ## end cleanup + oldversion=$(git describe --tags --dirty 2>/dev/null) + [[ -z "$oldversion" ]] && oldversion=$(git describe --tags --dirty) + git pull --all --tags >/dev/null 2>/dev/null + version=$(git describe --tags --dirty 2>/dev/null) + [[ -z "$version" ]] && version=$(git describe --tags --dirty) + unset new && [ "$oldversion" != "$version" ] && new="NEW!!" + echo "$i: $version $new" + popd &>/dev/null + fi + popd &>/dev/null + fi +done diff --git a/debian/bin/mangle b/debian/bin/mangle new file mode 100755 index 0000000..5f391a4 --- /dev/null +++ b/debian/bin/mangle @@ -0,0 +1,5 @@ +#!/bin/bash + +echo "A: $@" | sed 's/ \(_.*\) \(.*\)/ (c++)"\1" \2/' | c++filt + + diff --git a/debian/bin/symmangle b/debian/bin/symmangle new file mode 100755 index 0000000..18ead53 --- /dev/null +++ b/debian/bin/symmangle @@ -0,0 +1,8 @@ +#!/bin/bash + +if [ -d ./debian ]; then + for i in `find . -name symbols`; do + k=`echo $i | sed "s#/DEBIAN/symbols##" | sed "s#./debian/##"` + cat "$i" | sed 's/ \(_.*\) \(.*\)/ (c++)"\1" \2/' | c++filt | sort | uniq | tee "debian/$k.mangled"; + done +fi diff --git a/debian/changelog b/debian/changelog index c607491..fd42782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lxqt-build-tools (0.3.96-1) experimental; urgency=medium + + * New snapshot: 0.3.2-8-gfc0d797 + * switch to experimental + + -- Alf Gaida Tue, 25 Jul 2017 01:18:13 +0200 + lxqt-build-tools (0.3.2-1) unstable; urgency=medium * Cherry-picking upstream version 0.3.2. diff --git a/debian/control b/debian/control index 51ee6e2..4505da6 100644 --- a/debian/control +++ b/debian/control @@ -6,10 +6,12 @@ Section: devel Priority: optional Build-Depends: debhelper (>= 10), cmake (>= 3.0.2), + libglib2.0-dev, + pkg-config, qtbase5-dev -Standards-Version: 3.9.8 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-build-tools.git/?h=debian/sid -Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-build-tools.git -b debian/sid +Standards-Version: 4.1.0 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-build-tools.git/?h=debian/experimental +Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-build-tools.git -b debian/experimental Homepage: https://github.com/lxde/lxqt-build-tools Package: lxqt-build-tools @@ -17,7 +19,8 @@ Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, cmake (>= 3.0.2), - libqt5xdg-dev (>= 2.0.0), + libqt5xdg-dev (>= 2.0.0), + libglib2.0-dev (>= 2.5.0), pkg-config, qttools5-dev, qttools5-dev-tools diff --git a/debian/gbp.conf b/debian/gbp.conf index 7a9f00a..ffe50a8 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = debian/sid +debian-branch = debian/experimental upstream-branch = upstream/latest pristine-tar = True diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..b42580b --- /dev/null +++ b/debian/install @@ -0,0 +1,2 @@ +debian/bin/* /usr/bin +debian/usr/* /usr diff --git a/debian/usr/share/lxqt-build-tools/git-versions.list.example b/debian/usr/share/lxqt-build-tools/git-versions.list.example new file mode 100644 index 0000000..fc70f8b --- /dev/null +++ b/debian/usr/share/lxqt-build-tools/git-versions.list.example @@ -0,0 +1,61 @@ +repositories="\ + ==0== \ + libqtxdg \ + \ + ==I== \ + lxqt-build-tools \ + \ + ==II== \ + liblxqt \ + libsysstat \ + \ + ==III== \ + compton-conf \ + libfm-qt \ + lxqt-l10n \ + lxqt-themes \ + obconf-qt \ + pavucontrol-qt \ + qtermwidget \ + \ + ==IV== \ + lximage-qt \ + lxqt-about \ + lxqt-admin \ + lxqt-config \ + lxqt-globalkeys \ + lxqt-notificationd \ + lxqt-openssh-askpass \ + lxqt-policykit \ + lxqt-powermanagement \ + lxqt-qtplugin \ + lxqt-session \ + lxqt-sudo \ + pcmanfm-qt \ + qterminal \ + \ + ==V== \ + lxqt-panel \ + lxqt-runner \ + \ + ==VI== \ + cmst \ + juffed \ + nomacs \ + qlipper \ + qps \ + screengrab \ + trojita \ + \ + ==MISC== \ + calamares \ + connman \ + fswatch \ + libfm \ + menu-cache \ + meteo-qt \ + orbital \ + qtstyleplugins \ + quassel \ + sddm \ + vokoscreen" diff --git a/debian/usr/share/lxqt-build-tools/repository.spec.example b/debian/usr/share/lxqt-build-tools/repository.spec.example new file mode 100644 index 0000000..37fbd9f --- /dev/null +++ b/debian/usr/share/lxqt-build-tools/repository.spec.example @@ -0,0 +1,31 @@ +#!/bin/bash + +# Author: Alf Gaida +# License: WTFPL-2 +# 0. You just DO WHAT THE FUCK YOU WANT TO. + +# Variables +# ========= +# repository= your repository +# branch= your branch, if needed +# commit= your commit , if needed +# target_dir= target dir, if needed, default is snapshot +# +# Functions +# ========= +# cleanup () + +repository="git@$domain.tld:$foo/$bar" + + +# cleanup function definiton +cleanup() { + echo "" + echo "┌─────────────┐" + echo "│ Cleanup ... │" + echo "└─────────────┘" + rm -rf .git* +} + + +