please unblock llgal 0.13.10-1
Hi,
I would like llgal 0.13.10-1 to be unblocked. This is a new upstream
because I am the upstream and debian maintainer. I made this new
upstream to fix #408873. Apart from this bug fix, the other changes are
harmless (a typo in the manpage, a typo in the debian description, and
update to standards-version 3.7.2.2 without any change required).
FYI, llgal is a static gallery generator written in Perl. I am attaching
the upstream and packaging diffs to this email in case you want to look
a the actual changes.
thank you
Brice Goglin
--- /tmp/j3JX4ywAgl/llgal-0.13.9/debian/changelog 2007-01-29 21:49:07.000000000 +0100
+++ /tmp/kUvuw7ztzc/llgal-0.13.10/debian/changelog 2007-01-29 21:49:07.000000000 +0100
@@ -1,3 +1,14 @@
+llgal (0.13.10-1) unstable; urgency=low
+
+ * New upstream release.
+ * Call external commands as a list of arguments instead of as a
+ shell command-line so that special character are well supported
+ in path and filenames, closes: #408873.
+ * Update Standards-Version to 3.7.2.2, no change required.
+ * Fix missing word in the description, thanks to Christoph Berg.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 29 Jan 2007 21:28:06 +0100
+
llgal (0.13.9-1) unstable; urgency=low
* New upstream release.
--- /tmp/j3JX4ywAgl/llgal-0.13.9/debian/control 2007-01-29 21:49:07.000000000 +0100
+++ /tmp/kUvuw7ztzc/llgal-0.13.10/debian/control 2007-01-29 21:49:07.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Brice Goglin <Brice.Goglin@ens-lyon.org>
Build-Depends: debhelper (>= 4.0.2), quilt (>= 0.40)
+Standards-Version: 3.7.2.2
-Standards-Version: 3.7.2
Package: llgal
Architecture: all
@@ -16,8 +16,8 @@
- addition of headers, footers, links and separators in generated HTML files;
- automatic generation of captions from JFIF, GIF or EXIF tags;
- highly configurable layout.
+ The llgal interface is command line only. Its purpose is to generates
+ nice web-pages quickly, using very simple but standard XHTML/CSS code,
+ without requiring anything like php or javascript.
- llgal interface is command line only. Its purpose is to generates nice
- web-pages quickly, using very simple but standard XHTML/CSS code, without
- requiring anything like php or javascript.
.
Homepage: http://home.gna.org/llgal/
--- /tmp/j3JX4ywAgl/llgal-0.13.9/Changes 2006-11-16 22:13:54.000000000 +0100
+++ /tmp/kUvuw7ztzc/llgal-0.13.10/Changes 2007-01-29 21:32:56.000000000 +0100
@@ -1,3 +1,12 @@
+llgal (0.13.10)
+
+ * Fix removing of old www-pages and generation of thumbnails and
+ scaled images when target directory contains special characters
+ (thanks to Jeremie Koenig for the patch in Debian bug #408873).
+ * Fix typo in llgalrc.5.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 29 Jan 2007 21:21:00 +0100
+
llgal (0.13.9)
* Add missing double-quotes in command-lines when generating scaled
--- /tmp/j3JX4ywAgl/llgal-0.13.9/VERSION 2006-11-16 22:13:54.000000000 +0100
+++ /tmp/kUvuw7ztzc/llgal-0.13.10/VERSION 2007-01-29 21:32:56.000000000 +0100
@@ -1 +1 @@
+0.13.10
-0.13.9
--- /tmp/j3JX4ywAgl/llgal-0.13.9/llgal.1 2006-11-16 22:13:54.000000000 +0100
+++ /tmp/kUvuw7ztzc/llgal-0.13.10/llgal.1 2007-01-29 21:32:56.000000000 +0100
@@ -986,9 +986,10 @@
.BR <MAXW> " and " <MAXH>
will be replaced by the maximal width and length of the generated images.
Note that one of them might not be limited (depending on other configuration
+variable), making it be replaced by an empty string, eventually leading to
+empty parameters being passed to your program.
-variable), making it be replaced by an empty string.
If your program does not like that, you might want to create a wrapper shell
+script which will take care of accepting these.
-script which will take care of accepting empty maximal dimensions.
Another solution would be to replace
.I unlimited
with
--- /tmp/j3JX4ywAgl/llgal-0.13.9/llgal.in 2006-11-16 22:13:53.000000000 +0100
+++ /tmp/kUvuw7ztzc/llgal-0.13.10/llgal.in 2007-01-29 21:32:55.000000000 +0100
@@ -13,6 +13,7 @@
use Locale::gettext ;
use POSIX qw (setlocale) ;
use URI::Escape ;
+use Text::ParseWords ;
Getopt::Long::Configure('noignorecase', 'noautoabbrev', 'bundling') ;
STDOUT->autoflush("1") ;
@@ -595,10 +596,12 @@
$real_thumb_filename = $real_filename ;
} else {
# scale down
+ my @cmdline = map {
+ s/<IN>/$real_filename/g ;
+ s/<OUT>/$real_thumb_filename/g ;
+ $_ ;
+ } Text::ParseWords::parse_line('\s+', 0, $opts->{thumbnail_create_command}) ;
+ ($status, @output) = Llgal::Utils::system_with_output ( "create '$filename' thumbnail", @cmdline ) ;
- my $cmdline = $opts->{thumbnail_create_command} ;
- $cmdline =~ s/<IN>/\"$real_filename\"/g ;
- $cmdline =~ s/<OUT>/\"$real_thumb_filename\"/g ;
- ($status, @output) = Llgal::Utils::system_with_output ( "create '$filename' thumbnail", $cmdline ) ;
if ($status == -1) {
$messages->warning (@output) ;
$messages->abort_percentage ;
@@ -688,10 +691,12 @@
$real_scaled_filename = $real_filename ;
} else {
# scale down
+ my @cmdline = map {
+ s/<IN>/$real_filename/g ;
+ s/<OUT>/$real_scaled_filename/g ;
+ $_ ;
+ } Text::ParseWords::parse_line('\s+', 0, $opts->{scaled_create_command}) ;
+ ($status, @output) = Llgal::Utils::system_with_output ( "create '$filename' scaled image", @cmdline ) ;
- my $cmdline = $opts->{scaled_create_command} ;
- $cmdline =~ s/<IN>/\"$real_filename\"/g ;
- $cmdline =~ s/<OUT>/\"$real_scaled_filename\"/g ;
- ($status, @output) = Llgal::Utils::system_with_output ( "create '$filename' scaled image", $cmdline ) ;
if ($status == -1) {
$messages->warning (@output) ;
$messages->abort_percentage ;
@@ -1585,9 +1590,14 @@
my @entries = @{$gallery->{entries}} ;
# remove old webpages
+ opendir DIR, $self->{destination_dir} ? $self->{destination_dir} : "./" ; # destination is empty for './'
+ while ($_ = readdir DIR ) {
+ if (/^$opts->{slide_filenameprefix}.*\.$opts->{www_extension}$/) {
+ unlink "$self->{destination_dir}$_"
+ or die "Failed to remove existing webpage '$_' ($!).\n" ;
+ }
+ }
+ closedir DIR ;
- system ("rm -f $self->{destination_dir}$opts->{slide_filenameprefix}*.$opts->{www_extension}") ;
- die "Failed to remove existing webpages.\n"
- if $? ;
# find the slidetemplate
my $slidetemplate = (Llgal::Templates::find_template_file ($self, $opts, $opts->{slidetemplate_filename}, 1))
--- /tmp/j3JX4ywAgl/llgal-0.13.9/llgalrc.5 2006-11-16 22:13:54.000000000 +0100
+++ /tmp/kUvuw7ztzc/llgal-0.13.10/llgalrc.5 2007-01-29 21:32:56.000000000 +0100
@@ -6,7 +6,7 @@
.SH NAME
+llgalrc \- Configuration file for llgal
-llgal \- Configuration file for llgal
Reply to: