r132 - trunk/debian/patches
rousseau at alioth.debian.org
rousseau at alioth.debian.org
Wed Jul 30 19:48:03 UTC 2008
Author: rousseau
Date: 2008-07-30 19:48:02 +0000 (Wed, 30 Jul 2008)
New Revision: 132
Modified:
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
Log:
quilt refresh
Modified: trunk/debian/patches/04_bins-edit-gui
===================================================================
--- trunk/debian/patches/04_bins-edit-gui 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/04_bins-edit-gui 2008-07-30 19:48:02 UTC (rev 132)
@@ -5,9 +5,9 @@
## 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 @@
+--- bins-1.1.29.orig/bins-edit-gui
++++ bins-1.1.29/bins-edit-gui
+@@ -138,7 +138,7 @@
Gnome->init("bins-edit-gui", $version);
Gtk->init;
Modified: trunk/debian/patches/05_share-man
===================================================================
--- trunk/debian/patches/05_share-man 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/05_share-man 2008-07-30 19:48:02 UTC (rev 132)
@@ -4,8 +4,8 @@
## 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
+--- bins-1.1.29.orig/install.sh
++++ bins-1.1.29/install.sh
@@ -36,7 +36,7 @@
DATA="$SHARE/bins"
GLADE="$DATA"
Modified: trunk/debian/patches/06_doc_bins.sgml
===================================================================
--- trunk/debian/patches/06_doc_bins.sgml 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/06_doc_bins.sgml 2008-07-30 19:48:02 UTC (rev 132)
@@ -6,9 +6,9 @@
## DP: but in /usr/share/bins/
@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 @@
+--- bins-1.1.29.orig/doc/bins.sgml
++++ bins-1.1.29/doc/bins.sgml
+@@ -188,7 +188,7 @@
<para>Specify location of html templates.</para>
<para>Default is <filename>~/.bins</filename>, falling back
to default versions in
Modified: trunk/debian/patches/07_fix_share
===================================================================
--- trunk/debian/patches/07_fix_share 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/07_fix_share 2008-07-30 19:48:02 UTC (rev 132)
@@ -4,8 +4,8 @@
## 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
+--- bins-1.1.29.orig/install.sh
++++ bins-1.1.29/install.sh
@@ -24,8 +24,9 @@
GLOBAL_RC="$RC"
Modified: trunk/debian/patches/08_fix_bins-edit-gui_encoding
===================================================================
--- trunk/debian/patches/08_fix_bins-edit-gui_encoding 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/08_fix_bins-edit-gui_encoding 2008-07-30 19:48:02 UTC (rev 132)
@@ -5,9 +5,8 @@
## DP: No description.
@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
+--- bins-1.1.29.orig/bins-edit-gui
++++ bins-1.1.29/bins-edit-gui
@@ -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") {
Modified: trunk/debian/patches/09_fix_wrong_relpath
===================================================================
--- trunk/debian/patches/09_fix_wrong_relpath 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/09_fix_wrong_relpath 2008-07-30 19:48:02 UTC (rev 132)
@@ -4,8 +4,8 @@
## DP: Fix a off by one in relpath() [#334088]
@DPATCH@
---- bins.orig/bins 2005-10-15 16:02:07.000000000 +0100
-+++ bins.new/bins 2005-11-04 13:40:29.000000000 +0000
+--- bins-1.1.29.orig/bins
++++ bins-1.1.29/bins
@@ -1151,7 +1151,7 @@
my $l2 = length($p2);
Modified: trunk/debian/patches/10_symlinks_movies
===================================================================
--- trunk/debian/patches/10_symlinks_movies 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/10_symlinks_movies 2008-07-30 19:48:02 UTC (rev 132)
@@ -4,8 +4,8 @@
## DP: Support linkInsteadOfCopy for movies [#334064]
@DPATCH@
---- bins.orig/bins 2005-10-15 16:02:07.000000000 +0100
-+++ bins.new/bins 2005-11-04 14:16:44.000000000 +0000
+--- bins-1.1.29.orig/bins
++++ bins-1.1.29/bins
@@ -1849,7 +1849,20 @@
my $from="$picdir$album$fileInAlbum";
my $to="$albumdir$album$fileInAlbum";
@@ -28,4 +28,3 @@
}
}
}
-
Modified: trunk/debian/patches/11_check_template_style
===================================================================
--- trunk/debian/patches/11_check_template_style 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/11_check_template_style 2008-07-30 19:48:02 UTC (rev 132)
@@ -4,8 +4,8 @@
## DP: Check if template style exists before processing images [#308114]
@DPATCH@
---- bins.old/bins 2005-10-15 16:02:07.000000000 +0100
-+++ bins.new/bins 2005-11-04 18:04:45.000000000 +0000
+--- bins-1.1.29.orig/bins
++++ bins-1.1.29/bins
@@ -1092,6 +1092,11 @@
exit 1;
}
@@ -18,4 +18,3 @@
$picdir = $ARGV[0];
$albumdir = $ARGV[1];
-
Modified: trunk/debian/patches/12_optional_xml_elements
===================================================================
--- trunk/debian/patches/12_optional_xml_elements 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/12_optional_xml_elements 2008-07-30 19:48:02 UTC (rev 132)
@@ -5,9 +5,9 @@
## DP: valid bins files [#308338]
@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 @@
+--- bins-1.1.29.orig/bins
++++ bins-1.1.29/bins
+@@ -3899,10 +3899,14 @@
if (-e $descFile) {
beVerboseN(" Reading desc file $descFile.", 3);
$document = getXMLAsGrove($descFile);
@@ -26,7 +26,7 @@
} else {
$descHash{descFileName} = "";
}
-@@ -4523,6 +4527,10 @@
+@@ -4541,6 +4545,10 @@
beVerboseN("Reading album description file '$descFile'...", 3);
my $document = getXMLAsGrove($descFile);
@@ -37,7 +37,7 @@
# I have to do that, don't ask me why...
#$XML::UM::ENCDIR="/usr/lib/perl5/XML/Parser/";
-@@ -4530,37 +4538,40 @@
+@@ -4548,37 +4556,40 @@
# Encoding => 'ISO-8859-9',
# EncodeUnmapped => \&XML::UM::encode_unmapped_dec);
@@ -105,4 +105,3 @@
return $configHash;
}
-
Modified: trunk/debian/patches/13_locale_encoding
===================================================================
--- trunk/debian/patches/13_locale_encoding 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/13_locale_encoding 2008-07-30 19:48:02 UTC (rev 132)
@@ -38,4 +38,3 @@
# EVG (Evil Global Variables)
# Some on them should be moved to the config hash so they can be
-
Modified: trunk/debian/patches/14_bins-edit-gui
===================================================================
--- trunk/debian/patches/14_bins-edit-gui 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/14_bins-edit-gui 2008-07-30 19:48:02 UTC (rev 132)
@@ -5,9 +5,8 @@
## DP: No description.
@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
+--- bins-1.1.29.orig/bins-edit-gui
++++ bins-1.1.29/bins-edit-gui
@@ -38,8 +38,33 @@
use Getopt::Long;
Modified: trunk/debian/patches/15_example_css
===================================================================
--- trunk/debian/patches/15_example_css 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/15_example_css 2008-07-30 19:48:02 UTC (rev 132)
@@ -5,9 +5,8 @@
## DP: No description.
@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
+--- /dev/null
++++ bins-1.1.29/doc/example.css
@@ -0,0 +1,80 @@
+body {
+ }
Modified: trunk/debian/patches/16_examples_html
===================================================================
--- trunk/debian/patches/16_examples_html 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/16_examples_html 2008-07-30 19:48:02 UTC (rev 132)
@@ -5,9 +5,8 @@
## DP: No description.
@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
+--- bins-1.1.29.orig/doc/examples.html
++++ bins-1.1.29/doc/examples.html
@@ -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>
Modified: trunk/debian/patches/17_bins
===================================================================
--- trunk/debian/patches/17_bins 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/17_bins 2008-07-30 19:48:02 UTC (rev 132)
@@ -5,9 +5,8 @@
## DP: No description.
@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
+--- bins-1.1.29.orig/bins
++++ bins-1.1.29/bins
@@ -547,7 +547,7 @@
"date" =>
{ Name => _("Date"),
Modified: trunk/debian/patches/18_bins-memory-leak
===================================================================
--- trunk/debian/patches/18_bins-memory-leak 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/18_bins-memory-leak 2008-07-30 19:48:02 UTC (rev 132)
@@ -5,9 +5,8 @@
## DP: No description.
@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
+--- bins-1.1.29.orig/bins
++++ bins-1.1.29/bins
@@ -449,13 +449,13 @@
$defaultConfig{fileActiveSizeNames} = \@fileActiveSizeNames;
@@ -113,7 +112,7 @@
sub generateThumbnailPages;
sub generateThumbEntry;
-@@ -1005,6 +992,27 @@
+@@ -1015,6 +1002,27 @@
return \%option;
}
@@ -141,7 +140,7 @@
# process command line arguments after reading config file
sub postProcessArgs {
my $option = shift;
-@@ -1257,6 +1265,9 @@
+@@ -1272,6 +1280,9 @@
# read configurations files
my $defaultConfig = readConfigFile(\%defaultConfig);
@@ -151,7 +150,7 @@
# post process command line args after reading config files
postProcessArgs($options, $defaultConfig);
-@@ -2934,7 +2945,7 @@
+@@ -2962,7 +2973,7 @@
$sectionTitle = $tagName;
$sectionTitle =~ s/^BINS-SECTION //;
}else{
@@ -160,7 +159,7 @@
if ($imageInfo->{$tagName}) {
my %row = (FIELD_NAME => $tagValue->{'Name'},
FIELD_VALUE => local2html($imageInfo->{$tagName})
-@@ -2989,7 +3000,7 @@
+@@ -3017,7 +3028,7 @@
$subs_hash{CUSTOM_CSS} = $configHash->{customStyleSheet};
my @array;
@@ -169,7 +168,7 @@
NAV_LINK => "javascript:history.back();",
NAV_ICON => "back.png",
NAV_ID => "back"};
-@@ -3646,7 +3657,7 @@
+@@ -3674,7 +3685,7 @@
if (${%$hashref}{$tagName}) {
my $value=${%$hashref}{$tagName};
$value =~ s/'/'/g ; # in case it's used in javascript code
@@ -178,7 +177,7 @@
DESC_FIELD_VALUE => $value,
};
}
-@@ -3791,7 +3802,7 @@
+@@ -3819,7 +3830,7 @@
%{$templateParameters} =
(%{$templateParameters},
%{$configHash->{colorsSubs}{$configHash->{colorStyle}}},
@@ -187,7 +186,7 @@
);
# open the html template
-@@ -3919,7 +3930,7 @@
+@@ -3951,7 +3962,7 @@
&& $element->{Name} eq "field") {
$fieldName = $element->{Attributes}{'name'};
$fieldValue = "";
@@ -196,7 +195,7 @@
beVerbose(" Reading field '$fieldName':", 3);
foreach my $characters (@{$element->{Contents}}) {
#if (UNIVERSAL::isa($characters, 'XML::Grove::Characters')) {
-@@ -4345,13 +4356,13 @@
+@@ -4377,13 +4388,13 @@
}
# add value to desc Hash if field is void
Modified: trunk/debian/patches/19_bins-insert-directory
===================================================================
--- trunk/debian/patches/19_bins-insert-directory 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/19_bins-insert-directory 2008-07-30 19:48:02 UTC (rev 132)
@@ -5,9 +5,8 @@
## DP: No description.
@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
+--- bins-1.1.29.orig/bins
++++ bins-1.1.29/bins
@@ -399,6 +399,10 @@
# strings on console and to
# convert strings from .po
@@ -19,7 +18,7 @@
);
my $codeset;
-@@ -988,7 +992,7 @@
+@@ -985,7 +989,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",
@@ -28,7 +27,7 @@
if (defined($option{v})) {
$verbose = $option{v};
-@@ -1123,6 +1127,25 @@
+@@ -1146,6 +1150,25 @@
die "albumdir_dir ($albumdir) can't be a subdirectory of picdir_dir ($picdir)"
if ($albumdir2 =~ m/^$picdir2\//);
@@ -54,7 +53,7 @@
}
$picdir = File::Spec->rel2abs(File::Spec->canonpath($picdir));
-@@ -2151,6 +2174,16 @@
+@@ -2190,6 +2213,16 @@
sub generateImageListPage{
my ($album, $albumHashRef, $imageDataRef, $xlinksRef, $configHash) = @_;
@@ -71,7 +70,7 @@
my %albumHash = %{$albumHashRef};
my @imageData = @{$imageDataRef};
my $pwd;
-@@ -2361,6 +2394,18 @@
+@@ -2400,6 +2433,18 @@
sub generateLongSubAlbumPage{
my ($album, $albumHashRef, $configHash) = @_;
@@ -90,7 +89,7 @@
my %albumHash = %{$albumHashRef};
# hash for final subsitutions
-@@ -2641,6 +2686,18 @@
+@@ -2680,6 +2725,18 @@
my ($album, $albumHashRef, $firstIsIndex, $configHash,
$xlinkListRef,
@imageData) = @_;
@@ -109,7 +108,7 @@
my @xlinkList=@$xlinkListRef;
my %albumHash = %{$albumHashRef};
my $numImages = scalar(@imageData); #element count
-@@ -3056,6 +3113,13 @@
+@@ -3095,6 +3152,13 @@
my ($album, $albumHashRef, $firstIsIndex,
$configHash, @imagesToDisplay) = @_;
@@ -123,7 +122,7 @@
# an array of references to hashes storing information about each image
my @imageData;
-@@ -3311,10 +3375,12 @@
+@@ -3350,10 +3414,12 @@
$imageData[$i]{'detailsLink'} =
generateSecondaryFieldsPage($imageData[$i], $album, $albumHashRef,
$crntImageBase.$crntImageType,
@@ -138,7 +137,7 @@
}
}
-@@ -3322,6 +3388,7 @@
+@@ -3361,6 +3427,7 @@
# now generate html
for ($i=0; $i<$numImages; $i++) {
Modified: trunk/debian/patches/20_bins-syscall
===================================================================
--- trunk/debian/patches/20_bins-syscall 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/20_bins-syscall 2008-07-30 19:48:02 UTC (rev 132)
@@ -5,10 +5,9 @@
## DP: No description.
@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 @@
+--- bins-1.1.29.orig/bins
++++ bins-1.1.29/bins
+@@ -3546,13 +3546,14 @@
$newpath = "$picdir$origName";
}
beVerboseN("Linking from $albumdir$newName to $newpath... ", 2);
@@ -25,7 +24,7 @@
or die("\nCannot set read permission on $albumdir$newName: $?");
}
beVerboseN("done.", 2);
-@@ -3457,7 +3458,7 @@
+@@ -3563,7 +3564,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
Modified: trunk/debian/patches/21_bins-trim
===================================================================
--- trunk/debian/patches/21_bins-trim 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/21_bins-trim 2008-07-30 19:48:02 UTC (rev 132)
@@ -6,10 +6,9 @@
## DP: Closes: #284157: bins: avoidable jpegtran image corruption
@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 @@
+--- bins-1.1.29.orig/bins
++++ bins-1.1.29/bins
+@@ -4894,7 +4894,7 @@
if ($rotateJPEG eq "none") {
beVerbose("\n Looking for a JPEG rotation utility (jpegtran)... ", 3);
if (commandAvailable("jpegtran")) {
@@ -18,7 +17,7 @@
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 @@
+@@ -5001,7 +5001,7 @@
if ($progressifyJPEG eq "none") {
beVerbose("\n Looking for a progressive JPEG utility (jpegtran)... ", 3);
if (commandAvailable("jpegtran")) {
Modified: trunk/debian/patches/22_bins-hash-ref
===================================================================
--- trunk/debian/patches/22_bins-hash-ref 2008-07-30 19:12:44 UTC (rev 131)
+++ trunk/debian/patches/22_bins-hash-ref 2008-07-30 19:48:02 UTC (rev 132)
@@ -5,10 +5,9 @@
## DP: Closes: #481662 bins: Crashes mid-album
@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 @@
+--- bins-1.1.29.orig/bins
++++ bins-1.1.29/bins
+@@ -3750,8 +3750,8 @@
my @descTable;
foreach my $tagName (@mainFields) {
@@ -17,5 +16,5 @@
+ 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,
More information about the pkg-bins-commits
mailing list