r131 - in trunk/debian: . patches
rousseau at alioth.debian.org
rousseau at alioth.debian.org
Wed Jul 30 19:12:45 UTC 2008
Author: rousseau
Date: 2008-07-30 19:12:44 +0000 (Wed, 30 Jul 2008)
New Revision: 131
Added:
trunk/debian/patches/04_bins-edit-gui
trunk/debian/patches/05_share-man
trunk/debian/patches/06_doc_bins.sgml
trunk/debian/patches/07_fix_share
trunk/debian/patches/08_fix_bins-edit-gui_encoding
trunk/debian/patches/09_fix_wrong_relpath
trunk/debian/patches/10_symlinks_movies
trunk/debian/patches/11_check_template_style
trunk/debian/patches/12_optional_xml_elements
trunk/debian/patches/13_locale_encoding
trunk/debian/patches/14_bins-edit-gui
trunk/debian/patches/15_example_css
trunk/debian/patches/16_examples_html
trunk/debian/patches/17_bins
trunk/debian/patches/18_bins-memory-leak
trunk/debian/patches/19_bins-insert-directory
trunk/debian/patches/20_bins-syscall
trunk/debian/patches/21_bins-trim
trunk/debian/patches/22_bins-hash-ref
trunk/debian/patches/series
Removed:
trunk/debian/patches/00list
trunk/debian/patches/04_bins-edit-gui.dpatch
trunk/debian/patches/05_share-man.dpatch
trunk/debian/patches/06_doc_bins.sgml.dpatch
trunk/debian/patches/07_fix_share.dpatch
trunk/debian/patches/08_fix_bins-edit-gui_encoding.dpatch
trunk/debian/patches/09_fix_wrong_relpath.dpatch
trunk/debian/patches/10_symlinks_movies.dpatch
trunk/debian/patches/11_check_template_style.dpatch
trunk/debian/patches/12_optional_xml_elements.dpatch
trunk/debian/patches/13_locale_encoding.dpatch
trunk/debian/patches/14_bins-edit-gui.dpatch
trunk/debian/patches/15_example_css.dpatch
trunk/debian/patches/16_examples_html.dpatch
trunk/debian/patches/17_bins.dpatch
trunk/debian/patches/18_bins-memory-leak.dpatch
trunk/debian/patches/19_bins-insert-directory.dpatch
trunk/debian/patches/20_bins-syscall.dpatch
trunk/debian/patches/21_bins-trim.dpatch
trunk/debian/patches/22_bins-hash-ref.dpatch
Modified:
trunk/debian/control
trunk/debian/rules
Log:
convert from dpatch to quilt
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/control 2008-07-30 19:12:44 UTC (rev 131)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Ludovic Rousseau <rousseau at debian.org>
Uploaders: Martin Michlmayr <tbm at cyrius.com>
-Build-Depends: debhelper (>> 5.0.0), dpatch
+Build-Depends: debhelper (>> 5.0.0), quilt
Build-Depends-Indep: docbook-to-man, gettext
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-bins/trunk
Deleted: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/00list 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,19 +0,0 @@
-04_bins-edit-gui
-05_share-man
-06_doc_bins.sgml
-07_fix_share
-08_fix_bins-edit-gui_encoding
-09_fix_wrong_relpath
-10_symlinks_movies
-11_check_template_style
-12_optional_xml_elements
-13_locale_encoding
-14_bins-edit-gui
-15_example_css
-16_examples_html
-17_bins
-18_bins-memory-leak
-19_bins-insert-directory
-20_bins-syscall
-21_bins-trim
-22_bins-hash-ref
Copied: trunk/debian/patches/04_bins-edit-gui (from rev 130, trunk/debian/patches/04_bins-edit-gui.dpatch)
===================================================================
--- trunk/debian/patches/04_bins-edit-gui (rev 0)
+++ trunk/debian/patches/04_bins-edit-gui 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+## bins-edit-gui by Ludovic Rousseau <rousseau at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: bins-edit-gui.glade is in /usr/share/bins/ instead of
+## DP: /usr/local/share/bins/
+
+--- a/bins-edit-gui.old 2004-12-30 16:23:01.000000000 +0100
++++ b/bins-edit-gui 2004-12-30 16:24:48.000000000 +0100
+@@ -125,7 +125,7 @@
+ Gnome->init("bins-edit-gui", $version);
+ Gtk->init;
+
+-$glade = "/usr/local/share/bins/bins-edit-gui.glade";
++$glade = "/usr/share/bins/bins-edit-gui.glade";
+ if (! -r $glade) {
+ $glade = "bins-edit-gui.glade" ; # developer hack
+ print "DEVELOPER HACK\n";
Deleted: trunk/debian/patches/04_bins-edit-gui.dpatch
===================================================================
--- trunk/debian/patches/04_bins-edit-gui.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/04_bins-edit-gui.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-## bins-edit-gui by Ludovic Rousseau <rousseau at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: bins-edit-gui.glade is in /usr/share/bins/ instead of
-## DP: /usr/local/share/bins/
-
-if [ $# -lt 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch $patch_opts -p0 < $0;;
- -unpatch) patch $patch_opts -p0 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
---- bins-edit-gui.old 2004-12-30 16:23:01.000000000 +0100
-+++ bins-edit-gui 2004-12-30 16:24:48.000000000 +0100
-@@ -125,7 +125,7 @@
- Gnome->init("bins-edit-gui", $version);
- Gtk->init;
-
--$glade = "/usr/local/share/bins/bins-edit-gui.glade";
-+$glade = "/usr/share/bins/bins-edit-gui.glade";
- if (! -r $glade) {
- $glade = "bins-edit-gui.glade" ; # developer hack
- print "DEVELOPER HACK\n";
Copied: trunk/debian/patches/05_share-man (from rev 130, trunk/debian/patches/05_share-man.dpatch)
===================================================================
--- trunk/debian/patches/05_share-man (rev 0)
+++ trunk/debian/patches/05_share-man 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+## 05-share-man by Martin Michlmayr <tbm at cyrius.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Install man pages in the right directory
+
+--- a/install.sh~ 2005-08-25 19:34:18.000000000 +0100
++++ b/install.sh 2005-08-25 19:35:05.000000000 +0100
+@@ -36,7 +36,7 @@
+ DATA="$SHARE/bins"
+ GLADE="$DATA"
+ LOCALE="$SHARE/locale"
+-MAN="$PREFIX/man/man1"
++MAN="$SHARE/man/man1"
+
+ cd `dirname $0`
+
Deleted: trunk/debian/patches/05_share-man.dpatch
===================================================================
--- trunk/debian/patches/05_share-man.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/05_share-man.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,35 +0,0 @@
-#!/bin/sh -e
-## 05-share-man by Martin Michlmayr <tbm at cyrius.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Install man pages in the right directory
-
-if [ $# -lt 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch $patch_opts -p0 < $0;;
- -unpatch) patch $patch_opts -p0 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
---- install.sh~ 2005-08-25 19:34:18.000000000 +0100
-+++ install.sh 2005-08-25 19:35:05.000000000 +0100
-@@ -36,7 +36,7 @@
- DATA="$SHARE/bins"
- GLADE="$DATA"
- LOCALE="$SHARE/locale"
--MAN="$PREFIX/man/man1"
-+MAN="$SHARE/man/man1"
-
- cd `dirname $0`
-
Copied: trunk/debian/patches/06_doc_bins.sgml (from rev 130, trunk/debian/patches/06_doc_bins.sgml.dpatch)
===================================================================
--- trunk/debian/patches/06_doc_bins.sgml (rev 0)
+++ trunk/debian/patches/06_doc_bins.sgml 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+## doc/bins.sgml by Ludovic Rousseau <rousseau at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: the template are not in the upstream defined directory (/etc/bins)
+## DP: but in /usr/share/bins/
+
+ at DPATCH@
+--- a/doc/bins.sgml 2004-07-30 22:32:22.000000000 +0200
++++ b/doc/bins.sgml 2004-07-31 22:16:03.000000000 +0200
+@@ -184,7 +184,7 @@
+ <para>Specify location of html templates.</para>
+ <para>Default is <filename>~/.bins</filename>, falling back
+ to default versions in
+- <filename>/etc/bins/templates.<replaceable>style</replaceable></filename>.</para>
++ <filename>/usr/share/bins/templates.<replaceable>style</replaceable></filename>.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
Deleted: trunk/debian/patches/06_doc_bins.sgml.dpatch
===================================================================
--- trunk/debian/patches/06_doc_bins.sgml.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/06_doc_bins.sgml.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-## doc/bins.sgml by Ludovic Rousseau <rousseau at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: the template are not in the upstream defined directory (/etc/bins)
-## DP: but in /usr/share/bins/
-
-if [ $# -lt 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch $patch_opts -p0 < $0;;
- -unpatch) patch $patch_opts -p0 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
---- doc/bins.sgml 2004-07-30 22:32:22.000000000 +0200
-+++ doc/bins.sgml 2004-07-31 22:16:03.000000000 +0200
-@@ -184,7 +184,7 @@
- <para>Specify location of html templates.</para>
- <para>Default is <filename>~/.bins</filename>, falling back
- to default versions in
-- <filename>/etc/bins/templates.<replaceable>style</replaceable></filename>.</para>
-+ <filename>/usr/share/bins/templates.<replaceable>style</replaceable></filename>.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
Copied: trunk/debian/patches/07_fix_share (from rev 130, trunk/debian/patches/07_fix_share.dpatch)
===================================================================
--- trunk/debian/patches/07_fix_share (rev 0)
+++ trunk/debian/patches/07_fix_share 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+## 07_fix_share.dpatch by Martin Michlmayr <tbm at cyrius.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: use correct dir for share, Bug#327797
+
+--- a/install.sh~ 2005-09-12 17:34:57.000000000 +0100
++++ b/install.sh 2005-09-12 17:35:27.000000000 +0100
+@@ -24,8 +24,9 @@
+ GLOBAL_RC="$RC"
+
+ DESTDIR=`echo "$DESTDIR"|sed 's%/$%%'`
+-PREFIX=$DESTDIR/`echo "$PREFIX"|sed 's%^/%%'`
+ PREFIX=`echo "$PREFIX"|sed 's%/$%%'`
++GLOBAL_SHARE="$PREFIX/share"
++PREFIX=$DESTDIR/`echo "$PREFIX"|sed 's%^/%%'`
+ ETC=$DESTDIR/`echo "$ETC"|sed 's%^/%%'`
+ ETC=`echo "$ETC"|sed 's%/$%%'`
+ RC=$DESTDIR/`echo "$RC"|sed 's%^/%%'`
+@@ -227,7 +228,7 @@
+ do
+ echo -n " $FILE"
+ ed "$FILE" <<EoF 2>/dev/null
+-1,\$s%/usr/local/share%$SHARE%g
++1,\$s%/usr/local/share%$GLOBAL_SHARE%g
+ 1,\$s%/etc/bins%$GLOBAL_RC%g
+ wq
+ EoF
Deleted: trunk/debian/patches/07_fix_share.dpatch
===================================================================
--- trunk/debian/patches/07_fix_share.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/07_fix_share.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,46 +0,0 @@
-#!/bin/sh -e
-## 07_fix_share.dpatch by Martin Michlmayr <tbm at cyrius.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use correct dir for share, Bug#327797
-
-if [ $# -lt 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch $patch_opts -p0 < $0;;
- -unpatch) patch $patch_opts -p0 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
---- install.sh~ 2005-09-12 17:34:57.000000000 +0100
-+++ install.sh 2005-09-12 17:35:27.000000000 +0100
-@@ -24,8 +24,9 @@
- GLOBAL_RC="$RC"
-
- DESTDIR=`echo "$DESTDIR"|sed 's%/$%%'`
--PREFIX=$DESTDIR/`echo "$PREFIX"|sed 's%^/%%'`
- PREFIX=`echo "$PREFIX"|sed 's%/$%%'`
-+GLOBAL_SHARE="$PREFIX/share"
-+PREFIX=$DESTDIR/`echo "$PREFIX"|sed 's%^/%%'`
- ETC=$DESTDIR/`echo "$ETC"|sed 's%^/%%'`
- ETC=`echo "$ETC"|sed 's%/$%%'`
- RC=$DESTDIR/`echo "$RC"|sed 's%^/%%'`
-@@ -227,7 +228,7 @@
- do
- echo -n " $FILE"
- ed "$FILE" <<EoF 2>/dev/null
--1,\$s%/usr/local/share%$SHARE%g
-+1,\$s%/usr/local/share%$GLOBAL_SHARE%g
- 1,\$s%/etc/bins%$GLOBAL_RC%g
- wq
- EoF
Copied: trunk/debian/patches/08_fix_bins-edit-gui_encoding (from rev 130, trunk/debian/patches/08_fix_bins-edit-gui_encoding.dpatch)
===================================================================
--- trunk/debian/patches/08_fix_bins-edit-gui_encoding (rev 0)
+++ trunk/debian/patches/08_fix_bins-edit-gui_encoding 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_fix_bins-edit-gui_encoding.dpatch by <rousseau at acer.maison.bogus>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bins-1.1.29~/bins-edit-gui bins-1.1.29/bins-edit-gui
+--- bins-1.1.29~/bins-edit-gui 2005-08-25 00:07:05.000000000 +0200
++++ bins-1.1.29/bins-edit-gui 2005-10-15 16:29:14.000000000 +0200
+@@ -121,10 +121,10 @@
+ # Solaris refers to ISO 646 as "646" but that is not a valid codeset
+ if (!$@ && $codeset && $codeset ne "ANSI_X3.4-1968" && $codeset ne "646") {
+ $localEncoding = $codeset;
+- print "Forcing encoding to $codeset";
++ print "Forcing encoding to $codeset\n";
+ }
+
+-chop($localEncoding);
++chomp($localEncoding);
+ if (! $localEncoding) {
+ $localEncoding = "LATIN1";
+ }
Deleted: trunk/debian/patches/08_fix_bins-edit-gui_encoding.dpatch
===================================================================
--- trunk/debian/patches/08_fix_bins-edit-gui_encoding.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/08_fix_bins-edit-gui_encoding.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_fix_bins-edit-gui_encoding.dpatch by <rousseau at acer.maison.bogus>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad bins-1.1.29~/bins-edit-gui bins-1.1.29/bins-edit-gui
---- bins-1.1.29~/bins-edit-gui 2005-08-25 00:07:05.000000000 +0200
-+++ bins-1.1.29/bins-edit-gui 2005-10-15 16:29:14.000000000 +0200
-@@ -121,10 +121,10 @@
- # Solaris refers to ISO 646 as "646" but that is not a valid codeset
- if (!$@ && $codeset && $codeset ne "ANSI_X3.4-1968" && $codeset ne "646") {
- $localEncoding = $codeset;
-- print "Forcing encoding to $codeset";
-+ print "Forcing encoding to $codeset\n";
- }
-
--chop($localEncoding);
-+chomp($localEncoding);
- if (! $localEncoding) {
- $localEncoding = "LATIN1";
- }
Copied: trunk/debian/patches/09_fix_wrong_relpath (from rev 130, trunk/debian/patches/09_fix_wrong_relpath.dpatch)
===================================================================
--- trunk/debian/patches/09_fix_wrong_relpath (rev 0)
+++ trunk/debian/patches/09_fix_wrong_relpath 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09_fix_wrong_relpath.dpatch by Martin Michlmayr <tbm at cyrius.com>
+##
+## DP: Fix a off by one in relpath() [#334088]
+
+ at DPATCH@
+--- bins.orig/bins 2005-10-15 16:02:07.000000000 +0100
++++ bins.new/bins 2005-11-04 13:40:29.000000000 +0000
+@@ -1151,7 +1151,7 @@
+ my $l2 = length($p2);
+
+ my $cl = cls($p1, $p2);
+-
++ $cl-- if (substr($p2, $cl-1, 1) ne "/");
+ my $p2r = substr( $p2, $cl, $l2);
+
+ my $p1dc = 0;
Deleted: trunk/debian/patches/09_fix_wrong_relpath.dpatch
===================================================================
--- trunk/debian/patches/09_fix_wrong_relpath.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/09_fix_wrong_relpath.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_fix_wrong_relpath.dpatch by Martin Michlmayr <tbm at cyrius.com>
-##
-## DP: Fix a off by one in relpath() [#334088]
-
- at DPATCH@
---- bins.orig/bins 2005-10-15 16:02:07.000000000 +0100
-+++ bins.new/bins 2005-11-04 13:40:29.000000000 +0000
-@@ -1151,7 +1151,7 @@
- my $l2 = length($p2);
-
- my $cl = cls($p1, $p2);
--
-+ $cl-- if (substr($p2, $cl-1, 1) ne "/");
- my $p2r = substr( $p2, $cl, $l2);
-
- my $p1dc = 0;
Copied: trunk/debian/patches/10_symlinks_movies (from rev 130, trunk/debian/patches/10_symlinks_movies.dpatch)
===================================================================
--- trunk/debian/patches/10_symlinks_movies (rev 0)
+++ trunk/debian/patches/10_symlinks_movies 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_symlinks_movies.dpatch by Martin Michlmayr <tbm at cyrius.com>
+##
+## DP: Support linkInsteadOfCopy for movies [#334064]
+
+ at DPATCH@
+--- bins.orig/bins 2005-10-15 16:02:07.000000000 +0100
++++ bins.new/bins 2005-11-04 14:16:44.000000000 +0000
+@@ -1849,7 +1849,20 @@
+ my $from="$picdir$album$fileInAlbum";
+ my $to="$albumdir$album$fileInAlbum";
+ if ( ! -f $to ) {
+- `cp -p "$from" "$to"`;
++ if ($configHash->{linkInsteadOfCopy}) {
++ my $newpath;
++ if ($configHash->{linkRelative}) {
++ $newpath = relpath($to, $from);
++ } else {
++ $newpath = $from;
++ }
++ beVerboseN("Linking from $to to $newpath...", 2);
++ system("ln", "-sf", $newpath, $to) == 0
++ or die("\nCannot link $to to $newpath: $?");
++ } else {
++ beVerboseN("Copying from $from to $to...", 2);
++ `cp -p "$from" "$to"`;
++ }
+ }
+ }
+ }
+
Deleted: trunk/debian/patches/10_symlinks_movies.dpatch
===================================================================
--- trunk/debian/patches/10_symlinks_movies.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/10_symlinks_movies.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_symlinks_movies.dpatch by Martin Michlmayr <tbm at cyrius.com>
-##
-## DP: Support linkInsteadOfCopy for movies [#334064]
-
- at DPATCH@
---- bins.orig/bins 2005-10-15 16:02:07.000000000 +0100
-+++ bins.new/bins 2005-11-04 14:16:44.000000000 +0000
-@@ -1849,7 +1849,20 @@
- my $from="$picdir$album$fileInAlbum";
- my $to="$albumdir$album$fileInAlbum";
- if ( ! -f $to ) {
-- `cp -p "$from" "$to"`;
-+ if ($configHash->{linkInsteadOfCopy}) {
-+ my $newpath;
-+ if ($configHash->{linkRelative}) {
-+ $newpath = relpath($to, $from);
-+ } else {
-+ $newpath = $from;
-+ }
-+ beVerboseN("Linking from $to to $newpath...", 2);
-+ system("ln", "-sf", $newpath, $to) == 0
-+ or die("\nCannot link $to to $newpath: $?");
-+ } else {
-+ beVerboseN("Copying from $from to $to...", 2);
-+ `cp -p "$from" "$to"`;
-+ }
- }
- }
- }
-
Copied: trunk/debian/patches/11_check_template_style (from rev 130, trunk/debian/patches/11_check_template_style.dpatch)
===================================================================
--- trunk/debian/patches/11_check_template_style (rev 0)
+++ trunk/debian/patches/11_check_template_style 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_check_template_style.dpatch by Martin Michlmayr <tbm at cyrius.com>
+##
+## DP: Check if template style exists before processing images [#308114]
+
+ at DPATCH@
+--- bins.old/bins 2005-10-15 16:02:07.000000000 +0100
++++ bins.new/bins 2005-11-04 18:04:45.000000000 +0000
+@@ -1092,6 +1092,11 @@
+ exit 1;
+ }
+
++ if (! scalar templateDirs($configHash)) {
++ print "Cannot find template style '", $configHash->{templateStyle}, "'\n";
++ exit 1;
++ }
++
+ $picdir = $ARGV[0];
+ $albumdir = $ARGV[1];
+
+
Deleted: trunk/debian/patches/11_check_template_style.dpatch
===================================================================
--- trunk/debian/patches/11_check_template_style.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/11_check_template_style.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_check_template_style.dpatch by Martin Michlmayr <tbm at cyrius.com>
-##
-## DP: Check if template style exists before processing images [#308114]
-
- at DPATCH@
---- bins.old/bins 2005-10-15 16:02:07.000000000 +0100
-+++ bins.new/bins 2005-11-04 18:04:45.000000000 +0000
-@@ -1092,6 +1092,11 @@
- exit 1;
- }
-
-+ if (! scalar templateDirs($configHash)) {
-+ print "Cannot find template style '", $configHash->{templateStyle}, "'\n";
-+ exit 1;
-+ }
-+
- $picdir = $ARGV[0];
- $albumdir = $ARGV[1];
-
-
Copied: trunk/debian/patches/12_optional_xml_elements (from rev 130, trunk/debian/patches/12_optional_xml_elements.dpatch)
===================================================================
--- trunk/debian/patches/12_optional_xml_elements (rev 0)
+++ trunk/debian/patches/12_optional_xml_elements 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,108 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_optional_xml_elements.dpatch by Martin Michlmayr <tbm at cyrius.com>
+##
+## DP: Make XML elements optional and check whether the XML files are
+## DP: valid bins files [#308338]
+
+ at DPATCH@
+--- bins.orig/bins 2005-10-15 16:02:07.000000000 +0100
++++ bins.new/bins 2005-11-04 18:54:34.000000000 +0000
+@@ -3881,10 +3881,14 @@
+ if (-e $descFile) {
+ beVerboseN(" Reading desc file $descFile.", 3);
+ $document = getXMLAsGrove($descFile);
+- %descHash = getDescXML($document, $configHash);
+- #$descHash{descFileName} = uri_escape($descFile, '^-A-Za-z0-9/_\.');
+- $configHash = getConfigXML($document, '/image/bins', $configHash);
+- %exifHash = getExifXML($document, \@priorityList);
++ if (! $document->at_path("/image")) {
++ beVerboseN("Description file $descFile has no <image> element, ignoring.", 1);
++ } else {
++ %descHash = getDescXML($document, $configHash) if $document->at_path("/image/description");
++ #$descHash{descFileName} = uri_escape($descFile, '^-A-Za-z0-9/_\.');
++ $configHash = getConfigXML($document, '/image/bins', $configHash) if $document->at_path("/image/bins");
++ %exifHash = getExifXML($document, \@priorityList) if $document->at_path("/image/exif");
++ }
+ } else {
+ $descHash{descFileName} = "";
+ }
+@@ -4523,6 +4527,10 @@
+ beVerboseN("Reading album description file '$descFile'...", 3);
+
+ my $document = getXMLAsGrove($descFile);
++ if (! $document->at_path("/album")) {
++ beVerboseN("Description file $descFile has no <album> element, ignoring.", 1);
++ return $configHash;
++ }
+ # I have to do that, don't ask me why...
+
+ #$XML::UM::ENCDIR="/usr/lib/perl5/XML/Parser/";
+@@ -4530,37 +4538,40 @@
+ # Encoding => 'ISO-8859-9',
+ # EncodeUnmapped => \&XML::UM::encode_unmapped_dec);
+
+- $configHash = getConfigXML($document, "/album/bins", $configHash);
++ $configHash = getConfigXML($document, "/album/bins", $configHash) if
++ $document->at_path("/album/bins");
+
+- foreach my $element
+- (@{$document->at_path('/album/description')->{Contents}}) {
+- if (UNIVERSAL::isa($element, 'XML::Grove::Element') && $element->{Name} eq "field") {
+- $fieldName = $element->{Attributes}{'name'};
+- $fieldValue = "";
+- if (grep (/^$fieldName$/, @AlbumFieldNames)) {
+- beVerbose(" Reading field '$fieldName':", 3);
+- foreach my $characters (@{$element->{Contents}}) {
+- $fieldValue .= $characters->as_canon_xml();
+- }
+- #if ($fieldName ne "shortdesc" && $fieldName ne "longdesc"){
+- # $fieldValue = decode_entities($fieldValue);
+- #}
+- if ($fieldName eq "sampleimage"){
+- $fieldValue =
+- trimWhiteSpace(decode_entities($fieldValue));
+- beVerbose("'".$fieldValue."'\n", 3);
+- }else{
+- $fieldValue =
+- trimWhiteSpace(decode_entities(xml2html($fieldValue)));
+- beVerbose("'".$fieldValue."'\n", 3);
++ if ($document->at_path("/album/description")) {
++ foreach my $element
++ (@{$document->at_path('/album/description')->{Contents}}) {
++ if (UNIVERSAL::isa($element, 'XML::Grove::Element') && $element->{Name} eq "field") {
++ $fieldName = $element->{Attributes}{'name'};
++ $fieldValue = "";
++ if (grep (/^$fieldName$/, @AlbumFieldNames)) {
++ beVerbose(" Reading field '$fieldName':", 3);
++ foreach my $characters (@{$element->{Contents}}) {
++ $fieldValue .= $characters->as_canon_xml();
++ }
++ #if ($fieldName ne "shortdesc" && $fieldName ne "longdesc"){
++ # $fieldValue = decode_entities($fieldValue);
++ #}
++ if ($fieldName eq "sampleimage"){
++ $fieldValue =
++ trimWhiteSpace(decode_entities($fieldValue));
++ beVerbose("'".$fieldValue."'\n", 3);
++ }else{
++ $fieldValue =
++ trimWhiteSpace(decode_entities(xml2html($fieldValue)));
++ beVerbose("'".$fieldValue."'\n", 3);
++ }
++ # $fieldValue = $encode->(trimWhiteSpace($fieldValue));
++ $hash->{$fieldName} = $fieldValue;
++ } else {
++ beVerboseN(" Ignoring unknown field '$fieldName'.", 3);
+ }
+- # $fieldValue = $encode->(trimWhiteSpace($fieldValue));
+- $hash->{$fieldName} = $fieldValue;
+- } else {
+- beVerboseN(" Ignoring unknown field '$fieldName'.", 3);
+ }
+ }
+- }
++ }
+ return $configHash;
+ }
+
+
Deleted: trunk/debian/patches/12_optional_xml_elements.dpatch
===================================================================
--- trunk/debian/patches/12_optional_xml_elements.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/12_optional_xml_elements.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,108 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_optional_xml_elements.dpatch by Martin Michlmayr <tbm at cyrius.com>
-##
-## DP: Make XML elements optional and check whether the XML files are
-## DP: valid bins files [#308338]
-
- at DPATCH@
---- bins.orig/bins 2005-10-15 16:02:07.000000000 +0100
-+++ bins.new/bins 2005-11-04 18:54:34.000000000 +0000
-@@ -3881,10 +3881,14 @@
- if (-e $descFile) {
- beVerboseN(" Reading desc file $descFile.", 3);
- $document = getXMLAsGrove($descFile);
-- %descHash = getDescXML($document, $configHash);
-- #$descHash{descFileName} = uri_escape($descFile, '^-A-Za-z0-9/_\.');
-- $configHash = getConfigXML($document, '/image/bins', $configHash);
-- %exifHash = getExifXML($document, \@priorityList);
-+ if (! $document->at_path("/image")) {
-+ beVerboseN("Description file $descFile has no <image> element, ignoring.", 1);
-+ } else {
-+ %descHash = getDescXML($document, $configHash) if $document->at_path("/image/description");
-+ #$descHash{descFileName} = uri_escape($descFile, '^-A-Za-z0-9/_\.');
-+ $configHash = getConfigXML($document, '/image/bins', $configHash) if $document->at_path("/image/bins");
-+ %exifHash = getExifXML($document, \@priorityList) if $document->at_path("/image/exif");
-+ }
- } else {
- $descHash{descFileName} = "";
- }
-@@ -4523,6 +4527,10 @@
- beVerboseN("Reading album description file '$descFile'...", 3);
-
- my $document = getXMLAsGrove($descFile);
-+ if (! $document->at_path("/album")) {
-+ beVerboseN("Description file $descFile has no <album> element, ignoring.", 1);
-+ return $configHash;
-+ }
- # I have to do that, don't ask me why...
-
- #$XML::UM::ENCDIR="/usr/lib/perl5/XML/Parser/";
-@@ -4530,37 +4538,40 @@
- # Encoding => 'ISO-8859-9',
- # EncodeUnmapped => \&XML::UM::encode_unmapped_dec);
-
-- $configHash = getConfigXML($document, "/album/bins", $configHash);
-+ $configHash = getConfigXML($document, "/album/bins", $configHash) if
-+ $document->at_path("/album/bins");
-
-- foreach my $element
-- (@{$document->at_path('/album/description')->{Contents}}) {
-- if (UNIVERSAL::isa($element, 'XML::Grove::Element') && $element->{Name} eq "field") {
-- $fieldName = $element->{Attributes}{'name'};
-- $fieldValue = "";
-- if (grep (/^$fieldName$/, @AlbumFieldNames)) {
-- beVerbose(" Reading field '$fieldName':", 3);
-- foreach my $characters (@{$element->{Contents}}) {
-- $fieldValue .= $characters->as_canon_xml();
-- }
-- #if ($fieldName ne "shortdesc" && $fieldName ne "longdesc"){
-- # $fieldValue = decode_entities($fieldValue);
-- #}
-- if ($fieldName eq "sampleimage"){
-- $fieldValue =
-- trimWhiteSpace(decode_entities($fieldValue));
-- beVerbose("'".$fieldValue."'\n", 3);
-- }else{
-- $fieldValue =
-- trimWhiteSpace(decode_entities(xml2html($fieldValue)));
-- beVerbose("'".$fieldValue."'\n", 3);
-+ if ($document->at_path("/album/description")) {
-+ foreach my $element
-+ (@{$document->at_path('/album/description')->{Contents}}) {
-+ if (UNIVERSAL::isa($element, 'XML::Grove::Element') && $element->{Name} eq "field") {
-+ $fieldName = $element->{Attributes}{'name'};
-+ $fieldValue = "";
-+ if (grep (/^$fieldName$/, @AlbumFieldNames)) {
-+ beVerbose(" Reading field '$fieldName':", 3);
-+ foreach my $characters (@{$element->{Contents}}) {
-+ $fieldValue .= $characters->as_canon_xml();
-+ }
-+ #if ($fieldName ne "shortdesc" && $fieldName ne "longdesc"){
-+ # $fieldValue = decode_entities($fieldValue);
-+ #}
-+ if ($fieldName eq "sampleimage"){
-+ $fieldValue =
-+ trimWhiteSpace(decode_entities($fieldValue));
-+ beVerbose("'".$fieldValue."'\n", 3);
-+ }else{
-+ $fieldValue =
-+ trimWhiteSpace(decode_entities(xml2html($fieldValue)));
-+ beVerbose("'".$fieldValue."'\n", 3);
-+ }
-+ # $fieldValue = $encode->(trimWhiteSpace($fieldValue));
-+ $hash->{$fieldName} = $fieldValue;
-+ } else {
-+ beVerboseN(" Ignoring unknown field '$fieldName'.", 3);
- }
-- # $fieldValue = $encode->(trimWhiteSpace($fieldValue));
-- $hash->{$fieldName} = $fieldValue;
-- } else {
-- beVerboseN(" Ignoring unknown field '$fieldName'.", 3);
- }
- }
-- }
-+ }
- return $configHash;
- }
-
-
Copied: trunk/debian/patches/13_locale_encoding (from rev 130, trunk/debian/patches/13_locale_encoding.dpatch)
===================================================================
--- trunk/debian/patches/13_locale_encoding (rev 0)
+++ trunk/debian/patches/13_locale_encoding 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_locale_encoding.dpatch by Jérôme Sautret
+##
+## DP: convert latin-1 output to locale [#308111]
+
+ at DPATCH@
+
+--- bins-1.1.29.orig/bins
++++ bins-1.1.29/bins
+@@ -952,13 +952,23 @@
+
+ sub write_htaccess;
+
+-print "\nBINS Photo Album 1.1.29 (http://bins.sautret.org/)\n";
+-print "Copyright © 2001-2004 Jérôme Sautret (Jerome\@Sautret.org)\n";
+-print "Some parts of code:\n";
+-print "Copyright © 2000 Brendan McMahan (mcmahahb\@whitman.edu)\n";
+-print "Copyright © John Moose (moosejc\@muohio.edu)\n\n";
+-print "This is free software with ABSOLUTELY NO WARRANTY.\n";
+-print "See COPYING file for details.\n\n";
++my $copyright=<<END;
++BINS Photo Album 1.1.29 (http://bins.sautret.org/)
++Copyright © 2001-2004 Jérôme Sautret (Jerome\@Sautret.org)
++Some parts of code:
++Copyright © 2000 Brendan McMahan (mcmahahb\@whitman.edu)
++Copyright © John Moose (moosejc\@muohio.edu)
++
++This is free software with ABSOLUTELY NO WARRANTY.
++See COPYING file for details.
++
++END
++
++my $latin2localConverter;
++$latin2localConverter = Text::Iconv->new('latin1',
++$defaultConfig{defaultEncoding});
++$copyright = $latin2localConverter->convert($copyright);
++print $copyright;
+
+ # EVG (Evil Global Variables)
+ # Some on them should be moved to the config hash so they can be
+
Deleted: trunk/debian/patches/13_locale_encoding.dpatch
===================================================================
--- trunk/debian/patches/13_locale_encoding.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/13_locale_encoding.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 13_locale_encoding.dpatch by Jérôme Sautret
-##
-## DP: convert latin-1 output to locale [#308111]
-
- at DPATCH@
-
---- bins-1.1.29.orig/bins
-+++ bins-1.1.29/bins
-@@ -952,13 +952,23 @@
-
- sub write_htaccess;
-
--print "\nBINS Photo Album 1.1.29 (http://bins.sautret.org/)\n";
--print "Copyright © 2001-2004 Jérôme Sautret (Jerome\@Sautret.org)\n";
--print "Some parts of code:\n";
--print "Copyright © 2000 Brendan McMahan (mcmahahb\@whitman.edu)\n";
--print "Copyright © John Moose (moosejc\@muohio.edu)\n\n";
--print "This is free software with ABSOLUTELY NO WARRANTY.\n";
--print "See COPYING file for details.\n\n";
-+my $copyright=<<END;
-+BINS Photo Album 1.1.29 (http://bins.sautret.org/)
-+Copyright © 2001-2004 Jérôme Sautret (Jerome\@Sautret.org)
-+Some parts of code:
-+Copyright © 2000 Brendan McMahan (mcmahahb\@whitman.edu)
-+Copyright © John Moose (moosejc\@muohio.edu)
-+
-+This is free software with ABSOLUTELY NO WARRANTY.
-+See COPYING file for details.
-+
-+END
-+
-+my $latin2localConverter;
-+$latin2localConverter = Text::Iconv->new('latin1',
-+$defaultConfig{defaultEncoding});
-+$copyright = $latin2localConverter->convert($copyright);
-+print $copyright;
-
- # EVG (Evil Global Variables)
- # Some on them should be moved to the config hash so they can be
-
Copied: trunk/debian/patches/14_bins-edit-gui (from rev 130, trunk/debian/patches/14_bins-edit-gui.dpatch)
===================================================================
--- trunk/debian/patches/14_bins-edit-gui (rev 0)
+++ trunk/debian/patches/14_bins-edit-gui 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14_bins-edit-gui.dpatch by <rousseau at macbox.maison.bogus>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bins-1.1.29~/bins-edit-gui bins-1.1.29/bins-edit-gui
+--- bins-1.1.29~/bins-edit-gui 2006-11-21 21:48:51.000000000 +0100
++++ bins-1.1.29/bins-edit-gui 2006-11-21 21:55:28.000000000 +0100
+@@ -38,8 +38,33 @@
+
+ use Getopt::Long;
+
+-use Gtk;
+-use Gtk::GladeXML;
++BEGIN {
++ unless (eval "use Gtk; 1;") {
++ push @p, "libgtk-perl";
++ $fail=1
++ }
++
++ unless (eval "use Gtk::GladeXML; 1;") {
++ push @p, "libgladexml-perl";
++ $fail=1
++ }
++
++ unless (eval "use Gtk::Gdk::ImlibImage; 1;") {
++ push @p, "libgtk-imlib-perl";
++ $fail=1
++ }
++
++ unless (eval "use Gnome; 1;") {
++ push @p, "libgnome-perl";
++ $fail=1
++ }
++
++ if ($fail)
++ {
++ print "You need to install the Debian package(s): ", join(", ", @p), "\n";
++ exit;
++ }
++}
+
+ use XML::DOM;
+ use XML::XQL;
Deleted: trunk/debian/patches/14_bins-edit-gui.dpatch
===================================================================
--- trunk/debian/patches/14_bins-edit-gui.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/14_bins-edit-gui.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,46 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_bins-edit-gui.dpatch by <rousseau at macbox.maison.bogus>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad bins-1.1.29~/bins-edit-gui bins-1.1.29/bins-edit-gui
---- bins-1.1.29~/bins-edit-gui 2006-11-21 21:48:51.000000000 +0100
-+++ bins-1.1.29/bins-edit-gui 2006-11-21 21:55:28.000000000 +0100
-@@ -38,8 +38,33 @@
-
- use Getopt::Long;
-
--use Gtk;
--use Gtk::GladeXML;
-+BEGIN {
-+ unless (eval "use Gtk; 1;") {
-+ push @p, "libgtk-perl";
-+ $fail=1
-+ }
-+
-+ unless (eval "use Gtk::GladeXML; 1;") {
-+ push @p, "libgladexml-perl";
-+ $fail=1
-+ }
-+
-+ unless (eval "use Gtk::Gdk::ImlibImage; 1;") {
-+ push @p, "libgtk-imlib-perl";
-+ $fail=1
-+ }
-+
-+ unless (eval "use Gnome; 1;") {
-+ push @p, "libgnome-perl";
-+ $fail=1
-+ }
-+
-+ if ($fail)
-+ {
-+ print "You need to install the Debian package(s): ", join(", ", @p), "\n";
-+ exit;
-+ }
-+}
-
- use XML::DOM;
- use XML::XQL;
Copied: trunk/debian/patches/15_example_css (from rev 130, trunk/debian/patches/15_example_css.dpatch)
===================================================================
--- trunk/debian/patches/15_example_css (rev 0)
+++ trunk/debian/patches/15_example_css 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,91 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15_example_css.dpatch by <rousseau at macbox.maison.bogus>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bins-1.1.29~/doc/example.css bins-1.1.29/doc/example.css
+--- bins-1.1.29~/doc/example.css 1970-01-01 01:00:00.000000000 +0100
++++ bins-1.1.29/doc/example.css 2006-11-12 17:35:25.000000000 +0100
+@@ -0,0 +1,80 @@
++body {
++ }
++
++.navhomehead { padding-top: 0;
++ margin-bottom: 0;
++ padding-bottom: 0;
++ font-size: 80%
++ }
++
++.navhomehead { color: black; }
++.navhomehead a:link { color: black; }
++.navhomehead a:visited { color: black; }
++
++.navhead { padding-top: 0;
++ margin-bottom: 0;
++ padding-bottom: 0;
++ font-size: 80%
++ }
++
++.navhead { color: black; }
++.navhead a:link { color: black; }
++.navhead a:visited { color: black; }
++
++.navfoot { color: black;
++ font-size: 70%;
++ }
++
++.navfoot a:link { color: black; }
++.navfoot a:visited { color: black; }
++
++pre.programlisting { font-size: 80%;
++ }
++
++span.footdate { color: black;
++ font-size: 70%;
++ font-family: Arial, sans-serif;
++ }
++
++span.foothome { color: black;
++ font-size: 70%;
++ font-family: Arial, sans-serif;
++ }
++
++span.footfeed { color: black;
++ font-size: 70%;
++ font-family: Arial, sans-serif;
++ }
++
++span.footcopy { color: black;
++ font-size: 70%;
++ font-family: Arial, sans-serif;
++ }
++
++SPAN.curpage { color: yellow;
++ font-style: italic; }
++SPAN.curpage A { color: white; }
++SPAN.curpage A:link { color: white; }
++SPAN.curpage A:visited { color: white; }
++
++SPAN.toplevel A { color: white; }
++SPAN.toplevel A:link { color: white; }
++SPAN.toplevel A:visited { color: white; }
++
++SPAN.otherpage { color: white; }
++SPAN.otherpage A { color: white; }
++SPAN.otherpage A:link { color: white; }
++SPAN.otherpage A:visited { color: white; }
++
++SPAN.descendant A { color: white; }
++SPAN.descendant A:link { color: white; }
++SPAN.descendant A:visited { color: white; }
++
++SPAN.ancestor A { color: white; }
++SPAN.ancestor A:link { color: white; }
++SPAN.ancestor A:visited { color: white; }
++
++SPAN.shrink1 { font-size: 80%; }
++SPAN.shrink2 { font-size: 70%; }
++SPAN.shrink3 { font-size: 70%; }
++
Deleted: trunk/debian/patches/15_example_css.dpatch
===================================================================
--- trunk/debian/patches/15_example_css.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/15_example_css.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,91 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15_example_css.dpatch by <rousseau at macbox.maison.bogus>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad bins-1.1.29~/doc/example.css bins-1.1.29/doc/example.css
---- bins-1.1.29~/doc/example.css 1970-01-01 01:00:00.000000000 +0100
-+++ bins-1.1.29/doc/example.css 2006-11-12 17:35:25.000000000 +0100
-@@ -0,0 +1,80 @@
-+body {
-+ }
-+
-+.navhomehead { padding-top: 0;
-+ margin-bottom: 0;
-+ padding-bottom: 0;
-+ font-size: 80%
-+ }
-+
-+.navhomehead { color: black; }
-+.navhomehead a:link { color: black; }
-+.navhomehead a:visited { color: black; }
-+
-+.navhead { padding-top: 0;
-+ margin-bottom: 0;
-+ padding-bottom: 0;
-+ font-size: 80%
-+ }
-+
-+.navhead { color: black; }
-+.navhead a:link { color: black; }
-+.navhead a:visited { color: black; }
-+
-+.navfoot { color: black;
-+ font-size: 70%;
-+ }
-+
-+.navfoot a:link { color: black; }
-+.navfoot a:visited { color: black; }
-+
-+pre.programlisting { font-size: 80%;
-+ }
-+
-+span.footdate { color: black;
-+ font-size: 70%;
-+ font-family: Arial, sans-serif;
-+ }
-+
-+span.foothome { color: black;
-+ font-size: 70%;
-+ font-family: Arial, sans-serif;
-+ }
-+
-+span.footfeed { color: black;
-+ font-size: 70%;
-+ font-family: Arial, sans-serif;
-+ }
-+
-+span.footcopy { color: black;
-+ font-size: 70%;
-+ font-family: Arial, sans-serif;
-+ }
-+
-+SPAN.curpage { color: yellow;
-+ font-style: italic; }
-+SPAN.curpage A { color: white; }
-+SPAN.curpage A:link { color: white; }
-+SPAN.curpage A:visited { color: white; }
-+
-+SPAN.toplevel A { color: white; }
-+SPAN.toplevel A:link { color: white; }
-+SPAN.toplevel A:visited { color: white; }
-+
-+SPAN.otherpage { color: white; }
-+SPAN.otherpage A { color: white; }
-+SPAN.otherpage A:link { color: white; }
-+SPAN.otherpage A:visited { color: white; }
-+
-+SPAN.descendant A { color: white; }
-+SPAN.descendant A:link { color: white; }
-+SPAN.descendant A:visited { color: white; }
-+
-+SPAN.ancestor A { color: white; }
-+SPAN.ancestor A:link { color: white; }
-+SPAN.ancestor A:visited { color: white; }
-+
-+SPAN.shrink1 { font-size: 80%; }
-+SPAN.shrink2 { font-size: 70%; }
-+SPAN.shrink3 { font-size: 70%; }
-+
Copied: trunk/debian/patches/16_examples_html (from rev 130, trunk/debian/patches/16_examples_html.dpatch)
===================================================================
--- trunk/debian/patches/16_examples_html (rev 0)
+++ trunk/debian/patches/16_examples_html 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 16_examples_html.dpatch by <rousseau at macbox.maison.bogus>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bins-1.1.29~/doc/examples.html bins-1.1.29/doc/examples.html
+--- bins-1.1.29~/doc/examples.html 2006-06-18 19:02:14.000000000 +0200
++++ bins-1.1.29/doc/examples.html 2006-11-21 22:19:43.000000000 +0100
+@@ -92,6 +92,6 @@
+ </div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2469829"></a>Screenshots</h2></div></div></div>
+
+
+- <p>Here is a <a href="bins-edit-gui.jpg" target="_top">screenshot</a>
++ <p>Here is a <a href="http://bins.sautret.org/bins-edit-gui.jpg" target="_top">screenshot</a>
+ of bins-edit-gui, the gnome interface.</p>
+ </div><br></td></tr></table><div class="navfoot"><hr><table width="100%" border="0" summary="Footer navigation"><tr><td width="33%" align="left"><span class="footdate">$Date: 2005/08/08 20:35:08 $</span></td><td width="34%" align="center"><span class="foothome"><a href="index.html">Home</a></span></td><td width="33%" align="right"> </td></tr><tr><td colspan="3" align="right"><span class="footcopy"><span class="copyright">Copyright © 2001, 2005, Jérôme SAUTRET. </span></span></td></tr></table></div></div></body></html>
Deleted: trunk/debian/patches/16_examples_html.dpatch
===================================================================
--- trunk/debian/patches/16_examples_html.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/16_examples_html.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 16_examples_html.dpatch by <rousseau at macbox.maison.bogus>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad bins-1.1.29~/doc/examples.html bins-1.1.29/doc/examples.html
---- bins-1.1.29~/doc/examples.html 2006-06-18 19:02:14.000000000 +0200
-+++ bins-1.1.29/doc/examples.html 2006-11-21 22:19:43.000000000 +0100
-@@ -92,6 +92,6 @@
- </div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2469829"></a>Screenshots</h2></div></div></div>
-
-
-- <p>Here is a <a href="bins-edit-gui.jpg" target="_top">screenshot</a>
-+ <p>Here is a <a href="http://bins.sautret.org/bins-edit-gui.jpg" target="_top">screenshot</a>
- of bins-edit-gui, the gnome interface.</p>
- </div><br></td></tr></table><div class="navfoot"><hr><table width="100%" border="0" summary="Footer navigation"><tr><td width="33%" align="left"><span class="footdate">$Date: 2005/08/08 20:35:08 $</span></td><td width="34%" align="center"><span class="foothome"><a href="index.html">Home</a></span></td><td width="33%" align="right"> </td></tr><tr><td colspan="3" align="right"><span class="footcopy"><span class="copyright">Copyright © 2001, 2005, Jérôme SAUTRET. </span></span></td></tr></table></div></div></body></html>
Copied: trunk/debian/patches/17_bins (from rev 130, trunk/debian/patches/17_bins.dpatch)
===================================================================
--- trunk/debian/patches/17_bins (rev 0)
+++ trunk/debian/patches/17_bins 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 17_bin.dpatch by <rousseau at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bins-1.1.29~/bins bins-1.1.29/bins
+--- bins-1.1.29~/bins 2007-07-04 22:03:34.000000000 +0200
++++ bins-1.1.29/bins 2007-07-04 22:03:55.000000000 +0200
+@@ -547,7 +547,7 @@
+ "date" =>
+ { Name => _("Date"),
+ EXIF => "DateTimeOriginal",
+- Transform => '$_ = local2html(strftime $configHash->{dateString}, gmtime str2time "$_") if str2time "$_"',
++ Transform => '$_ = local2html(strftime $configHash->{dateString}, localtime str2time "$_") if str2time "$_"',
+ # Alternatively, you could use regex substitution:
+ # English version is yyyy:mm:dd hh:mm:ss to yyyy/mm/dd hh:mm:ss :
+ # Transform => 's%^(\\d+):(\\d+):(\\d+) (.*)$%\$1/\$2/\$3 \$4%',
Deleted: trunk/debian/patches/17_bins.dpatch
===================================================================
--- trunk/debian/patches/17_bins.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/17_bins.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 17_bin.dpatch by <rousseau at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad bins-1.1.29~/bins bins-1.1.29/bins
---- bins-1.1.29~/bins 2007-07-04 22:03:34.000000000 +0200
-+++ bins-1.1.29/bins 2007-07-04 22:03:55.000000000 +0200
-@@ -547,7 +547,7 @@
- "date" =>
- { Name => _("Date"),
- EXIF => "DateTimeOriginal",
-- Transform => '$_ = local2html(strftime $configHash->{dateString}, gmtime str2time "$_") if str2time "$_"',
-+ Transform => '$_ = local2html(strftime $configHash->{dateString}, localtime str2time "$_") if str2time "$_"',
- # Alternatively, you could use regex substitution:
- # English version is yyyy:mm:dd hh:mm:ss to yyyy/mm/dd hh:mm:ss :
- # Transform => 's%^(\\d+):(\\d+):(\\d+) (.*)$%\$1/\$2/\$3 \$4%',
Copied: trunk/debian/patches/18_bins-memory-leak (from rev 130, trunk/debian/patches/18_bins-memory-leak.dpatch)
===================================================================
--- trunk/debian/patches/18_bins-memory-leak (rev 0)
+++ trunk/debian/patches/18_bins-memory-leak 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,215 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 18_bins-1.1.29-memory-leak.dpatch by <rousseau at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bins-1.1.29~/bins bins-1.1.29/bins
+--- bins-1.1.29~/bins 2005-08-25 00:07:06.000000000 +0200
++++ bins-1.1.29/bins 2007-08-12 17:55:56.000000000 +0200
+@@ -449,13 +449,13 @@
+ $defaultConfig{fileActiveSizeNames} = \@fileActiveSizeNames;
+
+ # Fields to display (in the list order) under the picture. These
+-# fields are defined in the getFields function below.
++# fields are defined in the %fields hash below.
+ my @mainFields = ("description", "people", "location", "date",
+ "event", "comment");
+
+
+ # Fields to display (in the list order) in the details page. These
+-# fields are in the getFields function below.
++# fields are in the %fields hash below.
+ my @secondaryFields = (
+ # DigiCam
+ _("BINS-SECTION DigiCam Info"),
+@@ -519,7 +519,6 @@
+ "BINS-SECTION end", # close the last section
+ );
+
+-sub getFields {
+ # The key is the string used as the name in the picture
+ # description file.
+ # Name corresponds to the string displayed under the picture.
+@@ -527,9 +526,8 @@
+ # found in some JPEG images.
+ # The value of the EXIF structure is only used if no value
+ # is present in the picture description file.
+- # Transform is a Perl operator used to convert an exif value
+- # to the desired format to display. It is evaluated as
+- # normal Perl code and the result has to be in $_.
++ # Note: See also postProcessHashArrays() for dateString related
++ # items
+ my %fields =
+ (
+ "title" =>
+@@ -547,12 +545,6 @@
+ "date" =>
+ { Name => _("Date"),
+ EXIF => "DateTimeOriginal",
+- Transform => '$_ = local2html(strftime $configHash->{dateString}, localtime str2time "$_") if str2time "$_"',
+- # Alternatively, you could use regex substitution:
+- # English version is yyyy:mm:dd hh:mm:ss to yyyy/mm/dd hh:mm:ss :
+- # Transform => 's%^(\\d+):(\\d+):(\\d+) (.*)$%\$1/\$2/\$3 \$4%',
+- # French version is yyyy:mm:dd hh:mm:ss to dd/mm/yyyy hh:mm:ss :
+- # Transform => 's%^(\d+):(\d+):(\d+) (.*)$%$3/$2/$1 $4%',
+ },
+
+ "event" =>
+@@ -822,8 +814,6 @@
+ Tip => _("Indicates the image sensor type on the camera or input device."),
+ },
+ );
+- return \%fields;
+-}
+
+ my @priorityExifTags = (); # the field in this list are taken from
+ # the desc file, even if they are present
+@@ -847,10 +837,10 @@
+ });
+ $defaultConfig{colorsSubs} = \%colorsSubs;
+
+-sub getIntlSubs{
+- my $configHash = shift;
+- # Strings to translate in the HTML template pages (if I18N is used)
+- my %intlSubs = ( STRING_THUMBNAILS => _("thumbnails"),
++# Strings to translate in the HTML template pages (if I18N is used)
++# Note: See also postProcessHashArrays() for dateString related
++# items
++my %intlSubs = ( STRING_THUMBNAILS => _("thumbnails"),
+ STRING_IMAGELIST => _("Image List"),
+ STRING_HOME => _("Home"),
+ STRING_ALBUM => _("Album"),
+@@ -882,13 +872,11 @@
+ BINS_VERSION => "1.1.29",
+ ENCODING => $defaultConfig{htmlEncoding},
+ GENERATED_DATE => _("on ").
+- local2html(strftime($configHash->{dateString},
++ local2html(strftime($defaultConfig{dateString},
+ localtime)),
+ BINS_ID =>
+ '<!--$Id: bins,v 1.182 2005/08/22 23:52:33 jerome Exp $-->',
+ );
+- return \%intlSubs;
+-}
+
+ # @knownImageExtentions defines file extensions that BINS can handle as
+ # input image. BINS _should_ handle all input format of ImageMagick
+@@ -925,6 +913,7 @@
+ sub beVerboseN;
+ sub min;
+ sub readConfigFile;
++sub postProcessHashArrays;
+ sub fileSize;
+ sub generateAlbumPages;
+ sub filenameToPreviewName;
+@@ -942,8 +931,6 @@
+ sub trimWhiteSpace;
+ sub stringToBool;
+ sub ignoreSet;
+-sub getFields;
+-sub getIntlSubs;
+
+ sub generateThumbnailPages;
+ sub generateThumbEntry;
+@@ -1005,6 +992,27 @@
+ return \%option;
+ }
+
++# process hash arrays after reading config file
++# a non-default value of dateString might have been read from the
++# configuration file, so the proper values must be inserted into the
++# %fields and %intlSubs hash arrays
++sub postProcessHashArrays {
++ my $configHash = shift;
++
++ # Transform is a Perl operator used to convert an exif value
++ # to the desired format to display. It is evaluated as
++ # normal Perl code and the result has to be in $_.
++ $fields{date}{Transform} =
++ '$_ = local2html(strftime $configHash->{dateString}, localtime str2time "$_")';
++ # Alternatively, you could use regex substitution:
++ # English version is yyyy:mm:dd hh:mm:ss to yyyy/mm/dd hh:mm:ss :
++ # Transform => 's%^(\\d+):(\\d+):(\\d+) (.*)$%\$1/\$2/\$3 \$4%',
++ # French version is yyyy:mm:dd hh:mm:ss to dd/mm/yyyy hh:mm:ss :
++ # Transform => 's%^(\d+):(\d+):(\d+) (.*)$%$3/$2/$1 $4%',
++ $intlSubs{GENERATED_DATE} = _("on ").
++ local2html(strftime($configHash->{dateString}, localtime)),
++}
++
+ # process command line arguments after reading config file
+ sub postProcessArgs {
+ my $option = shift;
+@@ -1257,6 +1265,9 @@
+ # read configurations files
+ my $defaultConfig = readConfigFile(\%defaultConfig);
+
++ # post process %fields and %intlSubs hash arrays
++ postProcessHashArrays($defaultConfig);
++
+ # post process command line args after reading config files
+ postProcessArgs($options, $defaultConfig);
+
+@@ -2934,7 +2945,7 @@
+ $sectionTitle = $tagName;
+ $sectionTitle =~ s/^BINS-SECTION //;
+ }else{
+- $tagValue = getFields($configHash)->{$tagName};
++ $tagValue = $fields{$tagName};
+ if ($imageInfo->{$tagName}) {
+ my %row = (FIELD_NAME => $tagValue->{'Name'},
+ FIELD_VALUE => local2html($imageInfo->{$tagName})
+@@ -2989,7 +3000,7 @@
+ $subs_hash{CUSTOM_CSS} = $configHash->{customStyleSheet};
+
+ my @array;
+- push @array, {NAV_NAME => getIntlSubs($configHash)->{STRING_BACKTOTHEIMAGE},
++ push @array, {NAV_NAME => $intlSubs{STRING_BACKTOTHEIMAGE},
+ NAV_LINK => "javascript:history.back();",
+ NAV_ICON => "back.png",
+ NAV_ID => "back"};
+@@ -3646,7 +3657,7 @@
+ if (${%$hashref}{$tagName}) {
+ my $value=${%$hashref}{$tagName};
+ $value =~ s/'/'/g ; # in case it's used in javascript code
+- push @descTable, {DESC_FIELD_NAME => getFields($configHash)->{$tagName}->{'Name'},
++ push @descTable, {DESC_FIELD_NAME => $fields{$tagName}->{'Name'},
+ DESC_FIELD_VALUE => $value,
+ };
+ }
+@@ -3791,7 +3802,7 @@
+ %{$templateParameters} =
+ (%{$templateParameters},
+ %{$configHash->{colorsSubs}{$configHash->{colorStyle}}},
+- %{getIntlSubs($configHash)},
++ %intlSubs,
+ );
+
+ # open the html template
+@@ -3919,7 +3930,7 @@
+ && $element->{Name} eq "field") {
+ $fieldName = $element->{Attributes}{'name'};
+ $fieldValue = "";
+- if (grep (/^$fieldName$/, keys(%{getFields($configHash)}))) {
++ if (grep (/^$fieldName$/, keys(%fields))) {
+ beVerbose(" Reading field '$fieldName':", 3);
+ foreach my $characters (@{$element->{Contents}}) {
+ #if (UNIVERSAL::isa($characters, 'XML::Grove::Characters')) {
+@@ -4345,13 +4356,13 @@
+ }
+
+ # add value to desc Hash if field is void
+- foreach my $field (keys(%{getFields($configHash)})) {
+- my $fieldExif = getFields($configHash)->{$field}->{'EXIF'};
++ foreach my $field (keys(%fields)) {
++ my $fieldExif = $fields{$field}->{'EXIF'};
+ if ((! $descHash->{$field}) && $fieldExif && $exifHash->{$fieldExif}) {
+ beVerboseN(" Using '$field' from EXIF data: ".
+ $exifHash->{$fieldExif}, 3);
+
+- my $func = getFields($configHash)->{$field}->{'Transform'};
++ my $func = $fields{$field}->{'Transform'};
+ if ($func) {
+ $_ = $exifHash->{$fieldExif};
+ beVerbose(" Evaluating '$func' from '$_'", 4);
Deleted: trunk/debian/patches/18_bins-memory-leak.dpatch
===================================================================
--- trunk/debian/patches/18_bins-memory-leak.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/18_bins-memory-leak.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,215 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 18_bins-1.1.29-memory-leak.dpatch by <rousseau at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad bins-1.1.29~/bins bins-1.1.29/bins
---- bins-1.1.29~/bins 2005-08-25 00:07:06.000000000 +0200
-+++ bins-1.1.29/bins 2007-08-12 17:55:56.000000000 +0200
-@@ -449,13 +449,13 @@
- $defaultConfig{fileActiveSizeNames} = \@fileActiveSizeNames;
-
- # Fields to display (in the list order) under the picture. These
--# fields are defined in the getFields function below.
-+# fields are defined in the %fields hash below.
- my @mainFields = ("description", "people", "location", "date",
- "event", "comment");
-
-
- # Fields to display (in the list order) in the details page. These
--# fields are in the getFields function below.
-+# fields are in the %fields hash below.
- my @secondaryFields = (
- # DigiCam
- _("BINS-SECTION DigiCam Info"),
-@@ -519,7 +519,6 @@
- "BINS-SECTION end", # close the last section
- );
-
--sub getFields {
- # The key is the string used as the name in the picture
- # description file.
- # Name corresponds to the string displayed under the picture.
-@@ -527,9 +526,8 @@
- # found in some JPEG images.
- # The value of the EXIF structure is only used if no value
- # is present in the picture description file.
-- # Transform is a Perl operator used to convert an exif value
-- # to the desired format to display. It is evaluated as
-- # normal Perl code and the result has to be in $_.
-+ # Note: See also postProcessHashArrays() for dateString related
-+ # items
- my %fields =
- (
- "title" =>
-@@ -547,12 +545,6 @@
- "date" =>
- { Name => _("Date"),
- EXIF => "DateTimeOriginal",
-- Transform => '$_ = local2html(strftime $configHash->{dateString}, localtime str2time "$_") if str2time "$_"',
-- # Alternatively, you could use regex substitution:
-- # English version is yyyy:mm:dd hh:mm:ss to yyyy/mm/dd hh:mm:ss :
-- # Transform => 's%^(\\d+):(\\d+):(\\d+) (.*)$%\$1/\$2/\$3 \$4%',
-- # French version is yyyy:mm:dd hh:mm:ss to dd/mm/yyyy hh:mm:ss :
-- # Transform => 's%^(\d+):(\d+):(\d+) (.*)$%$3/$2/$1 $4%',
- },
-
- "event" =>
-@@ -822,8 +814,6 @@
- Tip => _("Indicates the image sensor type on the camera or input device."),
- },
- );
-- return \%fields;
--}
-
- my @priorityExifTags = (); # the field in this list are taken from
- # the desc file, even if they are present
-@@ -847,10 +837,10 @@
- });
- $defaultConfig{colorsSubs} = \%colorsSubs;
-
--sub getIntlSubs{
-- my $configHash = shift;
-- # Strings to translate in the HTML template pages (if I18N is used)
-- my %intlSubs = ( STRING_THUMBNAILS => _("thumbnails"),
-+# Strings to translate in the HTML template pages (if I18N is used)
-+# Note: See also postProcessHashArrays() for dateString related
-+# items
-+my %intlSubs = ( STRING_THUMBNAILS => _("thumbnails"),
- STRING_IMAGELIST => _("Image List"),
- STRING_HOME => _("Home"),
- STRING_ALBUM => _("Album"),
-@@ -882,13 +872,11 @@
- BINS_VERSION => "1.1.29",
- ENCODING => $defaultConfig{htmlEncoding},
- GENERATED_DATE => _("on ").
-- local2html(strftime($configHash->{dateString},
-+ local2html(strftime($defaultConfig{dateString},
- localtime)),
- BINS_ID =>
- '<!--$Id: bins,v 1.182 2005/08/22 23:52:33 jerome Exp $-->',
- );
-- return \%intlSubs;
--}
-
- # @knownImageExtentions defines file extensions that BINS can handle as
- # input image. BINS _should_ handle all input format of ImageMagick
-@@ -925,6 +913,7 @@
- sub beVerboseN;
- sub min;
- sub readConfigFile;
-+sub postProcessHashArrays;
- sub fileSize;
- sub generateAlbumPages;
- sub filenameToPreviewName;
-@@ -942,8 +931,6 @@
- sub trimWhiteSpace;
- sub stringToBool;
- sub ignoreSet;
--sub getFields;
--sub getIntlSubs;
-
- sub generateThumbnailPages;
- sub generateThumbEntry;
-@@ -1005,6 +992,27 @@
- return \%option;
- }
-
-+# process hash arrays after reading config file
-+# a non-default value of dateString might have been read from the
-+# configuration file, so the proper values must be inserted into the
-+# %fields and %intlSubs hash arrays
-+sub postProcessHashArrays {
-+ my $configHash = shift;
-+
-+ # Transform is a Perl operator used to convert an exif value
-+ # to the desired format to display. It is evaluated as
-+ # normal Perl code and the result has to be in $_.
-+ $fields{date}{Transform} =
-+ '$_ = local2html(strftime $configHash->{dateString}, localtime str2time "$_")';
-+ # Alternatively, you could use regex substitution:
-+ # English version is yyyy:mm:dd hh:mm:ss to yyyy/mm/dd hh:mm:ss :
-+ # Transform => 's%^(\\d+):(\\d+):(\\d+) (.*)$%\$1/\$2/\$3 \$4%',
-+ # French version is yyyy:mm:dd hh:mm:ss to dd/mm/yyyy hh:mm:ss :
-+ # Transform => 's%^(\d+):(\d+):(\d+) (.*)$%$3/$2/$1 $4%',
-+ $intlSubs{GENERATED_DATE} = _("on ").
-+ local2html(strftime($configHash->{dateString}, localtime)),
-+}
-+
- # process command line arguments after reading config file
- sub postProcessArgs {
- my $option = shift;
-@@ -1257,6 +1265,9 @@
- # read configurations files
- my $defaultConfig = readConfigFile(\%defaultConfig);
-
-+ # post process %fields and %intlSubs hash arrays
-+ postProcessHashArrays($defaultConfig);
-+
- # post process command line args after reading config files
- postProcessArgs($options, $defaultConfig);
-
-@@ -2934,7 +2945,7 @@
- $sectionTitle = $tagName;
- $sectionTitle =~ s/^BINS-SECTION //;
- }else{
-- $tagValue = getFields($configHash)->{$tagName};
-+ $tagValue = $fields{$tagName};
- if ($imageInfo->{$tagName}) {
- my %row = (FIELD_NAME => $tagValue->{'Name'},
- FIELD_VALUE => local2html($imageInfo->{$tagName})
-@@ -2989,7 +3000,7 @@
- $subs_hash{CUSTOM_CSS} = $configHash->{customStyleSheet};
-
- my @array;
-- push @array, {NAV_NAME => getIntlSubs($configHash)->{STRING_BACKTOTHEIMAGE},
-+ push @array, {NAV_NAME => $intlSubs{STRING_BACKTOTHEIMAGE},
- NAV_LINK => "javascript:history.back();",
- NAV_ICON => "back.png",
- NAV_ID => "back"};
-@@ -3646,7 +3657,7 @@
- if (${%$hashref}{$tagName}) {
- my $value=${%$hashref}{$tagName};
- $value =~ s/'/'/g ; # in case it's used in javascript code
-- push @descTable, {DESC_FIELD_NAME => getFields($configHash)->{$tagName}->{'Name'},
-+ push @descTable, {DESC_FIELD_NAME => $fields{$tagName}->{'Name'},
- DESC_FIELD_VALUE => $value,
- };
- }
-@@ -3791,7 +3802,7 @@
- %{$templateParameters} =
- (%{$templateParameters},
- %{$configHash->{colorsSubs}{$configHash->{colorStyle}}},
-- %{getIntlSubs($configHash)},
-+ %intlSubs,
- );
-
- # open the html template
-@@ -3919,7 +3930,7 @@
- && $element->{Name} eq "field") {
- $fieldName = $element->{Attributes}{'name'};
- $fieldValue = "";
-- if (grep (/^$fieldName$/, keys(%{getFields($configHash)}))) {
-+ if (grep (/^$fieldName$/, keys(%fields))) {
- beVerbose(" Reading field '$fieldName':", 3);
- foreach my $characters (@{$element->{Contents}}) {
- #if (UNIVERSAL::isa($characters, 'XML::Grove::Characters')) {
-@@ -4345,13 +4356,13 @@
- }
-
- # add value to desc Hash if field is void
-- foreach my $field (keys(%{getFields($configHash)})) {
-- my $fieldExif = getFields($configHash)->{$field}->{'EXIF'};
-+ foreach my $field (keys(%fields)) {
-+ my $fieldExif = $fields{$field}->{'EXIF'};
- if ((! $descHash->{$field}) && $fieldExif && $exifHash->{$fieldExif}) {
- beVerboseN(" Using '$field' from EXIF data: ".
- $exifHash->{$fieldExif}, 3);
-
-- my $func = getFields($configHash)->{$field}->{'Transform'};
-+ my $func = $fields{$field}->{'Transform'};
- if ($func) {
- $_ = $exifHash->{$fieldExif};
- beVerbose(" Evaluating '$func' from '$_'", 4);
Copied: trunk/debian/patches/19_bins-insert-directory (from rev 130, trunk/debian/patches/19_bins-insert-directory.dpatch)
===================================================================
--- trunk/debian/patches/19_bins-insert-directory (rev 0)
+++ trunk/debian/patches/19_bins-insert-directory 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,148 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 19_bins-1.1.29-insert-directory.dpatch by <rousseau at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bins-1.1.29~/bins bins-1.1.29/bins
+--- bins-1.1.29~/bins 2005-08-25 00:07:06.000000000 +0200
++++ bins-1.1.29/bins 2007-08-12 17:56:20.000000000 +0200
+@@ -399,6 +399,10 @@
+ # strings on console and to
+ # convert strings from .po
+ # files.
++
++ injectDir => '', # directory to be injected
++ # without rebuilding complete
++ # album
+ );
+
+ my $codeset;
+@@ -988,7 +992,7 @@
+ Getopt::Long::Configure("bundling");
+ die "Invalid options\n"
+ if (!GetOptions(\%option, "h", "p", "r:s", "e", "o:s", "t=s", "d=s", "s=s",
+- "c=s", "v:i", "i=s", "n=s", "f=s"));
++ "c=s", "v:i", "i=s", "n=s", "f=s", "j=s"));
+
+ if (defined($option{v})) {
+ $verbose = $option{v};
+@@ -1123,6 +1127,25 @@
+
+ die "albumdir_dir ($albumdir) can't be a subdirectory of picdir_dir ($picdir)"
+ if ($albumdir2 =~ m/^$picdir2\//);
++
++ if( defined $option{j} ) {
++ my $injectDir = $option{j};
++ my $injectExists = 1;
++
++ chdir $injectDir or warn "Can't chdir $injectDir: $!" and $injectExists = 0;
++
++ if( $injectExists ) {
++ $injectDir = File::Spec->rel2abs(".") unless -l $option{j};
++ chdir $pwd;
++ }
++
++ die "inject_dir (specified via -j parameter) $option{j} must be a subdirectory of pic_dir ($picdir)"
++ unless $injectDir =~ m#^$picdir2/.*#;
++
++ $configHash->{injectDir}
++ = File::Spec->rel2abs(File::Spec->canonpath($injectDir));
++ $configHash->{injectDir} .= '/'; # add trailing slash
++ }
+ }
+
+ $picdir = File::Spec->rel2abs(File::Spec->canonpath($picdir));
+@@ -2151,6 +2174,16 @@
+
+ sub generateImageListPage{
+ my ($album, $albumHashRef, $imageDataRef, $xlinksRef, $configHash) = @_;
++ if( $configHash->{injectDir} ne '' ) {
++ my $injectDir = $configHash->{injectDir};
++ my $oneDirUp;
++ # drop the last subdirectory
++ ( $oneDirUp = $configHash->{injectDir} ) =~ s#(.*/).*?/$#$1#o;
++ my $dir = $picdir . $album;
++ # Only generate imagelist page during injection
++ # for 1-level-up or injected album itself
++ return unless $dir =~ m#($oneDirUp|$injectDir)$#;
++ }
+ my %albumHash = %{$albumHashRef};
+ my @imageData = @{$imageDataRef};
+ my $pwd;
+@@ -2361,6 +2394,18 @@
+
+ sub generateLongSubAlbumPage{
+ my ($album, $albumHashRef, $configHash) = @_;
++ if( $configHash->{injectDir} ne '' ) {
++ my $injectDir = $configHash->{injectDir};
++ my( $oneDirUp, $twoDirUp );
++ # drop the last subdirectory
++ ( $oneDirUp = $configHash->{injectDir} ) =~ s#(.*/).*?/$#$1#o;
++ # drop the last subdirectory
++ ( $twoDirUp = $oneDirUp ) =~ s#(.*/).*?/$#$1#o;
++ my $dir = $picdir . $album;
++ # Only generate subalbum page during injection for
++ # 1-level-up or 2-level-up or injected album itself
++ return unless $dir =~ m#($oneDirUp|$twoDirUp|$injectDir)$#;
++ }
+ my %albumHash = %{$albumHashRef};
+
+ # hash for final subsitutions
+@@ -2641,6 +2686,18 @@
+ my ($album, $albumHashRef, $firstIsIndex, $configHash,
+ $xlinkListRef,
+ @imageData) = @_;
++
++ if( $configHash->{injectDir} ne '' ) {
++ my $injectDir = $configHash->{injectDir};
++ my $oneDirUp;
++ # drop the last subdirectory
++ ( $oneDirUp = $configHash->{injectDir} ) =~ s#(.*/).*?/$#$1#o;
++ my $dir = $picdir . $album;
++ # Only generate thumbnail page during injection for
++ # 1-level-up or injected album itself
++ return unless $dir =~ m#($oneDirUp|$injectDir)$#;
++ }
++
+ my @xlinkList=@$xlinkListRef;
+ my %albumHash = %{$albumHashRef};
+ my $numImages = scalar(@imageData); #element count
+@@ -3056,6 +3113,13 @@
+ my ($album, $albumHashRef, $firstIsIndex,
+ $configHash, @imagesToDisplay) = @_;
+
++ my $skipDueToInjection = 0;
++
++ if( $configHash->{injectDir} ne '' ) {
++ # skip processing of images unless processing injected directory
++ $skipDueToInjection = 1 unless $picdir . $album eq $configHash->{injectDir};
++ }
++
+ # an array of references to hashes storing information about each image
+ my @imageData;
+
+@@ -3311,10 +3375,12 @@
+ $imageData[$i]{'detailsLink'} =
+ generateSecondaryFieldsPage($imageData[$i], $album, $albumHashRef,
+ $crntImageBase.$crntImageType,
+- $configHash);
++ $configHash)
++ unless $skipDueToInjection;
+ if ( $configHash->{searchEngine}) {
+ writeSearchString($imageData[$i], $configHash, $albumHashRef,
+- $album);
++ $album)
++ unless $skipDueToInjection;
+ }
+ }
+
+@@ -3322,6 +3388,7 @@
+
+ # now generate html
+ for ($i=0; $i<$numImages; $i++) {
++ last if $skipDueToInjection;
+ for (my $j=0; $j <= $imageData[$i]->{maxSize}; $j++) {
+ my $lastImageURL = getHTMLImagePageLink($imageData[$numImages-1],
+ $j, $numImages-1);
Deleted: trunk/debian/patches/19_bins-insert-directory.dpatch
===================================================================
--- trunk/debian/patches/19_bins-insert-directory.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/19_bins-insert-directory.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,148 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 19_bins-1.1.29-insert-directory.dpatch by <rousseau at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad bins-1.1.29~/bins bins-1.1.29/bins
---- bins-1.1.29~/bins 2005-08-25 00:07:06.000000000 +0200
-+++ bins-1.1.29/bins 2007-08-12 17:56:20.000000000 +0200
-@@ -399,6 +399,10 @@
- # strings on console and to
- # convert strings from .po
- # files.
-+
-+ injectDir => '', # directory to be injected
-+ # without rebuilding complete
-+ # album
- );
-
- my $codeset;
-@@ -988,7 +992,7 @@
- Getopt::Long::Configure("bundling");
- die "Invalid options\n"
- if (!GetOptions(\%option, "h", "p", "r:s", "e", "o:s", "t=s", "d=s", "s=s",
-- "c=s", "v:i", "i=s", "n=s", "f=s"));
-+ "c=s", "v:i", "i=s", "n=s", "f=s", "j=s"));
-
- if (defined($option{v})) {
- $verbose = $option{v};
-@@ -1123,6 +1127,25 @@
-
- die "albumdir_dir ($albumdir) can't be a subdirectory of picdir_dir ($picdir)"
- if ($albumdir2 =~ m/^$picdir2\//);
-+
-+ if( defined $option{j} ) {
-+ my $injectDir = $option{j};
-+ my $injectExists = 1;
-+
-+ chdir $injectDir or warn "Can't chdir $injectDir: $!" and $injectExists = 0;
-+
-+ if( $injectExists ) {
-+ $injectDir = File::Spec->rel2abs(".") unless -l $option{j};
-+ chdir $pwd;
-+ }
-+
-+ die "inject_dir (specified via -j parameter) $option{j} must be a subdirectory of pic_dir ($picdir)"
-+ unless $injectDir =~ m#^$picdir2/.*#;
-+
-+ $configHash->{injectDir}
-+ = File::Spec->rel2abs(File::Spec->canonpath($injectDir));
-+ $configHash->{injectDir} .= '/'; # add trailing slash
-+ }
- }
-
- $picdir = File::Spec->rel2abs(File::Spec->canonpath($picdir));
-@@ -2151,6 +2174,16 @@
-
- sub generateImageListPage{
- my ($album, $albumHashRef, $imageDataRef, $xlinksRef, $configHash) = @_;
-+ if( $configHash->{injectDir} ne '' ) {
-+ my $injectDir = $configHash->{injectDir};
-+ my $oneDirUp;
-+ # drop the last subdirectory
-+ ( $oneDirUp = $configHash->{injectDir} ) =~ s#(.*/).*?/$#$1#o;
-+ my $dir = $picdir . $album;
-+ # Only generate imagelist page during injection
-+ # for 1-level-up or injected album itself
-+ return unless $dir =~ m#($oneDirUp|$injectDir)$#;
-+ }
- my %albumHash = %{$albumHashRef};
- my @imageData = @{$imageDataRef};
- my $pwd;
-@@ -2361,6 +2394,18 @@
-
- sub generateLongSubAlbumPage{
- my ($album, $albumHashRef, $configHash) = @_;
-+ if( $configHash->{injectDir} ne '' ) {
-+ my $injectDir = $configHash->{injectDir};
-+ my( $oneDirUp, $twoDirUp );
-+ # drop the last subdirectory
-+ ( $oneDirUp = $configHash->{injectDir} ) =~ s#(.*/).*?/$#$1#o;
-+ # drop the last subdirectory
-+ ( $twoDirUp = $oneDirUp ) =~ s#(.*/).*?/$#$1#o;
-+ my $dir = $picdir . $album;
-+ # Only generate subalbum page during injection for
-+ # 1-level-up or 2-level-up or injected album itself
-+ return unless $dir =~ m#($oneDirUp|$twoDirUp|$injectDir)$#;
-+ }
- my %albumHash = %{$albumHashRef};
-
- # hash for final subsitutions
-@@ -2641,6 +2686,18 @@
- my ($album, $albumHashRef, $firstIsIndex, $configHash,
- $xlinkListRef,
- @imageData) = @_;
-+
-+ if( $configHash->{injectDir} ne '' ) {
-+ my $injectDir = $configHash->{injectDir};
-+ my $oneDirUp;
-+ # drop the last subdirectory
-+ ( $oneDirUp = $configHash->{injectDir} ) =~ s#(.*/).*?/$#$1#o;
-+ my $dir = $picdir . $album;
-+ # Only generate thumbnail page during injection for
-+ # 1-level-up or injected album itself
-+ return unless $dir =~ m#($oneDirUp|$injectDir)$#;
-+ }
-+
- my @xlinkList=@$xlinkListRef;
- my %albumHash = %{$albumHashRef};
- my $numImages = scalar(@imageData); #element count
-@@ -3056,6 +3113,13 @@
- my ($album, $albumHashRef, $firstIsIndex,
- $configHash, @imagesToDisplay) = @_;
-
-+ my $skipDueToInjection = 0;
-+
-+ if( $configHash->{injectDir} ne '' ) {
-+ # skip processing of images unless processing injected directory
-+ $skipDueToInjection = 1 unless $picdir . $album eq $configHash->{injectDir};
-+ }
-+
- # an array of references to hashes storing information about each image
- my @imageData;
-
-@@ -3311,10 +3375,12 @@
- $imageData[$i]{'detailsLink'} =
- generateSecondaryFieldsPage($imageData[$i], $album, $albumHashRef,
- $crntImageBase.$crntImageType,
-- $configHash);
-+ $configHash)
-+ unless $skipDueToInjection;
- if ( $configHash->{searchEngine}) {
- writeSearchString($imageData[$i], $configHash, $albumHashRef,
-- $album);
-+ $album)
-+ unless $skipDueToInjection;
- }
- }
-
-@@ -3322,6 +3388,7 @@
-
- # now generate html
- for ($i=0; $i<$numImages; $i++) {
-+ last if $skipDueToInjection;
- for (my $j=0; $j <= $imageData[$i]->{maxSize}; $j++) {
- my $lastImageURL = getHTMLImagePageLink($imageData[$numImages-1],
- $j, $numImages-1);
Copied: trunk/debian/patches/20_bins-syscall (from rev 130, trunk/debian/patches/20_bins-syscall.dpatch)
===================================================================
--- trunk/debian/patches/20_bins-syscall (rev 0)
+++ trunk/debian/patches/20_bins-syscall 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_bins-1.1.29-syscall.dpatch by <rousseau at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bins-1.1.29~/bins bins-1.1.29/bins
+--- bins-1.1.29~/bins 2005-08-25 00:07:06.000000000 +0200
++++ bins-1.1.29/bins 2007-08-12 17:56:39.000000000 +0200
+@@ -3440,13 +3440,14 @@
+ $newpath = "$picdir$origName";
+ }
+ beVerboseN("Linking from $albumdir$newName to $newpath... ", 2);
+- system("ln", "-sf", $newpath, "$albumdir$newName") == 0
++ unlink("$albumdir$newName");
++ symlink($newpath, "$albumdir$newName") == 1
+ or die("\nCannot link $albumdir$newName to $newpath: $?");
+ # the original file may be r/o but we don't have to modify it
+ # but it must be readable by the http deamon
+ if ($configHash->{updateOriginalPerms})
+ {
+- system("chmod", "a+r", "$picdir$origName") == 0
++ chmod(0644, "$picdir$origName") == 1
+ or die("\nCannot set read permission on $albumdir$newName: $?");
+ }
+ beVerboseN("done.", 2);
+@@ -3457,7 +3458,7 @@
+ system("cp", "-p", "$picdir$origName", "$albumdir$newName") == 0
+ or die("\nCannot copy $picdir$origName to $albumdir$newName: $?");
+ # make it writable in case $origName was r/o
+- system("chmod", "u+w,a+r", "$albumdir$newName") == 0
++ chmod(0644, "$albumdir$newName") == 1
+ or die("\nCannot set write permission on $albumdir$newName: $?");
+ beVerboseN("done.", 2);
+ return 1;
Deleted: trunk/debian/patches/20_bins-syscall.dpatch
===================================================================
--- trunk/debian/patches/20_bins-syscall.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/20_bins-syscall.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_bins-1.1.29-syscall.dpatch by <rousseau at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad bins-1.1.29~/bins bins-1.1.29/bins
---- bins-1.1.29~/bins 2005-08-25 00:07:06.000000000 +0200
-+++ bins-1.1.29/bins 2007-08-12 17:56:39.000000000 +0200
-@@ -3440,13 +3440,14 @@
- $newpath = "$picdir$origName";
- }
- beVerboseN("Linking from $albumdir$newName to $newpath... ", 2);
-- system("ln", "-sf", $newpath, "$albumdir$newName") == 0
-+ unlink("$albumdir$newName");
-+ symlink($newpath, "$albumdir$newName") == 1
- or die("\nCannot link $albumdir$newName to $newpath: $?");
- # the original file may be r/o but we don't have to modify it
- # but it must be readable by the http deamon
- if ($configHash->{updateOriginalPerms})
- {
-- system("chmod", "a+r", "$picdir$origName") == 0
-+ chmod(0644, "$picdir$origName") == 1
- or die("\nCannot set read permission on $albumdir$newName: $?");
- }
- beVerboseN("done.", 2);
-@@ -3457,7 +3458,7 @@
- system("cp", "-p", "$picdir$origName", "$albumdir$newName") == 0
- or die("\nCannot copy $picdir$origName to $albumdir$newName: $?");
- # make it writable in case $origName was r/o
-- system("chmod", "u+w,a+r", "$albumdir$newName") == 0
-+ chmod(0644, "$albumdir$newName") == 1
- or die("\nCannot set write permission on $albumdir$newName: $?");
- beVerboseN("done.", 2);
- return 1;
Copied: trunk/debian/patches/21_bins-trim (from rev 130, trunk/debian/patches/21_bins-trim.dpatch)
===================================================================
--- trunk/debian/patches/21_bins-trim (rev 0)
+++ trunk/debian/patches/21_bins-trim 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 21_bins-trim.dpatch by <rousseau at imac.maison.bogus>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add -trim argument to jpegtran.
+## DP: Closes: #284157: bins: avoidable jpegtran image corruption
+
+ at DPATCH@
+diff -urNad bins-1.1.29~/bins bins-1.1.29/bins
+--- bins-1.1.29~/bins 2005-08-25 00:07:06.000000000 +0200
++++ bins-1.1.29/bins 2008-03-21 17:50:24.000000000 +0100
+@@ -4776,7 +4776,7 @@
+ if ($rotateJPEG eq "none") {
+ beVerbose("\n Looking for a JPEG rotation utility (jpegtran)... ", 3);
+ if (commandAvailable("jpegtran")) {
+- $rotateJPEG = 'jpegtran -copy all -rotate %s -outfile "%s.tmp" "%s" && mv "%s.tmp" "%s"';
++ $rotateJPEG = 'jpegtran -trim -copy all -rotate %s -outfile "%s.tmp" "%s" && mv "%s.tmp" "%s"';
+ beVerboseN(" found jpegtran.", 3);
+ } elsif (commandAvailable("jpegtran-mmx")) {
+ $rotateJPEG = 'jpegtran-mmx -copy all -rotate %s -outfile "%s.tmp" "%s" && mv "%s.tmp" "%s"';
+@@ -4883,7 +4883,7 @@
+ if ($progressifyJPEG eq "none") {
+ beVerbose("\n Looking for a progressive JPEG utility (jpegtran)... ", 3);
+ if (commandAvailable("jpegtran")) {
+- $progressifyJPEG = 'jpegtran -copy all -progressive -outfile "%s" "%s"';
++ $progressifyJPEG = 'jpegtran -trim -copy all -progressive -outfile "%s" "%s"';
+ beVerboseN(" found jpegtran.", 3);
+ } else {
+ $progressifyJPEG = "";
Deleted: trunk/debian/patches/21_bins-trim.dpatch
===================================================================
--- trunk/debian/patches/21_bins-trim.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/21_bins-trim.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 21_bins-trim.dpatch by <rousseau at imac.maison.bogus>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add -trim argument to jpegtran.
-## DP: Closes: #284157: bins: avoidable jpegtran image corruption
-
- at DPATCH@
-diff -urNad bins-1.1.29~/bins bins-1.1.29/bins
---- bins-1.1.29~/bins 2005-08-25 00:07:06.000000000 +0200
-+++ bins-1.1.29/bins 2008-03-21 17:50:24.000000000 +0100
-@@ -4776,7 +4776,7 @@
- if ($rotateJPEG eq "none") {
- beVerbose("\n Looking for a JPEG rotation utility (jpegtran)... ", 3);
- if (commandAvailable("jpegtran")) {
-- $rotateJPEG = 'jpegtran -copy all -rotate %s -outfile "%s.tmp" "%s" && mv "%s.tmp" "%s"';
-+ $rotateJPEG = 'jpegtran -trim -copy all -rotate %s -outfile "%s.tmp" "%s" && mv "%s.tmp" "%s"';
- beVerboseN(" found jpegtran.", 3);
- } elsif (commandAvailable("jpegtran-mmx")) {
- $rotateJPEG = 'jpegtran-mmx -copy all -rotate %s -outfile "%s.tmp" "%s" && mv "%s.tmp" "%s"';
-@@ -4883,7 +4883,7 @@
- if ($progressifyJPEG eq "none") {
- beVerbose("\n Looking for a progressive JPEG utility (jpegtran)... ", 3);
- if (commandAvailable("jpegtran")) {
-- $progressifyJPEG = 'jpegtran -copy all -progressive -outfile "%s" "%s"';
-+ $progressifyJPEG = 'jpegtran -trim -copy all -progressive -outfile "%s" "%s"';
- beVerboseN(" found jpegtran.", 3);
- } else {
- $progressifyJPEG = "";
Copied: trunk/debian/patches/22_bins-hash-ref (from rev 130, trunk/debian/patches/22_bins-hash-ref.dpatch)
===================================================================
--- trunk/debian/patches/22_bins-hash-ref (rev 0)
+++ trunk/debian/patches/22_bins-hash-ref 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 22_hash_ref.dpatch by <rousseau at imac.maison.bogus>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Closes: #481662 bins: Crashes mid-album
+
+ at DPATCH@
+diff -urNad bins-1.1.29~/bins bins-1.1.29/bins
+--- bins-1.1.29~/bins 2008-05-22 20:57:32.000000000 +0200
++++ bins-1.1.29/bins 2008-05-22 20:58:20.000000000 +0200
+@@ -3643,8 +3643,8 @@
+
+ my @descTable;
+ foreach my $tagName (@mainFields) {
+- if (${%$hashref}{$tagName}) {
+- my $value=${%$hashref}{$tagName};
++ if (${$hashref}{$tagName}) {
++ my $value=${$hashref}{$tagName};
+ $value =~ s/'/'/g ; # in case it's used in javascript code
+ push @descTable, {DESC_FIELD_NAME => getFields($configHash)->{$tagName}->{'Name'},
+ DESC_FIELD_VALUE => $value,
Deleted: trunk/debian/patches/22_bins-hash-ref.dpatch
===================================================================
--- trunk/debian/patches/22_bins-hash-ref.dpatch 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/patches/22_bins-hash-ref.dpatch 2008-07-30 19:12:44 UTC (rev 131)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 22_hash_ref.dpatch by <rousseau at imac.maison.bogus>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Closes: #481662 bins: Crashes mid-album
-
- at DPATCH@
-diff -urNad bins-1.1.29~/bins bins-1.1.29/bins
---- bins-1.1.29~/bins 2008-05-22 20:57:32.000000000 +0200
-+++ bins-1.1.29/bins 2008-05-22 20:58:20.000000000 +0200
-@@ -3643,8 +3643,8 @@
-
- my @descTable;
- foreach my $tagName (@mainFields) {
-- if (${%$hashref}{$tagName}) {
-- my $value=${%$hashref}{$tagName};
-+ if (${$hashref}{$tagName}) {
-+ my $value=${$hashref}{$tagName};
- $value =~ s/'/'/g ; # in case it's used in javascript code
- push @descTable, {DESC_FIELD_NAME => getFields($configHash)->{$tagName}->{'Name'},
- DESC_FIELD_VALUE => $value,
Copied: trunk/debian/patches/series (from rev 130, trunk/debian/patches/00list)
===================================================================
--- trunk/debian/patches/series (rev 0)
+++ trunk/debian/patches/series 2008-07-30 19:12:44 UTC (rev 131)
@@ -0,0 +1,19 @@
+04_bins-edit-gui
+05_share-man
+06_doc_bins.sgml
+07_fix_share
+08_fix_bins-edit-gui_encoding
+09_fix_wrong_relpath
+10_symlinks_movies
+11_check_template_style
+12_optional_xml_elements
+13_locale_encoding
+14_bins-edit-gui
+15_example_css
+16_examples_html
+17_bins
+18_bins-memory-leak
+19_bins-insert-directory
+20_bins-syscall
+21_bins-trim
+22_bins-hash-ref
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2008-05-22 19:03:19 UTC (rev 130)
+++ trunk/debian/rules 2008-07-30 19:12:44 UTC (rev 131)
@@ -29,8 +29,7 @@
tag:
cvs tag -c -F $(subst .,_,debian_version_$(version))
-# dpatch
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
configure: configure-stamp
configure-stamp:
@@ -40,13 +39,12 @@
touch configure-stamp
build: build-stamp
-build-stamp: patch-stamp configure-stamp
+build-stamp: patch configure-stamp
dh_testdir
touch build-stamp
-clean: clean1 unpatch
-clean1:
+clean: unpatch
dh_testdir
dh_testroot
@@ -117,6 +115,5 @@
# We have nothing to do
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure \
- patch unpatch clean1
+.PHONY: build clean binary-indep binary-arch binary install configure
More information about the pkg-bins-commits
mailing list