I am uploading a NMU to DELAYED/10 to fix this. The debdiff is attached.
diff -Nru brag-1.4.1/brag brag-1.4.1/brag
--- brag-1.4.1/brag 2023-08-17 02:11:24.000000000 +0200
+++ brag-1.4.1/brag 2003-12-27 20:58:03.000000000 +0100
@@ -332,7 +332,6 @@
;# different newsgroups
variable combineServers 0 ;# Don't combine parts from different
;# servers
- variable keepFileNames 0 ;# Don't keep original file names
variable getSingle 0 ;# If true, get single-part msgs, too
variable finishedThread 1 ;# Flag to signify that a thread is
;# ready for another task
@@ -444,7 +443,6 @@
variable password
variable combine
variable combineServers
- variable keepFileNames
variable total
variable max
variable getSingle
@@ -510,9 +508,6 @@
"-C" {
set combineServers 1
}
- "-k" {
- set keepFileNames 1
- }
"-A" {
incr i
loadAcceptFile [lindex $argList $i]
@@ -1225,32 +1220,26 @@
proc brag::getDestination {file dir subject} {
- variable keepFileNames
-
# The message subject might be well formatted, so we gan get a good file
# name from it. Otherwise use the original file name
- if {$keepFileNames} {
- set base $file
- } else {
- regsub -all -- { - } $subject "|" subject
- regsub -all -- {y[eE]nc} $subject "" subject
- set fields [split $subject "|"]
- if {[llength $fields] > 1} {
- set base [lindex $fields end]
- if {[regexp {[0-9,]+ bytes} $base] || [regexp {[0-9,]+[KM]} $base]}
{
- set base [lindex $fields [expr {[llength $fields] - 2}]]
- }
- regsub "\\(\\)|\\\[\\\]" $base "" base
- set base [file tail [string trim [string trim $base {~}]]]
- } else {
- set base [file tail [string trim $file {~}]]
+ regsub -all -- { - } $subject "|" subject
+ regsub -all -- {y[eE]nc} $subject "" subject
+ set fields [split $subject "|"]
+ if {[llength $fields] > 1} {
+ set base [lindex $fields end]
+ if {[regexp {[0-9,]+ bytes} $base] || [regexp {[0-9,]+[KM]} $base]} {
+ set base [lindex $fields [expr {[llength $fields] - 2}]]
}
- regsub -all -- { [0-9,]+ bytes} $base {} base
- regsub -all -- { [0-9,]+[KM]B*} $base {} base
- set base [string trim $base {"}]
- regsub -all -- {[^a-zA-Z0-9_. ]} $base "_" base
+ regsub "\\(\\)|\\\[\\\]" $base "" base
+ set base [file tail [string trim [string trim $base {~}]]]
+ } else {
+ set base [file tail [string trim $file {~}]]
}
+ regsub -all -- { [0-9,]+ bytes} $base {} base
+ regsub -all -- { [0-9,]+[KM]B*} $base {} base
+ set base [string trim $base {"}]
+ regsub -all -- {[^a-zA-Z0-9_. ]} $base "_" base
# If the file doesn't already exist in the destination directory,
# return it, otherwise create a unique name based on the original
@@ -1273,7 +1262,7 @@
puts stderr "brag - Grab multipart binaries from news server
Usage: brag \[-s server\] \[-P port\] \[-g group\] \[-l user\] \[-p pass\]
- \[-o dir\] \[-n n\] \[-q\] \[-u\] \[-c\] \[-C\] \[-k\] \[-X\]
+ \[-o dir\] \[-n n\] \[-q\] \[-u\] \[-c\] \[-C\] \[-X\]
\[-a pattern \[-a pattern\] ...\] \[-r pattern \[-r pattern\] ...\]
\[-A file\] \[-R file\] \[-t number\] \[ -m max \]
or
@@ -1291,7 +1280,6 @@
-u Save message subjects, too
-c Combine parts even if they are from different groups
-C Combine parts even if they are from different servers
- -k Keep original filenames when possible
-X Process single-part messages, too
-a pattern Accept messages matching the pattern
-r pattern Reject messages matching the pattern
diff -Nru brag-1.4.1/brag.1 brag-1.4.1/brag.1
--- brag-1.4.1/brag.1 2023-08-17 02:11:24.000000000 +0200
+++ brag-1.4.1/brag.1 2003-12-27 20:58:03.000000000 +0100
@@ -58,10 +58,6 @@
.I ".sub"
extension added
.TP
-.I "-k"
-Keep original file names when possible, only rename when necessary to
-avoid a collission with existing files
-.TP
.I "\-o dir"
Set output directory to
.I "dir"
diff -Nru brag-1.4.1/debian/changelog brag-1.4.1/debian/changelog
--- brag-1.4.1/debian/changelog 2023-08-17 02:11:24.000000000 +0200
+++ brag-1.4.1/debian/changelog 2023-08-17 00:28:05.000000000 +0200
@@ -1,3 +1,10 @@
+brag (1.4.1-2.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Convert to source format 3.0. (closes: #1036421)
+
+ -- Bastian Germann <b...@debian.org> Wed, 16 Aug 2023 22:28:05 +0000
+
brag (1.4.1-2.2) unstable; urgency=medium
* Non-maintainer upload.
@@ -22,7 +29,7 @@
* Added -k option, to avoid unpleasant filename mangling (closes: #167662)
* Move to DebHelper 4
-
+
-- Simon Kelley <si...@thekelleys.org.uk> Tue, 11 Oct 2005 18:35:34 +0100
brag (1.4.1-1) unstable; urgency=low
diff -Nru brag-1.4.1/debian/patches/debian.patch
brag-1.4.1/debian/patches/debian.patch
--- brag-1.4.1/debian/patches/debian.patch 1970-01-01 01:00:00.000000000
+0100
+++ brag-1.4.1/debian/patches/debian.patch 2023-08-17 00:28:05.000000000
+0200
@@ -0,0 +1,106 @@
+--- brag-1.4.1.orig/brag
++++ brag-1.4.1/brag
+@@ -332,6 +332,7 @@ namespace eval brag {
+ ;# different newsgroups
+ variable combineServers 0 ;# Don't combine parts from different
+ ;# servers
++ variable keepFileNames 0 ;# Don't keep original file names
+ variable getSingle 0 ;# If true, get single-part msgs, too
+ variable finishedThread 1 ;# Flag to signify that a thread is
+ ;# ready for another task
+@@ -443,6 +444,7 @@ proc brag::init {argList} {
+ variable password
+ variable combine
+ variable combineServers
++ variable keepFileNames
+ variable total
+ variable max
+ variable getSingle
+@@ -508,6 +510,9 @@ proc brag::init {argList} {
+ "-C" {
+ set combineServers 1
+ }
++ "-k" {
++ set keepFileNames 1
++ }
+ "-A" {
+ incr i
+ loadAcceptFile [lindex $argList $i]
+@@ -1220,26 +1225,32 @@ proc brag::decode {subject partList} {
+
+ proc brag::getDestination {file dir subject} {
+
++ variable keepFileNames
++
+ # The message subject might be well formatted, so we gan get a good file
+ # name from it. Otherwise use the original file name
+
+- regsub -all -- { - } $subject "|" subject
+- regsub -all -- {y[eE]nc} $subject "" subject
+- set fields [split $subject "|"]
+- if {[llength $fields] > 1} {
+- set base [lindex $fields end]
+- if {[regexp {[0-9,]+ bytes} $base] || [regexp {[0-9,]+[KM]} $base]} {
+- set base [lindex $fields [expr {[llength $fields] - 2}]]
+- }
+- regsub "\\(\\)|\\\[\\\]" $base "" base
+- set base [file tail [string trim [string trim $base {~}]]]
++ if {$keepFileNames} {
++ set base $file
+ } else {
+- set base [file tail [string trim $file {~}]]
++ regsub -all -- { - } $subject "|" subject
++ regsub -all -- {y[eE]nc} $subject "" subject
++ set fields [split $subject "|"]
++ if {[llength $fields] > 1} {
++ set base [lindex $fields end]
++ if {[regexp {[0-9,]+ bytes} $base] || [regexp {[0-9,]+[KM]} $base]}
{
++ set base [lindex $fields [expr {[llength $fields] - 2}]]
++ }
++ regsub "\\(\\)|\\\[\\\]" $base "" base
++ set base [file tail [string trim [string trim $base {~}]]]
++ } else {
++ set base [file tail [string trim $file {~}]]
++ }
++ regsub -all -- { [0-9,]+ bytes} $base {} base
++ regsub -all -- { [0-9,]+[KM]B*} $base {} base
++ set base [string trim $base {"}]
++ regsub -all -- {[^a-zA-Z0-9_. ]} $base "_" base
+ }
+- regsub -all -- { [0-9,]+ bytes} $base {} base
+- regsub -all -- { [0-9,]+[KM]B*} $base {} base
+- set base [string trim $base {"}]
+- regsub -all -- {[^a-zA-Z0-9_. ]} $base "_" base
+
+ # If the file doesn't already exist in the destination directory,
+ # return it, otherwise create a unique name based on the original
+@@ -1262,7 +1273,7 @@ proc brag::usage {} {
+ puts stderr "brag - Grab multipart binaries from news server
+
+ Usage: brag \[-s server\] \[-P port\] \[-g group\] \[-l user\] \[-p pass\]
+- \[-o dir\] \[-n n\] \[-q\] \[-u\] \[-c\] \[-C\] \[-X\]
++ \[-o dir\] \[-n n\] \[-q\] \[-u\] \[-c\] \[-C\] \[-k\] \[-X\]
+ \[-a pattern \[-a pattern\] ...\] \[-r pattern \[-r pattern\]
...\]
+ \[-A file\] \[-R file\] \[-t number\] \[ -m max \]
+ or
+@@ -1280,6 +1291,7 @@ or
+ -u Save message subjects, too
+ -c Combine parts even if they are from different groups
+ -C Combine parts even if they are from different servers
++ -k Keep original filenames when possible
+ -X Process single-part messages, too
+ -a pattern Accept messages matching the pattern
+ -r pattern Reject messages matching the pattern
+--- brag-1.4.1.orig/brag.1
++++ brag-1.4.1/brag.1
+@@ -58,6 +58,10 @@ the same name as the binary, with
+ .I ".sub"
+ extension added
+ .TP
++.I "-k"
++Keep original file names when possible, only rename when necessary to
++avoid a collission with existing files
++.TP
+ .I "\-o dir"
+ Set output directory to
+ .I "dir"
diff -Nru brag-1.4.1/debian/patches/series brag-1.4.1/debian/patches/series
--- brag-1.4.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ brag-1.4.1/debian/patches/series 2023-08-17 00:28:05.000000000 +0200
@@ -0,0 +1 @@
+debian.patch
diff -Nru brag-1.4.1/debian/source/format brag-1.4.1/debian/source/format
--- brag-1.4.1/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ brag-1.4.1/debian/source/format 2023-08-17 00:27:51.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
