Dear maintainer, I've prepared an NMU for bins (versioned as 1.1.29-15.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer.
The full debdiff is attached. Regards David P.-S.: Off course, I'll reopen #196310 and tag it as found in 1.1.29-15.1, will take care of the unblock request, and am already subscribed to the PTS for this package, so I'll fix stuff if I broke any in this upload. Regards David
diff -Nru bins-1.1.29/debian/changelog bins-1.1.29/debian/changelog --- bins-1.1.29/debian/changelog 2012-06-22 17:26:20.000000000 -0400 +++ bins-1.1.29/debian/changelog 2012-08-16 19:31:02.000000000 -0400 @@ -1,3 +1,11 @@ +bins (1.1.29-15.1) unstable; urgency=low + + * Non-maintainer upload. + * Drop the #196310 fix that breaks subdirectories (Closes: #684415) + * Fix /usr/local⦠path (Closes: #684412) + + -- David Prévot <taf...@debian.org> Thu, 16 Aug 2012 19:28:34 -0400 + bins (1.1.29-15) unstable; urgency=low * Fix "include size of linked movie file in thumb*.html and imagelist.html" diff -Nru bins-1.1.29/debian/patches/38_bins_search bins-1.1.29/debian/patches/38_bins_search --- bins-1.1.29/debian/patches/38_bins_search 2012-06-20 14:21:45.000000000 -0400 +++ bins-1.1.29/debian/patches/38_bins_search 2012-08-16 19:32:36.000000000 -0400 @@ -1,10 +1,10 @@ Author: Boro Sitnikovski <buritom...@yahoo.com> Description: doesn't find search.js when using non default template Bug-Debian: http://bugs.debian.org/411149 - ---- a/bins 2010-01-18 09:41:35.000000000 +0100 -+++ b/bins_NEW 2012-06-19 00:40:11.384934876 +0200 -@@ -3858,6 +3858,7 @@ +Last-Update: 2012-08-16 +--- a/bins ++++ b/bins +@@ -3867,6 +3867,7 @@ $configHash->{templateStyle}, GLOB_TILDE)); push(@dirs, bsd_glob($configHash->{globalDataDir}."/templates.". $configHash->{templateStyle}, GLOB_TILDE)); diff -Nru bins-1.1.29/debian/patches/39_fix_local_install bins-1.1.29/debian/patches/39_fix_local_install --- bins-1.1.29/debian/patches/39_fix_local_install 1969-12-31 20:00:00.000000000 -0400 +++ bins-1.1.29/debian/patches/39_fix_local_install 2012-08-16 19:23:08.000000000 -0400 @@ -0,0 +1,26 @@ +Description: Fix variables looking for stuff in /usr/local/ + Default templates and i18n support were broken, looking for stuff in + the wrong place. +Author: David Prévot <taf...@debian.org> +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684412 +Last-Update: 2012-08-16 +--- a/bins ++++ b/bins +@@ -94,7 +94,7 @@ + ############################################################################ + + # I18N +-my $localePath = "/usr/local/share/locale"; # Base locale path (for I18N) ++my $localePath = "/usr/share/locale"; # Base locale path (for I18N) + + my $I18N = have_package("Locale::gettext"); + if ($I18N) { +@@ -383,7 +383,7 @@ + + # The following parameters cannot be set in config files for now : + globalConfigDir => "/etc/bins", # System wide configuration directory +- globalDataDir => "/usr/local/share/bins", # System wide data directory ++ globalDataDir => "/usr/share/bins", # System wide data directory + userConfigDir => "~/.bins", # User configuration directory + configFileName => "binsrc", # Configuration file. + diff -Nru bins-1.1.29/debian/patches/series bins-1.1.29/debian/patches/series --- bins-1.1.29/debian/patches/series 2012-06-20 14:21:45.000000000 -0400 +++ bins-1.1.29/debian/patches/series 2012-08-16 19:31:31.000000000 -0400 @@ -21,5 +21,5 @@ 34_bins.1 35_bins_jpeg 36_bins_linksize -37_bins_thumbnails 38_bins_search +39_fix_local_install
signature.asc
Description: OpenPGP digital signature
