Merge ~liushuyu-011/ubuntu/+source/pct-scanner-scripts:ubuntu/devel into ubuntu/+source/pct-scanner-scripts:debian/sid

[Zixing Liu]

This MP merges the pct-scanner-scripts packaging changes from Debian sid.

[Zixing Liu (liushuyu-011)]

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+build/28424524

[Vladimir Petko (vpa1977)]

b2be7f5e0094f921e7713c6995b018138c2fc5c1 includes changelog entry, we probably want to fix up merge

review: Needs Fixing

[Vladimir Petko (vpa1977)]

I have squashed https://git.launchpad.net/~liushuyu-011/ubuntu/+source/pct-scanner-scripts/commit/?id=37ea9a5428b2eda81f84d3b477deebe2a4a6c28e and https://git.launchpad.net/~liushuyu-011/ubuntu/+source/pct-scanner-scripts/commit/?id=5aec974aaf97ca2bfdcb85e0817d1caf720952e5 into a single commit as it would be easier to apply it as a single commit going forward.

I have updated changelog to reference the lp bug.

review: Approve

[Vladimir Petko (vpa1977)]

Uploaded, thank you!!!

Unmerged commits

55646e6... by Zixing Liu on 2024-05-06

finalize changelog

37ea9a5... by Zixing Liu on 2024-05-06

d/p/fix-improper-script-quoting.patch: add the patch file ...

... after the Debian transition to v3.0 source format

17048ab... by Zixing Liu on 2024-05-06

update-maintainer

28bb486... by Zixing Liu on 2024-05-06

reconstruct-changelog

5531a85... by Zixing Liu on 2024-05-06

merge-changelogs

5aec974... by Daniel T Chen on 2024-05-06

    - Apply patch from Dwayne Litzenberger fixing improper quoting

        in the shell script. Thanks, Dwayne! (LP: #799190)

diff --git a/debian/changelog b/debian/changelog
index 63a2b9e..7bc28f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pct-scanner-scripts (0.0.4-4ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Apply patch from Dwayne Litzenberger fixing improper quoting
+        in the shell script. Thanks, Dwayne! (LP #799190)
+    - Add the patches to the d/patches folder after the source format
+      upgrade
+
+ -- Zixing Liu <[e-mail]>  Mon, 06 May 2024 14:18:08 -0600
+
 pct-scanner-scripts (0.0.4-4) unstable; urgency=medium
 
   * QA upload.
@@ -19,6 +29,19 @@ pct-scanner-scripts (0.0.4-3.1) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Mon, 04 Jan 2021 16:08:04 +0100
 
+pct-scanner-scripts (0.0.4-3ubuntu2) noble; urgency=medium
+
+  * No change rebuild to gain buildinfo.
+
+ -- Dimitri John Ledkov <[e-mail]>  Sat, 17 Feb 2024 18:47:16 +0000
+
+pct-scanner-scripts (0.0.4-3ubuntu1) oneiric; urgency=low
+
+  * Apply patch from Dwayne Litzenberger fixing improper quoting
+    in the shell script. Thanks, Dwayne! (LP: #799190)
+
+ -- Daniel T Chen <[e-mail]>  Tue, 19 Jul 2011 16:33:16 -0400
+
 pct-scanner-scripts (0.0.4-3) unstable; urgency=low
 
   * changelog
diff --git a/debian/control b/debian/control
index 91af9a9..7a4c6d5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: pct-scanner-scripts
 Section: misc
 Priority: extra
-Maintainer: Debian QA Group <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian QA Group <[e-mail]>
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.8.1
 Homepage: https://secure.powercraft.nl/svn/packages/trunk/source/pct-scanner-scripts/
diff --git a/debian/patches/fix-improper-script-quoting.patch b/debian/patches/fix-improper-script-quoting.patch
new file mode 100644
index 0000000..0551770
--- /dev/null
+++ b/debian/patches/fix-improper-script-quoting.patch
@@ -0,0 +1,47 @@
+Description: Fix improper quoting in the shell script
+Author: Darsey Litzenberger <[e-mail]>
+Origin: vendor, https://bugs.launchpad.net/ubuntu/+source/pct-scanner-scripts/+bug/799190/+attachment/2174277/+files/fix-pct-scanner-script-quoting.patch
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634760
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/pct-scanner-scripts/+bug/799190
+Last-Update: 2011-06-18
+---
+Index: pct-scanner-scripts/pct-scanner-script
+===================================================================
+--- pct-scanner-scripts.orig/pct-scanner-script
++++ pct-scanner-scripts/pct-scanner-script
+@@ -331,7 +331,7 @@ function check_startcount()
+         exit 1
+     fi
+ 
+-    if [ $(echo "$SOURCE" | tr [:upper:] [:lower:]) == "flatbed" ]; then
++    if [ "$(echo "$SOURCE" | tr '[:upper:]' '[:lower:]')" == "flatbed" ]; then
+         EXTRA="--end-count $startcount"
+     fi
+ 
+@@ -362,7 +362,7 @@ function scanner_lineart()
+     echo $"resolution: $RESOLUTION"
+     echo $"scanning of document has started, please standby ..."
+     scan_busy_set
+-    scanadf $VERBOSE --device-name $DEVICE --scan-script "$COMMAND" --output-file "$OUTDIR"/scanscript/input/image-%04d.pbm --source $SOURCE --resolution $RESOLUTION --mode Lineart --compression None -x 210.000mm -y 297.000mm --start-count "$startcount" $EXTRA $EXEC_VERBOSE
++    scanadf $VERBOSE --device-name "$DEVICE" --scan-script "$COMMAND" --output-file "$OUTDIR"/scanscript/input/image-%04d.pbm --source "$SOURCE" --resolution "$RESOLUTION" --mode Lineart --compression None -x 210.000mm -y 297.000mm --start-count "$startcount" $EXTRA $EXEC_VERBOSE
+     scan_busy_unset
+ }
+ 
+@@ -380,7 +380,7 @@ function scanner_color()
+     echo $"resolution: $RESOLUTION"
+     echo $"scanning of document has started, please standby ..."
+     scan_busy_set
+-    scanadf $VERBOSE --device-name $DEVICE --scan-script "$COMMAND" --output-file "$OUTDIR"/scanscript/input/image-%04d.pbm --source $SOURCE --resolution $RESOLUTION --mode Color -x 210.000mm -y 297.000mm --start-count "$startcount" $EXTRA $EXEC_VERBOSE
++    scanadf $VERBOSE --device-name "$DEVICE" --scan-script "$COMMAND" --output-file "$OUTDIR"/scanscript/input/image-%04d.pbm --source "$SOURCE" --resolution "$RESOLUTION" --mode Color -x 210.000mm -y 297.000mm --start-count "$startcount" $EXTRA $EXEC_VERBOSE
+     scan_busy_unset
+ }
+ 
+@@ -398,7 +398,7 @@ function scanner_grayscale()
+     echo $"resolution: $RESOLUTION"
+     echo $"scanning of document has started, please standby ..."
+     scan_busy_set
+-    scanadf $VERBOSE --device-name $DEVICE --scan-script "$COMMAND" --output-file "$OUTDIR"/scanscript/input/image-%04d.pbm --source $SOURCE --resolution $RESOLUTION --mode Gray -x 210.000mm -y 297.000mm --start-count "$startcount" $EXTRA $EXEC_VERBOSE
++    scanadf $VERBOSE --device-name "$DEVICE" --scan-script "$COMMAND" --output-file "$OUTDIR"/scanscript/input/image-%04d.pbm --source "$SOURCE" --resolution "$RESOLUTION" --mode Gray -x 210.000mm -y 297.000mm --start-count "$startcount" $EXTRA $EXEC_VERBOSE
+     scan_busy_unset
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3893360..2c40ce7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian.patch
+fix-improper-script-quoting.patch