From 750c14fdde7b35f7a47d526d38a87e701bcdf89c Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 22 Oct 2017 17:02:16 +0200 Subject: [PATCH] Some things polished * Fixed symmangle - sort order is defined by LC_ALL, so using LC_ALL=C is a good idea in the script * Renamed get-snapshot to git-snapshot * Bumped qtxdg dependency to >= 3.1.0 * Added lintian-overrides --- debian/bin/evil | 2 +- debian/bin/{get-snapshot => git-snapshot} | 0 debian/bin/symmangle | 4 ++-- debian/changelog | 10 ++++++++++ debian/control | 4 ++-- debian/lintian-overrides | 7 +++++++ .../usr/share/lxqt-build-tools/repository.spec.example | 2 -- 7 files changed, 22 insertions(+), 7 deletions(-) rename debian/bin/{get-snapshot => git-snapshot} (100%) create mode 100644 debian/lintian-overrides diff --git a/debian/bin/evil b/debian/bin/evil index 9c2db26..7c31702 100755 --- a/debian/bin/evil +++ b/debian/bin/evil @@ -1,5 +1,5 @@ #!/bin/bash - +#============================================================================= # Copyright 2015-2017 Alf Gaida # # Redistribution and use in source and binary forms, with or without diff --git a/debian/bin/get-snapshot b/debian/bin/git-snapshot similarity index 100% rename from debian/bin/get-snapshot rename to debian/bin/git-snapshot diff --git a/debian/bin/symmangle b/debian/bin/symmangle index f6ade85..95b1240 100755 --- a/debian/bin/symmangle +++ b/debian/bin/symmangle @@ -27,12 +27,12 @@ #============================================================================= # Usage: symmangle -# On should use this in the package dir after locale builds in case of +# One should use this in the package dir after locale builds in case of # symbol diffs during the build 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"; + cat "$i" | sed 's/ \(_.*\) \(.*\)/ (c++)"\1" \2/' | c++filt | LC_ALL=C sort -u | tee "debian/$k.mangled"; done fi diff --git a/debian/changelog b/debian/changelog index a53e2a7..4b09045 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +lxqt-build-tools (0.4.0-2) experimental; urgency=medium + + * Fixed symmangle - sort order is defined by LC_ALL, so using + LC_ALL=C is a good idea in the script + * Renamed get-snapshot to git-snapshot + * Bumped qtxdg dependency to >= 3.1.0 + * Added lintian-overrides + + -- Alf Gaida Sun, 22 Oct 2017 17:01:49 +0200 + lxqt-build-tools (0.4.0-1) experimental; urgency=medium * Cherry-picking new upstream release 0.4.0 diff --git a/debian/control b/debian/control index ad472fd..14dae5a 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 10), libglib2.0-dev, pkg-config, qtbase5-dev -Standards-Version: 4.1.0 +Standards-Version: 4.1.1 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 @@ -21,7 +21,7 @@ Depends: ${shlibs:Depends}, binutils, cmake (>= 3.0.2), git, - libqt5xdg-dev (>= 3.0.0), + libqt5xdg-dev (>= 3.1.0), libglib2.0-dev (>= 2.5.0), lintian, pkg-config, diff --git a/debian/lintian-overrides b/debian/lintian-overrides new file mode 100644 index 0000000..98a5372 --- /dev/null +++ b/debian/lintian-overrides @@ -0,0 +1,7 @@ +# 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/mangle +lxqt-build-tools: binary-without-manpage usr/bin/symmangle diff --git a/debian/usr/share/lxqt-build-tools/repository.spec.example b/debian/usr/share/lxqt-build-tools/repository.spec.example index 37fbd9f..e0dac9a 100644 --- a/debian/usr/share/lxqt-build-tools/repository.spec.example +++ b/debian/usr/share/lxqt-build-tools/repository.spec.example @@ -1,5 +1,3 @@ -#!/bin/bash - # Author: Alf Gaida # License: WTFPL-2 # 0. You just DO WHAT THE FUCK YOU WANT TO.