debian/changelog

@@ -1,18 +1,3 @@
-qtilitools (0.1.2-0ubuntu1) plucky; urgency=medium
-
-  * Upstream now offers releases, so dropping git.
-  * Added watch file. 
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Sun, 02 Feb 2025 22:54:57 +0000
-
-qtilitools (0.1.2+git20240107-0ubuntu1) plucky; urgency=medium
-
-  * New upstream snapshot.
-  * Remove patch applied upstream.
-  * Bump Standards-Version to 4.7.0, no changes needed.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 19 Oct 2024 15:08:00 -0500
-
 qtilitools (0.1.1~git20231009-0ubuntu1) noble; urgency=medium
 
   * Initial release (LP: #2043824).

debian/control

@@ -5,7 +5,7 @@ Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
 Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
 Rules-Requires-Root: no
 Build-Depends: cmake, debhelper-compat (= 13)
-Standards-Version: 4.7.0
+Standards-Version: 4.6.2
 Homepage: https://jpnaude.github.io/Qtilities/
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/qtilitools-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/qtilitools-packaging.git

debian/copyright

@@ -8,7 +8,7 @@ Copyright: 2023 Qtilities Team
 License: BSD-3
 
 Files: debian/*
-Copyright: 2023-2024 Simon Quigley <tsimonq2@ubuntu.com>
+Copyright: 2023 Simon Quigley <tsimonq2@ubuntu.com>
 License: BSD-3
 
 License: BSD-3

debian/patches/fix-syntax.patch

@@ -0,0 +1,79 @@
+Description: <short description, required>
+ <long description that can span multiple lines, optional>
+Author: <name and email of author, optional>
+Origin: <upstream|backport|vendor|other>, <URL, required except if Author is present>
+Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
+Bug-<Vendor>: <URL to the vendor bug report if any, optional>
+Forwarded: <URL|no|not-needed, useless if you have a Bug field, optional>
+Applied-Upstream: <version|URL|commit, identifies patches merged upstream, optional>
+Reviewed-by: <name and email of a reviewer, optional>
+Last-Update: 2023-11-17 <YYYY-MM-DD, last update of the meta-information, optional>
+---
+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 "${@}"

debian/patches/series

@@ -0,0 +1 @@
+fix-syntax.patch

debian/source/lintian-overrides

@@ -1,2 +0,0 @@
-# We are using a manually-generated upstream tarball
-qtilitools source: debian-watch-file-is-missing

debian/watch

@@ -1,4 +0,0 @@
-version=4
-opts="searchmode=plain, \
-filenamemangle=s/(@ANY_VERSION@)/qtilitools-$1.tar.gz/" \
-  https://api.github.com/repos/qtilities/@PACKAGE@/releases https:\/\/api.github.com\/repos\/qtilities\/@PACKAGE@\/tarball\/@ANY_VERSION@