From 4b69a6e307eece08c006d888157d29fb9a23dc13 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Sat, 19 Oct 2024 15:05:46 -0500 Subject: [PATCH] Remove patch applied upstream. --- debian/changelog | 1 + debian/patches/fix-syntax.patch | 79 --------------------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 debian/patches/fix-syntax.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 8e7ab6a..12c82a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ qtilitools (0.1.2+git20240107-0ubuntu1) UNRELEASED; urgency=medium * New upstream snapshot. + * Remove patch applied upstream. -- Simon Quigley Sat, 19 Oct 2024 15:01:05 -0500 diff --git a/debian/patches/fix-syntax.patch b/debian/patches/fix-syntax.patch deleted file mode 100644 index 5127dc8..0000000 --- a/debian/patches/fix-syntax.patch +++ /dev/null @@ -1,79 +0,0 @@ -Description: - -Author: -Origin: , -Bug: -Bug-: -Forwarded: -Applied-Upstream: -Reviewed-by: -Last-Update: 2023-11-17 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/bin/qtls-translate -+++ b/bin/qtls-translate -@@ -35,26 +35,29 @@ - # - # Update translation files. - #=============================================================================== --function usage --{ -+ -+usage() { - printf "\nUse: lxqt-transupdate [source directory]\n" - exit 0 - } - --function lxqt_transupdate --{ -- if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then usage; fi -+lxqt_transupdate() { -+ if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then -+ usage -+ fi - - # Test for supported Qt version -- local qtVersion_=$(qmake -query QT_VERSION|cut -d'.' -f1) -- local qVersions_=(5 6) -+ local qtVersion_=$(qmake -query QT_VERSION | cut -d'.' -f1) -+ local qVersions_="5 6" - -- if echo "${qVersions_[@]}" | grep -qw "$qtVersion_"; then supported_=1; fi -+ case $qVersions_ in -+ *"$qtVersion_"*) supported_=1 ;; -+ esac - - if [ -z "$supported_" ]; then - printf "\nError: Qt%s is not supported. (Supported versions are: " "$qtVersion_" -- printf "%s" "${qVersions_[0]}" -- printf ", %s" "${qVersions_[@]:1}" -+ printf "%s" "${qVersions_%% *}" -+ printf ", %s" "${qVersions_#* }" - printf ')\n\n' - exit 1 - fi -@@ -62,11 +65,15 @@ function lxqt_transupdate - local sourcedir_= - local templates_=$(find . -name \*.ts | grep -v '_') - -- if [ -d "$1" ]; then sourcedir_="$1"; fi -+ if [ -d "$1" ]; then -+ sourcedir_="$1" -+ fi - - for i in $templates_; do -- local transdir_=$(dirname $i) -- if [ "$sourcedir_" == "" ]; then sourcedir_=$(dirname $transdir_); fi -+ local transdir_=$(dirname "$i") -+ if [ "$sourcedir_" = "" ]; then -+ sourcedir_=$(dirname "$transdir_") -+ fi - local cmdUpdateTemplate="lupdate $sourcedir_ -ts $i -locations absolute -no-obsolete" - local cmdUpdateLanguage="lupdate $sourcedir_ -ts $transdir_/*_*.ts -locations absolute -no-obsolete" - -@@ -79,4 +86,5 @@ function lxqt_transupdate - printf "\n" - done - } -+ - lxqt_transupdate "${@}" diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index edf9076..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix-syntax.patch