r165 - in trunk/debian: . patches

[Ludovic Rousseau]

Author: rousseau
Date: 2012-08-21 21:11:41 +0000 (Tue, 21 Aug 2012)
New Revision: 165

Added:
   trunk/debian/patches/39_fix_local_install
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
* debian/patches/39_fix_local_install Fix /usr/local?\226?\128?\166 path (Closes: #684412)
* ACK NMU by David Pr?\195?\169vot

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2012-06-22 21:42:34 UTC (rev 164)
+++ trunk/debian/changelog	2012-08-21 21:11:41 UTC (rev 165)
@@ -1,3 +1,13 @@
+bins (1.1.29-16) unstable; urgency=low
+
+  [ David Prévot ]
+  * debian/patches/39_fix_local_install Fix /usr/local… path (Closes: #684412)
+
+  [ Ludovic Rousseau ]
+  * ACK NMU by David Prévot
+
+ -- David Prévot <taffit at 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"

Added: trunk/debian/patches/39_fix_local_install
===================================================================
--- trunk/debian/patches/39_fix_local_install	                        (rev 0)
+++ trunk/debian/patches/39_fix_local_install	2012-08-21 21:11:41 UTC (rev 165)
@@ -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 at 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.
+ 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2012-06-22 21:42:34 UTC (rev 164)
+++ trunk/debian/patches/series	2012-08-21 21:11:41 UTC (rev 165)
@@ -23,3 +23,4 @@
 36_bins_linksize
 37_bins_thumbnails
 38_bins_search
+39_fix_local_install