Bug#685574: unblock: bins/1.1.29-16
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package bins
It fixes the #684415 RC bug (the easy way: dropping the incomplete
37_bins_thumbnails fix to an arguable wishlist bug), and a important
one via unstable (#684412) with a tiny patch: 39_fix_local_install.
unblock bins/1.1.29-16
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-3-amd64 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diffstat for bins-1.1.29 bins-1.1.29
changelog | 12 ++++++++++++
patches/39_fix_local_install | 26 ++++++++++++++++++++++++++
patches/series | 2 +-
3 files changed, 39 insertions(+), 1 deletion(-)
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-21 17:14:53.000000000 -0400
@@ -1,3 +1,15 @@
+bins (1.1.29-16) unstable; urgency=low
+
+ [ David Prévot ]
+ * debian/patches/39_fix_local_install Fix /usr/local… path (Closes: #684412)
+ * remove debian/patches/37_bins_thumbnails
+ Drop the #196310 fix that breaks subdirectories (Closes: #684415)
+
+ [ Ludovic Rousseau ]
+ * ACK NMU by David Prévot
+
+ -- Ludovic Rousseau <rousseau@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/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-21 17:02:03.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 <taffit@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-21 17:12:03.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
Reply to: