From rousseau at alioth.debian.org  Tue Aug 21 21:11:42 2012
From: rousseau at alioth.debian.org (Ludovic Rousseau)
Date: Tue, 21 Aug 2012 21:11:42 +0000
Subject: r165 - in trunk/debian: . patches
Message-ID: <E1T3vji-0003jS-GI@vasks.debian.org>

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



From rousseau at alioth.debian.org  Tue Aug 21 21:15:26 2012
From: rousseau at alioth.debian.org (Ludovic Rousseau)
Date: Tue, 21 Aug 2012 21:15:26 +0000
Subject: r166 - in trunk/debian: . patches
Message-ID: <E1T3vnK-0003qq-LY@vasks.debian.org>

Author: rousseau
Date: 2012-08-21 21:15:26 +0000 (Tue, 21 Aug 2012)
New Revision: 166

Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
remove debian/patches/37_bins_thumbnails
Drop the #196310 fix that breaks subdirectories (Closes: #684415)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2012-08-21 21:11:41 UTC (rev 165)
+++ trunk/debian/changelog	2012-08-21 21:15:26 UTC (rev 166)
@@ -2,11 +2,13 @@
 
   [ 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
 
- -- David Pr?vot <taffit at debian.org>  Thu, 16 Aug 2012 19:28:34 -0400
+ -- Ludovic Rousseau <rousseau at debian.org>  Thu, 16 Aug 2012 19:28:34 -0400
 
 bins (1.1.29-15) unstable; urgency=low
 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2012-08-21 21:11:41 UTC (rev 165)
+++ trunk/debian/patches/series	2012-08-21 21:15:26 UTC (rev 166)
@@ -21,6 +21,5 @@
 34_bins.1
 35_bins_jpeg
 36_bins_linksize
-37_bins_thumbnails
 38_bins_search
 39_fix_local_install



From rousseau at alioth.debian.org  Tue Aug 21 21:43:48 2012
From: rousseau at alioth.debian.org (Ludovic Rousseau)
Date: Tue, 21 Aug 2012 21:43:48 +0000
Subject: r167 - in tags: . 1.1.29-16/debian 1.1.29-16/debian/patches
Message-ID: <E1T3wEm-0004nK-C8@vasks.debian.org>

Author: rousseau
Date: 2012-08-21 21:43:48 +0000 (Tue, 21 Aug 2012)
New Revision: 167

Added:
   tags/1.1.29-16/
   tags/1.1.29-16/debian/changelog
   tags/1.1.29-16/debian/patches/39_fix_local_install
   tags/1.1.29-16/debian/patches/series
Removed:
   tags/1.1.29-16/debian/changelog
   tags/1.1.29-16/debian/patches/series
Log:
[svn-buildpackage] Tagging bins 1.1.29-16

Deleted: tags/1.1.29-16/debian/changelog
===================================================================
--- trunk/debian/changelog	2012-06-22 21:42:34 UTC (rev 164)
+++ tags/1.1.29-16/debian/changelog	2012-08-21 21:43:48 UTC (rev 167)
@@ -1,602 +0,0 @@
-bins (1.1.29-15) unstable; urgency=low
-
-  * Fix "include size of linked movie file in thumb*.html and imagelist.html"
-    (Closes: #402458)
-  * Fix "thumbnails in independent directory" (Closes: #196310)
-  * Fix "doesn't find search.js when using non default template"
-    (Closes: #411149)
-
- -- Boro Sitnikovski <buritomath at yahoo.com>  Mon, 18 Jun 2012 19:02:08 +0200
-
-bins (1.1.29-14) unstable; urgency=low
-
-  * Fix "Original .png files result in .jpg files but containing PNG
-    data" convert any input file format as "JPEG" output (Closes: #235272)
-  * Fix lintian warning:
-    W: bins source: debian-rules-missing-recommended-target build-arch
-  * debian/control: Standards-Version: 3.8.3 -> 3.9.3. No change needed
-  * debian/rules: dh_clean -k is deprecated; use dh_prep instead
-  * patch bins.1 directly instead of patching bins.sgml and generating a
-    bins.1 manpage. debian/rules do not "patch" any file now, only quilt does
-    that.
-
- -- Ludovic Rousseau <rousseau at debian.org>  Sat, 09 Jun 2012 17:37:19 +0200
-
-bins (1.1.29-13) unstable; urgency=low
-
-  * debian/control: add Depends: ${misc:Depends}
-    W: bins source: debhelper-but-no-misc-depends bins
-  * move to source package format version "3.0 (quilt)"
-  * debian/control: Standards-Version: 3.7.3 -> 3.8.3. No change needed
-  * debian/patches/*: convert to DEP-3 "Patch Tagging Guidelines"
-  * debian/patches/34_bins.1: spelling-error-in-manpage
-    usr/share/man/man1/bins.1.gz
-
- -- Ludovic Rousseau <rousseau at debian.org>  Sun, 03 Jan 2010 15:13:31 +0100
-
-bins (1.1.29-12) unstable; urgency=low
-
-  * move from dpatch to quilt to manage Debian patches
-  * debian/patches/23_bashism: Closes: #489542 "bins: bashism in /bin/sh
-    script"
-
- -- Ludovic Rousseau <rousseau at debian.org>  Wed, 06 Aug 2008 21:30:47 +0200
-
-bins (1.1.29-11) unstable; urgency=low
-
-  * debian/patches/22_bins-hash-ref.dpatch: Crashes mid-album
-    (Closes: #481662)
-
- -- Ludovic Rousseau <rousseau at debian.org>  Thu, 22 May 2008 21:05:41 +0200
-
-bins (1.1.29-10) unstable; urgency=low
-
-  * debian/control:
-   - use the Homepage: field
-   - add Vcs-Svn: and Vcs-Browser: fields
-   - Standards-Version: 3.7.2 -> 3.7.3. no change needed
-  * do not package bins-edit-gui since it depends on Gtk+ 1.x and this is no
-    more available in Debian. Closes: #471949: "bins-edit-gui asks to install
-    non-existing package"
-  * debian/rules: use binary-indep: instead of binary-arch: target to avoid a
-    binary-arch-rules-but-pkg-is-arch-indep lintian warning
-  * debian/patches/21_bins-trim.dpatch: add -trim argument to jpegtran.
-    Closes: #284157: "bins: avoidable jpegtran image corruption"
-
- -- Ludovic Rousseau <rousseau at debian.org>  Fri, 21 Mar 2008 17:52:15 +0100
-
-bins (1.1.29-9) unstable; urgency=low
-
-  * debian/patches/{18_bins-memory-leak,19_bins-insert-directory,
-    20_bins-syscall}.dpatch: Closes: #395098 "Bins is very slow, eats memory
-    and makes unnecessary system calls"
-
- -- Ludovic Rousseau <rousseau at debian.org>  Sun, 12 Aug 2007 18:23:53 +0200
-
-bins (1.1.29-8) unstable; urgency=low
-
-  * debian/patches/17_bins.dpatch: use localtime instead of gmtime
-    Closes: #431432
-
- -- Ludovic Rousseau <rousseau at debian.org>  Wed, 04 Jul 2007 22:26:01 +0200
-
-bins (1.1.29-7) unstable; urgency=low
-
-  [ Martin Michlmayr ]
-  * debian/copyright: Mention license and copyright of the Debian
-    packaging.
-  * debian/control (Build-Depends-Indep): Move dpatch from here...
-  * debian/control (Build-Depends): ... to here.  Thanks, Pierre Habouzit.
-
-  [ Ludovic Rousseau ]
-  * debian/patches/14_bins-edit-gui.dpatch: Closes: #386423 "bins: Can't
-    locate Gtk/GladeXML.pm"
-  * debian/patches/15_example_css.dpatch: Closes: #392439 "bins/index.html:
-    blue characters upon a blue background"
-  * debian/patches/16_examples_html.dpatch: correct a broken link (use the
-    image from http://bins.sautret.org/ instead of a local copy)
-
- -- Ludovic Rousseau <rousseau at debian.org>  Tue, 21 Nov 2006 22:22:10 +0100
-
-bins (1.1.29-6) unstable; urgency=low
-
-  [ Martin Michlmayr ]
-  * debian/patches/13_locale_encoding.dpatch: Remove stray "print" from
-    the copyright statement that is printed when the program is called.
-    Closes: #350074.
-
- -- Martin Michlmayr <tbm at cyrius.com>  Fri, 27 Jan 2006 13:15:02 +0000
-
-bins (1.1.29-5) unstable; urgency=medium
-
-  [ Martin Michlmayr ]
-  * debian/patches/13_locale_encoding.dpatch: Replace the patch with one
-    from upstream.  The previous one led to broken HTML generation.
-    Closes: #349945.
-  * debian/watch: Fix URL and upgrade to version 3.
-  * debian/compat: Switch to debhelper compat mode 5.
-  * debian/control (Build-Depends): Depend on new debhelper.
-
- -- Martin Michlmayr <tbm at cyrius.com>  Thu, 26 Jan 2006 16:14:39 +0000
-
-bins (1.1.29-4) unstable; urgency=low
-
-  [ Martin Michlmayr ]
-  * debian/README.Debian: Remove the paragraph about the situation of
-    bins-edit-gui and "Suggests" since the packages have been upgraded
-    to "Recommends" in 1.1.29-3.
-  * debian/patches/09_fix_wrong_relpath.dpatch: Don't produce broken
-    links with linkRelative when the source and target directories start
-    with the same letter.  Closes: #334088.
-  * debian/patches/10_symlinks_movies.dpatch: Support linkInsteadOfCopy
-    for movie files.  Closes: #334064.
-  * debian/patches/11_check_template_style.dpatch: Check if the specified
-    template style exists before processing images.  Closes: #308114.
-  * debian/patches/12_optional_xml_elements.dpatch: Make XML elements
-    optional and check whether the XML files are valid bins files.
-    Closes: #308338.
-  * debian/patches/13_locale_encoding.dpatch: Don't simply output Latin-1
-    text but convert it to the locale; thanks to Don Armstrong for the
-    patch.  Closes: #308111.
-  * debian/copyright: Convert to UTF-8.
-  * debian/copyright: Various updates.
-
- -- Martin Michlmayr <tbm at cyrius.com>  Sun, 06 Nov 2005 13:36:24 +0000
-
-bins (1.1.29-3) unstable; urgency=low
-
-  [ Ludovic Rousseau ]
-  * debian/control: Standards-Version: 3.6.1 -> 3.6.2: no changes
-  * debian/patches/08_fix_bins-edit-gui_encoding.dpatch:
-    Closes: #322938 "bins-edit-gui mishandles locale settings"
-    Closes: #334052 "without LC_ALL=C, bins-edit-gui fails"
-  * debian/control: change Suggests in Recommends so that aptitude users will
-    have bins-edit-gui working by default.  Closes: #333937 "libgladexml-perl
-    is only suggests, so bins-edit-gui fails"
-
- -- Ludovic Rousseau <rousseau at debian.org>  Sat, 15 Oct 2005 16:49:25 +0200
-
-bins (1.1.29-2) unstable; urgency=high
-
-  [ Martin Michlmayr ]
-  * debian/patches/07_fix_share.dpatch: Don't prepend DESTDIR when
-    replacing paths in the binaries.
-  * debian/patches/00list: Add.
-
- -- Martin Michlmayr <tbm at cyrius.com>  Mon, 12 Sep 2005 17:39:37 +0100
-
-bins (1.1.29-1) unstable; urgency=low
-
-  [ Martin Michlmayr ]
-  * New upstream release.
-    + Adds a search engine.
-    + New templates "mwolson" and "martin".
-    + Default template renamed to "swigs".
-    + javaScriptPreloadImage preloads the right image now.  Closes: #323631.
-    + Add a directory with various tools.
-  * debian/control (Depends): Add libtext-unaccent-perl (required by
-    the search engine).
-  * debian/patches/05_install.sh.dpatch: Remove, applied upstream.
-  * debian/patches/08_bins.dpatch: Likewise.
-  * debian/patches/10_bins.dpatch: Likewise.
-  * debian/patches/11_bins.dpatch: Likewise.
-  * debian/patches/12_codeset_warning.dpatch: Likewise.
-  * debian/patches/00list: Remove above patches.
-  * debian/rules (install): Install tools in an example directory.
-  * debian/rules (install): Manually install bins_cleanupgallery since
-    this is no longer done by upstream.
-  * debian/patches/05_share-man.dpatch: Install man pages in the correct
-    directory.
-  * debian/patches/00list: List this patch.
-
- -- Martin Michlmayr <tbm at cyrius.com>  Thu, 25 Aug 2005 19:45:44 +0100
-
-bins (1.1.28-1) unstable; urgency=low
-
-  [ Martin Michlmayr ]
-  * New upstream release.
-    + Replaces parameter "enlarge" with "whenSrcSmaller".
-    + Adds support for customized date strings via the dateString
-      option.  Closes: #308317.
-    + Adds Catalan translation.  Closes: #317731.
-    + Fixes two typos in the German translation.  Closes: #313675.
-    + Lists all template styles in the man page.  Closes: #308115.
-  * debian/control (Depends): Add libtimedate-perl required by the
-    new dateString option.
-  * debian/patches/08_bins.dpatch: Update patch to reflect whitespace
-    changes in the new upstream version.
-  * debian/patches/10_bins.dpatch: Likewise.
-  * debian/patches/11_bins.dpatch: Likewise.
-  * debian/control (Uploaders): Add myself.
-  * debian/control (Depends, Suggests): Downgrade GLADE/GTK+ related
-    packages to Suggests since they are only required by bins-edit-gui,
-    a minor component of this package.  Closes: #251306.
-  * debian/README.Debian: Add a paragraph about the situation of
-    bins-edit-gui.
-  * debian/patches/12_codeset_warning.dpatch: Surpress warnings when
-    the locale name is not numeric.
-  * debian/patches/00list: Add patch.
-
- -- Martin Michlmayr <tbm at cyrius.com>  Fri, 05 Aug 2005 01:16:58 +0100
-
-bins (1.1.27-2) unstable; urgency=low
-
-  * debian/patches/11_bins.dpatch: Closes: #295716 "bins: consider path/a-b to
-    a subdir of path/a". This should also really close bug #271150
-
- -- Ludovic Rousseau <rousseau at debian.org>  Fri, 18 Feb 2005 11:05:23 +0100
-
-bins (1.1.27-1) unstable; urgency=low
-
-  * New upstream version
-   - Closes: #273401 "problem with expanding FIELD_TIP in templates"
-  * debian/patches/10_bins.dpatch: Closes: #287768 "support the use of
-    libjpeg-mmx-progs"
-
- -- Ludovic Rousseau <rousseau at debian.org>  Sun,  2 Jan 2005 22:18:08 +0100
-
-bins (1.1.26-6) unstable; urgency=low
-
-  * 07_bins.dpatch: update the patch to correct the bug "considers
-    "path/to/a-gallery" a subdir of "path/to/a"". Closes: #271150
-  * 09_bins.dpatch: correct bug "perl warnings with -e custum and subalbums".
-    Closes: #269511. Thanks to Adam Lackorzynski for the patch
-
- -- Ludovic Rousseau <rousseau at debian.org>  Sun, 12 Sep 2004 15:52:30 +0200
-
-bins (1.1.26-5) unstable; urgency=high
-
-  * 08_bins.dpatch: patch for "-f option ignored". Closes: #267757
-  * urgency=high since we want 1.1.26-4 (released yesterday) in sarge
-
- -- Ludovic Rousseau <rousseau at debian.org>  Sat, 28 Aug 2004 12:51:52 +0200
-
-bins (1.1.26-4) unstable; urgency=high
-
-  * 07_bins.dpatch: my previous patch was too simple and wrong
-  * urgency=high since the previous Debian version is a regression compared to
-    upstream and should not be released with sarge.
-
- -- Ludovic Rousseau <rousseau at debian.org>  Fri, 27 Aug 2004 21:44:03 +0200
-
-bins (1.1.26-3) unstable; urgency=low
-
-  * 07_bins.dpatch: exit if target_dir is in source_dir since it will generate
-    an infinite recursion. Closes: #239250
-  * debian/rules: backup and restore doc/bins.1 and doc/bins-edit-gui.1 since
-    they are modified by the build process (avoid having the patch in the
-    .diff.gz file)
-
- -- Ludovic Rousseau <rousseau at debian.org>  Sat, 14 Aug 2004 00:10:57 +0200
-
-bins (1.1.26-2) unstable; urgency=medium
-
-  * 05_install.sh.dpatch: install share files in the correct directory
-    Closes: #263709
-  * urgency medium since it was an RC bug
-
- -- Ludovic Rousseau <rousseau at debian.org>  Thu,  5 Aug 2004 20:34:36 +0200
-
-bins (1.1.26-1) unstable; urgency=low
-
-  * New upstream release
-   - Closes: #230627 "New upstream 1.1.26 available"
-   - Closes: #189128 "linkInsteadOfCopy and rotateImages fails to work as
-   - Closes: #223727 ""joi" template in wrong directory"
-   advertised"
-   - Closes: #249473 "error creating the <next> <previous> link in the
-   picture's page"
-   - Closes: #195611 "Files in /etc/bins should be in /usr/share/bins/"
-   - Closes: #192175 "Errors in /etc/bins/"
-   - Closes: #230094 "incorrect encoding for " sec." in Russian"
-   - Closes: #185037 "Installation of a default binsrc"
-   - Closes: #185052 "Nautilus script"
-   - Closes: #189215 "new config item: updateOriginalPerms (avoid chmod
-   issues)"
-  * New Debian maintainer
-  * use dpatch to manage Debian specific patches
-  * debian/control: Standards-Version: 3.5.2 -> 3.6.1
-   - always use -g CFLAGS argument
-   - use -O0 instead of -O2 if DEB_BUILD_OPTIONS contains noopt
-   - use Build-Depends-Indep:
-  * install bins_cleanupgallery. Closes: #189244
-  * install HTML documentation. Closes: #165269
-  * debian/patches/06_doc_bins.sgml.dpatch: correct doc/bins.sgml manpage
-    Closes: #203978
-  * remove dependency on libstorable-perl. Closes: #159189
-
- -- Ludovic Rousseau <rousseau at debian.org>  Sat, 31 Jul 2004 22:37:38 +0200
-
-bins (1.1.21-1.1) unstable; urgency=low
-
-  * NMU 
-  * Fixed error in debian/rules to put templates in their correct places to be
-    found (Closes: #192175) 
-  * Templates are now installed in their correct location /usr/share (Closes: #195611)
-  * Sponsored by aigarius at debian.org at Debcamp, uploaded to 4 days delayed 
-
- -- Kai Hendry <hendry at cs.helsinki.fi>  Tue, 15 Jul 2003 17:24:55 +0100
-
-bins (1.1.21-1) unstable; urgency=low
-
-  * New upstream release, and lots of patch application
-  * bins (BEGIN): handle quoting better (Closes: #188846)
-  * debian/rules (install): afs deletion artifacts came from running 1.2.5
-    modules, a quick check goes in until I upgrade (Closes: #180913)
-  * binsrc: fix typo (Closes: #185039)
-  * debian/rules (install): install templates.joi (Closes: #183489)
-  * bins (postProcessArgs): allow reverseOrder to be configurable (Closes: #188868)
-
- -- Mark W. Eichin <eichin at thok.org>  Sun, 13 Apr 2003 19:42:06 -0400
-
-bins (1.1.20-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Mark W. Eichin <eichin at thok.org>  Sat, 11 Jan 2003 00:33:48 -0500
-
-bins (1.1.16-1) unstable; urgency=low
-
-  * New upstream release.  Upstream changes:
-  * There is a new template style (joi) which uses icons, CSS, and
-    Javascript.
-  * A new parameter (homeURL) has been added to link your home page to the
-    Leave button of the new templates. 
-  * A newjavaScriptPreloadImage parameter can now be used to add some
-    Javascript code in image pages to preload the next image of the same
-    size when the current one is loaded, which speeds up album browsing.
-  * A Russian translation was added.
-  
- -- Mark W. Eichin <eichin at thok.org>  Mon,  2 Sep 2002 19:31:18 -0400
-
-bins (1.1.15-1) unstable; urgency=low
-
-  * New upstream release.  Upstream changes:
-  * A new parameter linkInsteadOfCopy has been added to create a link to
-    the image in the destination directory instead of copying it, when
-    possible.
-  * A bug that crashed bins with Perl 5.8.0 has been corrected.
-  * Movie files are now linked in albums. (doesn't close #147603 because
-    it doesn't work with include_images.txt, and isn't clever enough to
-    lookaside to the .thm file)
-  * The scale method can now be chosen with the new scaleMethod parameter.
-  * Rotation can now be skipped on some files with the new noRotation
-    parameter.
-  * A bad behavior that occurred when scaled sizes uses mixed pixels and
-    percentages has been corrected.
-  * jpegtran can now be used with image names containing spaces. Some
-    other corrections have been made.
-
- -- Mark W. Eichin <eichin at thok.org>  Mon, 26 Aug 2002 12:32:10 -0400
-
-bins (1.1.14-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Mark W. Eichin <eichin at thok.org>  Mon, 12 Aug 2002 12:05:57 -0400
-
-bins (1.1.13-1) unstable; urgency=low
-
-  * New upstream release
-  * debian/watch: new file. (get lazy.)
-  * debian/dirs, debian/rules: install example binsrc (Closes: #153937)
-  * debian/control: add libhtml-clean-perl.
-
- -- Mark W. Eichin <eichin at thok.org>  Fri,  9 Aug 2002 00:05:10 -0400
-
-bins (1.1.10-1) unstable; urgency=low
-
-  * New upstream version.
-  * Sneak in bins-edit-gui 0.9.
-
- -- Mark W. Eichin <eichin at thok.org>  Tue, 11 Jun 2002 05:33:44 -0400
-
-bins (1.1.9-3) unstable; urgency=low
-
-  * Sneak in bins-edit-gui 0.8, as it fixes a server-side memory leak.
-
- -- Mark W. Eichin <eichin at thok.org>  Fri,  7 Jun 2002 04:35:11 -0400
-
-bins (1.1.9-2) unstable; urgency=low
-
-  * Sneak in bins-edit-gui 0.7.
-
- -- Mark W. Eichin <eichin at thok.org>  Fri,  7 Jun 2002 04:34:16 -0400
-
-bins (1.1.9-1) unstable; urgency=low
-
-  * New upstream version.
-
- -- Mark W. Eichin <eichin at thok.org>  Wed,  5 Jun 2002 05:55:31 -0400
-
-bins (1.1.8-2) unstable; urgency=low
-
-  * bins: fix -v handling.
-  * bins (chooseSampleImage): abuse thumblink so that non-local images
-    work.
-  * debian/control (Depends): add libglade-gnome0.  pbuilder wins again.
-    (Closes: #147926)
-
- -- Mark W. Eichin <eichin at thok.org>  Tue,  4 Jun 2002 17:48:00 -0400
-
-bins (1.1.8-1) unstable; urgency=low
-
-  * New upstream version.
-  * Sneak in bins-edit-gui 0.7.
-
- -- Mark W. Eichin <eichin at thok.org>  Thu, 30 May 2002 04:44:17 -0400
-
-bins (1.1.7-6) unstable; urgency=low
-
-  * debian/control: added gettext build-depend. (go go gadget pdebuild!)
-
- -- Mark W. Eichin <eichin at thok.org>  Sun, 26 May 2002 22:42:47 -0400
-
-bins (1.1.7-5) unstable; urgency=low
-
-  * doc/bins.sgml: update for new arguments (-i, -e, -s); add
-    documentation for *all* binsrc tags and *all* user files that bins
-    uses in the construction of an album.
-  * bins: add explicit chmod to handle rotation of copied read-only
-    images.
-  * bins-edit-gui: 'locale_h' hack that makes other distributions happy.
-  
- -- Mark W. Eichin <eichin at thok.org>  Sun, 26 May 2002 02:36:07 -0400
-
-bins (1.1.7-4) unstable; urgency=low
-
-  * Sneak in bins-edit-gui 0.6.
-  * delete upstream gui-*.mo, and regenerate (makes slipstreaming easier.)
-
- -- Mark W. Eichin <eichin at thok.org>  Wed, 22 May 2002 03:50:52 -0400
-
-bins (1.1.7-3) unstable; urgency=low
-
-  * debian/*.sgml: elide in favor of the versions in doc/.
-  * debian/rules: build manpages from doc/ version.
-
- -- Mark W. Eichin <eichin at thok.org>  Wed, 22 May 2002 03:35:49 -0400
-
-bins (1.1.7-2) unstable; urgency=low
-
-  * debian/control: now uses HTML::Template as well.
-
- -- Mark W. Eichin <eichin at thok.org>  Mon, 20 May 2002 03:57:10 -0400
-
-bins (1.1.7-1) unstable; urgency=low
-
-  * New upstream version.  Includes gui 0.5 (with i18n support.)
-  * debian/rules: use ??.mo names to guess languages.  Install gui i18n
-    files.
-
- -- Mark W. Eichin <eichin at thok.org>  Fri, 17 May 2002 01:08:14 -0400
-
-bins (1.1.6-1) unstable; urgency=low
-
-  * New upstream version.  Includes gui 0.4.
-
- -- Mark W. Eichin <eichin at thok.org>  Tue, 14 May 2002 00:05:46 -0400
-
-bins (1.1.5-6) unstable; urgency=low
-
-  * debian/rules (LFILES, install): install .mo files in the right place,
-    don't copy intl subdir.
-
- -- Mark W. Eichin <eichin at thok.org>  Mon, 13 May 2002 18:12:27 -0400
-
-bins (1.1.5-5) unstable; urgency=low
-
-  * debian/copyright: fix spelling error (and remember to run lintian more
-    often :)
-  * bins-edit-gui, bins-edit-gui.glade, debian/bins-edit-gui.sgml: update
-    from bins-edit-gui 0.4 release.
-
- -- Mark W. Eichin <eichin at thok.org>  Sun, 12 May 2002 00:44:42 -0400
-
-bins (1.1.5-4) unstable; urgency=low
-
-  * debian/control: Thanks to Ardo van Rangelrooij for pointing out that
-    libxml-enno-perl is obsolete, and really is replaced by the individual
-    components. (Closes: #146640) for real this time.
-
- -- Mark W. Eichin <eichin at thok.org>  Sat, 11 May 2002 16:42:00 -0400
-
-bins (1.1.5-3) unstable; urgency=low
-
-  * bins-edit-gui, bins-edit-gui.glade, debian/bins-edit-gui.sgml: update
-    from bins-edit-gui 0.3 release.
-  * debian/copyright: note secondary upstream.
-  * debian/rules: add libxml-enno-perl (for XML::DOM, XML::XQL) which my
-    scary dlocate script did find, but I mistakenly thought was already
-    brought in by something else. (Closes: #146640) 
-    add libxml-writer-perl (same excuse.)
-
- -- Mark W. Eichin <eichin at thok.org>  Sat, 11 May 2002 12:18:53 -0400
-
-bins (1.1.5-2) unstable; urgency=low
-
-  * debian/control: add missing deps for bins-edit-gui, and mention it in
-    control message.
-  * bins-edit-gui (load_image): fix massive memory leak (fixed upstream.)
-
- -- Mark W. Eichin <eichin at thok.org>  Thu,  9 May 2002 15:44:56 -0400
-
-bins (1.1.5-1) unstable; urgency=low
-
-  * New upstream release.  All local cosmetic fixes have been integrated
-    upstream.
-  * debian/rules (install): patch locale paths in-place, to avoid
-    outstanding diff content.
-    (build-stamp, clean, binary-arch): handle bins-edit-gui man page.
-  * debian/dirs, debian/rules: install new bins-edit-gui and make the
-    .glade file available.
-  * debian/copyright: note new bins-edit-gui (different author)
-  * debian/bins-edit-gui.sgml: new file, simple refentry manpage.
-  * bins-edit-gui: put in stubs for unimplemented functions, developer
-    fallback for glade source (all upstream already.) Fix a spurious
-    focus-related debugging message.
-
- -- Mark W. Eichin <eichin at thok.org>  Thu,  9 May 2002 15:03:45 -0400
-
-bins (1.1.4-2) unstable; urgency=low
-
-  * bins: fix typo patching $localePath.
-
- -- Mark W. Eichin <eichin at thok.org>  Tue,  7 May 2002 01:14:26 -0400
-
-bins (1.1.4-1) unstable; urgency=low
-
-  * New upstream release.  (Closes: #144836)
-  * debian/control: punctuation fixes, from Meinolf Sander. (Closes: #144992)
-
- -- Mark W. Eichin <eichin at thok.org>  Tue, 30 Apr 2002 23:57:55 -0400
-
-bins (1.1.3-2) unstable; urgency=low
-
-  * debian/control: add missing depends on libstorable-perl. 
-    (Closes: #144844)
-
- -- Mark W. Eichin <eichin at thok.org>  Sun, 28 Apr 2002 12:00:12 -0400
-
-bins (1.1.3-1) unstable; urgency=low
-
-  * New upstream release.  Includes patches from Rene Weber 
-    (Closes: #144433, #144436, #144437, #144438)
-  * debian/rules, debian/dirs: /etc/bins/templates.default instead of
-    /etc/bins, to allow --style option.
-
- -- Mark W. Eichin <eichin at thok.org>  Sat, 27 Apr 2002 10:20:48 -0400
-
-bins (1.1.2-1) unstable; urgency=low
-
-  * New upstream release.  (not actually released, to avoid /etc/bins
-    -> /etc/bins/templates.default renaming issue)
-  * bins, debian/bins.sgml: fix wording of -p description.
-  * bins, debian/rules, debian/bins.sgml, debian/dirs: move from
-    /usr/share/bins to /etc/bins (upstream change, allows site-wide
-    customization of templates.) Also falls back per-file instead of whole
-    directory.
-
- -- Mark W. Eichin <eichin at thok.org>  Thu, 25 Apr 2002 21:54:39 -0400
-
-bins (1.1.1-2) unstable; urgency=low
-
-  * debian/rules (install): oops, no need for second copy of bins_edit.
-    (binary-arch): tell it where the man pages are, it isn't quite that
-    magic.
-
- -- Mark W. Eichin <eichin at thok.org>  Tue, 23 Apr 2002 03:02:07 -0400
-
-bins (1.1.1-1) unstable; urgency=low
-
-  * Initial Release.
-  * bins, intl/messages.po: fix some typos (already reported upstream.)
-  * bins: change localePath to real one.
-  * bins: set up /usr/share/bins/template as fallback; fail if -t arg
-    missing.  Document in -h.
-  * debian/bins.sgml: new file, simple manpage.
-  * debian/bins_edit.sgml: new file, simple manpage.
-  * bins_edit: fix typo in -h output.
-
- -- Mark W. Eichin <eichin at thok.org>  Tue, 23 Apr 2002 01:15:54 -0400
-

Copied: tags/1.1.29-16/debian/changelog (from rev 166, trunk/debian/changelog)
===================================================================
--- tags/1.1.29-16/debian/changelog	                        (rev 0)
+++ tags/1.1.29-16/debian/changelog	2012-08-21 21:43:48 UTC (rev 167)
@@ -0,0 +1,614 @@
+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 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"
+    (Closes: #402458)
+  * Fix "thumbnails in independent directory" (Closes: #196310)
+  * Fix "doesn't find search.js when using non default template"
+    (Closes: #411149)
+
+ -- Boro Sitnikovski <buritomath at yahoo.com>  Mon, 18 Jun 2012 19:02:08 +0200
+
+bins (1.1.29-14) unstable; urgency=low
+
+  * Fix "Original .png files result in .jpg files but containing PNG
+    data" convert any input file format as "JPEG" output (Closes: #235272)
+  * Fix lintian warning:
+    W: bins source: debian-rules-missing-recommended-target build-arch
+  * debian/control: Standards-Version: 3.8.3 -> 3.9.3. No change needed
+  * debian/rules: dh_clean -k is deprecated; use dh_prep instead
+  * patch bins.1 directly instead of patching bins.sgml and generating a
+    bins.1 manpage. debian/rules do not "patch" any file now, only quilt does
+    that.
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Sat, 09 Jun 2012 17:37:19 +0200
+
+bins (1.1.29-13) unstable; urgency=low
+
+  * debian/control: add Depends: ${misc:Depends}
+    W: bins source: debhelper-but-no-misc-depends bins
+  * move to source package format version "3.0 (quilt)"
+  * debian/control: Standards-Version: 3.7.3 -> 3.8.3. No change needed
+  * debian/patches/*: convert to DEP-3 "Patch Tagging Guidelines"
+  * debian/patches/34_bins.1: spelling-error-in-manpage
+    usr/share/man/man1/bins.1.gz
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Sun, 03 Jan 2010 15:13:31 +0100
+
+bins (1.1.29-12) unstable; urgency=low
+
+  * move from dpatch to quilt to manage Debian patches
+  * debian/patches/23_bashism: Closes: #489542 "bins: bashism in /bin/sh
+    script"
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Wed, 06 Aug 2008 21:30:47 +0200
+
+bins (1.1.29-11) unstable; urgency=low
+
+  * debian/patches/22_bins-hash-ref.dpatch: Crashes mid-album
+    (Closes: #481662)
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Thu, 22 May 2008 21:05:41 +0200
+
+bins (1.1.29-10) unstable; urgency=low
+
+  * debian/control:
+   - use the Homepage: field
+   - add Vcs-Svn: and Vcs-Browser: fields
+   - Standards-Version: 3.7.2 -> 3.7.3. no change needed
+  * do not package bins-edit-gui since it depends on Gtk+ 1.x and this is no
+    more available in Debian. Closes: #471949: "bins-edit-gui asks to install
+    non-existing package"
+  * debian/rules: use binary-indep: instead of binary-arch: target to avoid a
+    binary-arch-rules-but-pkg-is-arch-indep lintian warning
+  * debian/patches/21_bins-trim.dpatch: add -trim argument to jpegtran.
+    Closes: #284157: "bins: avoidable jpegtran image corruption"
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Fri, 21 Mar 2008 17:52:15 +0100
+
+bins (1.1.29-9) unstable; urgency=low
+
+  * debian/patches/{18_bins-memory-leak,19_bins-insert-directory,
+    20_bins-syscall}.dpatch: Closes: #395098 "Bins is very slow, eats memory
+    and makes unnecessary system calls"
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Sun, 12 Aug 2007 18:23:53 +0200
+
+bins (1.1.29-8) unstable; urgency=low
+
+  * debian/patches/17_bins.dpatch: use localtime instead of gmtime
+    Closes: #431432
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Wed, 04 Jul 2007 22:26:01 +0200
+
+bins (1.1.29-7) unstable; urgency=low
+
+  [ Martin Michlmayr ]
+  * debian/copyright: Mention license and copyright of the Debian
+    packaging.
+  * debian/control (Build-Depends-Indep): Move dpatch from here...
+  * debian/control (Build-Depends): ... to here.  Thanks, Pierre Habouzit.
+
+  [ Ludovic Rousseau ]
+  * debian/patches/14_bins-edit-gui.dpatch: Closes: #386423 "bins: Can't
+    locate Gtk/GladeXML.pm"
+  * debian/patches/15_example_css.dpatch: Closes: #392439 "bins/index.html:
+    blue characters upon a blue background"
+  * debian/patches/16_examples_html.dpatch: correct a broken link (use the
+    image from http://bins.sautret.org/ instead of a local copy)
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Tue, 21 Nov 2006 22:22:10 +0100
+
+bins (1.1.29-6) unstable; urgency=low
+
+  [ Martin Michlmayr ]
+  * debian/patches/13_locale_encoding.dpatch: Remove stray "print" from
+    the copyright statement that is printed when the program is called.
+    Closes: #350074.
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Fri, 27 Jan 2006 13:15:02 +0000
+
+bins (1.1.29-5) unstable; urgency=medium
+
+  [ Martin Michlmayr ]
+  * debian/patches/13_locale_encoding.dpatch: Replace the patch with one
+    from upstream.  The previous one led to broken HTML generation.
+    Closes: #349945.
+  * debian/watch: Fix URL and upgrade to version 3.
+  * debian/compat: Switch to debhelper compat mode 5.
+  * debian/control (Build-Depends): Depend on new debhelper.
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Thu, 26 Jan 2006 16:14:39 +0000
+
+bins (1.1.29-4) unstable; urgency=low
+
+  [ Martin Michlmayr ]
+  * debian/README.Debian: Remove the paragraph about the situation of
+    bins-edit-gui and "Suggests" since the packages have been upgraded
+    to "Recommends" in 1.1.29-3.
+  * debian/patches/09_fix_wrong_relpath.dpatch: Don't produce broken
+    links with linkRelative when the source and target directories start
+    with the same letter.  Closes: #334088.
+  * debian/patches/10_symlinks_movies.dpatch: Support linkInsteadOfCopy
+    for movie files.  Closes: #334064.
+  * debian/patches/11_check_template_style.dpatch: Check if the specified
+    template style exists before processing images.  Closes: #308114.
+  * debian/patches/12_optional_xml_elements.dpatch: Make XML elements
+    optional and check whether the XML files are valid bins files.
+    Closes: #308338.
+  * debian/patches/13_locale_encoding.dpatch: Don't simply output Latin-1
+    text but convert it to the locale; thanks to Don Armstrong for the
+    patch.  Closes: #308111.
+  * debian/copyright: Convert to UTF-8.
+  * debian/copyright: Various updates.
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Sun, 06 Nov 2005 13:36:24 +0000
+
+bins (1.1.29-3) unstable; urgency=low
+
+  [ Ludovic Rousseau ]
+  * debian/control: Standards-Version: 3.6.1 -> 3.6.2: no changes
+  * debian/patches/08_fix_bins-edit-gui_encoding.dpatch:
+    Closes: #322938 "bins-edit-gui mishandles locale settings"
+    Closes: #334052 "without LC_ALL=C, bins-edit-gui fails"
+  * debian/control: change Suggests in Recommends so that aptitude users will
+    have bins-edit-gui working by default.  Closes: #333937 "libgladexml-perl
+    is only suggests, so bins-edit-gui fails"
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Sat, 15 Oct 2005 16:49:25 +0200
+
+bins (1.1.29-2) unstable; urgency=high
+
+  [ Martin Michlmayr ]
+  * debian/patches/07_fix_share.dpatch: Don't prepend DESTDIR when
+    replacing paths in the binaries.
+  * debian/patches/00list: Add.
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Mon, 12 Sep 2005 17:39:37 +0100
+
+bins (1.1.29-1) unstable; urgency=low
+
+  [ Martin Michlmayr ]
+  * New upstream release.
+    + Adds a search engine.
+    + New templates "mwolson" and "martin".
+    + Default template renamed to "swigs".
+    + javaScriptPreloadImage preloads the right image now.  Closes: #323631.
+    + Add a directory with various tools.
+  * debian/control (Depends): Add libtext-unaccent-perl (required by
+    the search engine).
+  * debian/patches/05_install.sh.dpatch: Remove, applied upstream.
+  * debian/patches/08_bins.dpatch: Likewise.
+  * debian/patches/10_bins.dpatch: Likewise.
+  * debian/patches/11_bins.dpatch: Likewise.
+  * debian/patches/12_codeset_warning.dpatch: Likewise.
+  * debian/patches/00list: Remove above patches.
+  * debian/rules (install): Install tools in an example directory.
+  * debian/rules (install): Manually install bins_cleanupgallery since
+    this is no longer done by upstream.
+  * debian/patches/05_share-man.dpatch: Install man pages in the correct
+    directory.
+  * debian/patches/00list: List this patch.
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Thu, 25 Aug 2005 19:45:44 +0100
+
+bins (1.1.28-1) unstable; urgency=low
+
+  [ Martin Michlmayr ]
+  * New upstream release.
+    + Replaces parameter "enlarge" with "whenSrcSmaller".
+    + Adds support for customized date strings via the dateString
+      option.  Closes: #308317.
+    + Adds Catalan translation.  Closes: #317731.
+    + Fixes two typos in the German translation.  Closes: #313675.
+    + Lists all template styles in the man page.  Closes: #308115.
+  * debian/control (Depends): Add libtimedate-perl required by the
+    new dateString option.
+  * debian/patches/08_bins.dpatch: Update patch to reflect whitespace
+    changes in the new upstream version.
+  * debian/patches/10_bins.dpatch: Likewise.
+  * debian/patches/11_bins.dpatch: Likewise.
+  * debian/control (Uploaders): Add myself.
+  * debian/control (Depends, Suggests): Downgrade GLADE/GTK+ related
+    packages to Suggests since they are only required by bins-edit-gui,
+    a minor component of this package.  Closes: #251306.
+  * debian/README.Debian: Add a paragraph about the situation of
+    bins-edit-gui.
+  * debian/patches/12_codeset_warning.dpatch: Surpress warnings when
+    the locale name is not numeric.
+  * debian/patches/00list: Add patch.
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Fri, 05 Aug 2005 01:16:58 +0100
+
+bins (1.1.27-2) unstable; urgency=low
+
+  * debian/patches/11_bins.dpatch: Closes: #295716 "bins: consider path/a-b to
+    a subdir of path/a". This should also really close bug #271150
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Fri, 18 Feb 2005 11:05:23 +0100
+
+bins (1.1.27-1) unstable; urgency=low
+
+  * New upstream version
+   - Closes: #273401 "problem with expanding FIELD_TIP in templates"
+  * debian/patches/10_bins.dpatch: Closes: #287768 "support the use of
+    libjpeg-mmx-progs"
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Sun,  2 Jan 2005 22:18:08 +0100
+
+bins (1.1.26-6) unstable; urgency=low
+
+  * 07_bins.dpatch: update the patch to correct the bug "considers
+    "path/to/a-gallery" a subdir of "path/to/a"". Closes: #271150
+  * 09_bins.dpatch: correct bug "perl warnings with -e custum and subalbums".
+    Closes: #269511. Thanks to Adam Lackorzynski for the patch
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Sun, 12 Sep 2004 15:52:30 +0200
+
+bins (1.1.26-5) unstable; urgency=high
+
+  * 08_bins.dpatch: patch for "-f option ignored". Closes: #267757
+  * urgency=high since we want 1.1.26-4 (released yesterday) in sarge
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Sat, 28 Aug 2004 12:51:52 +0200
+
+bins (1.1.26-4) unstable; urgency=high
+
+  * 07_bins.dpatch: my previous patch was too simple and wrong
+  * urgency=high since the previous Debian version is a regression compared to
+    upstream and should not be released with sarge.
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Fri, 27 Aug 2004 21:44:03 +0200
+
+bins (1.1.26-3) unstable; urgency=low
+
+  * 07_bins.dpatch: exit if target_dir is in source_dir since it will generate
+    an infinite recursion. Closes: #239250
+  * debian/rules: backup and restore doc/bins.1 and doc/bins-edit-gui.1 since
+    they are modified by the build process (avoid having the patch in the
+    .diff.gz file)
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Sat, 14 Aug 2004 00:10:57 +0200
+
+bins (1.1.26-2) unstable; urgency=medium
+
+  * 05_install.sh.dpatch: install share files in the correct directory
+    Closes: #263709
+  * urgency medium since it was an RC bug
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Thu,  5 Aug 2004 20:34:36 +0200
+
+bins (1.1.26-1) unstable; urgency=low
+
+  * New upstream release
+   - Closes: #230627 "New upstream 1.1.26 available"
+   - Closes: #189128 "linkInsteadOfCopy and rotateImages fails to work as
+   - Closes: #223727 ""joi" template in wrong directory"
+   advertised"
+   - Closes: #249473 "error creating the <next> <previous> link in the
+   picture's page"
+   - Closes: #195611 "Files in /etc/bins should be in /usr/share/bins/"
+   - Closes: #192175 "Errors in /etc/bins/"
+   - Closes: #230094 "incorrect encoding for " sec." in Russian"
+   - Closes: #185037 "Installation of a default binsrc"
+   - Closes: #185052 "Nautilus script"
+   - Closes: #189215 "new config item: updateOriginalPerms (avoid chmod
+   issues)"
+  * New Debian maintainer
+  * use dpatch to manage Debian specific patches
+  * debian/control: Standards-Version: 3.5.2 -> 3.6.1
+   - always use -g CFLAGS argument
+   - use -O0 instead of -O2 if DEB_BUILD_OPTIONS contains noopt
+   - use Build-Depends-Indep:
+  * install bins_cleanupgallery. Closes: #189244
+  * install HTML documentation. Closes: #165269
+  * debian/patches/06_doc_bins.sgml.dpatch: correct doc/bins.sgml manpage
+    Closes: #203978
+  * remove dependency on libstorable-perl. Closes: #159189
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Sat, 31 Jul 2004 22:37:38 +0200
+
+bins (1.1.21-1.1) unstable; urgency=low
+
+  * NMU 
+  * Fixed error in debian/rules to put templates in their correct places to be
+    found (Closes: #192175) 
+  * Templates are now installed in their correct location /usr/share (Closes: #195611)
+  * Sponsored by aigarius at debian.org at Debcamp, uploaded to 4 days delayed 
+
+ -- Kai Hendry <hendry at cs.helsinki.fi>  Tue, 15 Jul 2003 17:24:55 +0100
+
+bins (1.1.21-1) unstable; urgency=low
+
+  * New upstream release, and lots of patch application
+  * bins (BEGIN): handle quoting better (Closes: #188846)
+  * debian/rules (install): afs deletion artifacts came from running 1.2.5
+    modules, a quick check goes in until I upgrade (Closes: #180913)
+  * binsrc: fix typo (Closes: #185039)
+  * debian/rules (install): install templates.joi (Closes: #183489)
+  * bins (postProcessArgs): allow reverseOrder to be configurable (Closes: #188868)
+
+ -- Mark W. Eichin <eichin at thok.org>  Sun, 13 Apr 2003 19:42:06 -0400
+
+bins (1.1.20-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Mark W. Eichin <eichin at thok.org>  Sat, 11 Jan 2003 00:33:48 -0500
+
+bins (1.1.16-1) unstable; urgency=low
+
+  * New upstream release.  Upstream changes:
+  * There is a new template style (joi) which uses icons, CSS, and
+    Javascript.
+  * A new parameter (homeURL) has been added to link your home page to the
+    Leave button of the new templates. 
+  * A newjavaScriptPreloadImage parameter can now be used to add some
+    Javascript code in image pages to preload the next image of the same
+    size when the current one is loaded, which speeds up album browsing.
+  * A Russian translation was added.
+  
+ -- Mark W. Eichin <eichin at thok.org>  Mon,  2 Sep 2002 19:31:18 -0400
+
+bins (1.1.15-1) unstable; urgency=low
+
+  * New upstream release.  Upstream changes:
+  * A new parameter linkInsteadOfCopy has been added to create a link to
+    the image in the destination directory instead of copying it, when
+    possible.
+  * A bug that crashed bins with Perl 5.8.0 has been corrected.
+  * Movie files are now linked in albums. (doesn't close #147603 because
+    it doesn't work with include_images.txt, and isn't clever enough to
+    lookaside to the .thm file)
+  * The scale method can now be chosen with the new scaleMethod parameter.
+  * Rotation can now be skipped on some files with the new noRotation
+    parameter.
+  * A bad behavior that occurred when scaled sizes uses mixed pixels and
+    percentages has been corrected.
+  * jpegtran can now be used with image names containing spaces. Some
+    other corrections have been made.
+
+ -- Mark W. Eichin <eichin at thok.org>  Mon, 26 Aug 2002 12:32:10 -0400
+
+bins (1.1.14-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Mark W. Eichin <eichin at thok.org>  Mon, 12 Aug 2002 12:05:57 -0400
+
+bins (1.1.13-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/watch: new file. (get lazy.)
+  * debian/dirs, debian/rules: install example binsrc (Closes: #153937)
+  * debian/control: add libhtml-clean-perl.
+
+ -- Mark W. Eichin <eichin at thok.org>  Fri,  9 Aug 2002 00:05:10 -0400
+
+bins (1.1.10-1) unstable; urgency=low
+
+  * New upstream version.
+  * Sneak in bins-edit-gui 0.9.
+
+ -- Mark W. Eichin <eichin at thok.org>  Tue, 11 Jun 2002 05:33:44 -0400
+
+bins (1.1.9-3) unstable; urgency=low
+
+  * Sneak in bins-edit-gui 0.8, as it fixes a server-side memory leak.
+
+ -- Mark W. Eichin <eichin at thok.org>  Fri,  7 Jun 2002 04:35:11 -0400
+
+bins (1.1.9-2) unstable; urgency=low
+
+  * Sneak in bins-edit-gui 0.7.
+
+ -- Mark W. Eichin <eichin at thok.org>  Fri,  7 Jun 2002 04:34:16 -0400
+
+bins (1.1.9-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Mark W. Eichin <eichin at thok.org>  Wed,  5 Jun 2002 05:55:31 -0400
+
+bins (1.1.8-2) unstable; urgency=low
+
+  * bins: fix -v handling.
+  * bins (chooseSampleImage): abuse thumblink so that non-local images
+    work.
+  * debian/control (Depends): add libglade-gnome0.  pbuilder wins again.
+    (Closes: #147926)
+
+ -- Mark W. Eichin <eichin at thok.org>  Tue,  4 Jun 2002 17:48:00 -0400
+
+bins (1.1.8-1) unstable; urgency=low
+
+  * New upstream version.
+  * Sneak in bins-edit-gui 0.7.
+
+ -- Mark W. Eichin <eichin at thok.org>  Thu, 30 May 2002 04:44:17 -0400
+
+bins (1.1.7-6) unstable; urgency=low
+
+  * debian/control: added gettext build-depend. (go go gadget pdebuild!)
+
+ -- Mark W. Eichin <eichin at thok.org>  Sun, 26 May 2002 22:42:47 -0400
+
+bins (1.1.7-5) unstable; urgency=low
+
+  * doc/bins.sgml: update for new arguments (-i, -e, -s); add
+    documentation for *all* binsrc tags and *all* user files that bins
+    uses in the construction of an album.
+  * bins: add explicit chmod to handle rotation of copied read-only
+    images.
+  * bins-edit-gui: 'locale_h' hack that makes other distributions happy.
+  
+ -- Mark W. Eichin <eichin at thok.org>  Sun, 26 May 2002 02:36:07 -0400
+
+bins (1.1.7-4) unstable; urgency=low
+
+  * Sneak in bins-edit-gui 0.6.
+  * delete upstream gui-*.mo, and regenerate (makes slipstreaming easier.)
+
+ -- Mark W. Eichin <eichin at thok.org>  Wed, 22 May 2002 03:50:52 -0400
+
+bins (1.1.7-3) unstable; urgency=low
+
+  * debian/*.sgml: elide in favor of the versions in doc/.
+  * debian/rules: build manpages from doc/ version.
+
+ -- Mark W. Eichin <eichin at thok.org>  Wed, 22 May 2002 03:35:49 -0400
+
+bins (1.1.7-2) unstable; urgency=low
+
+  * debian/control: now uses HTML::Template as well.
+
+ -- Mark W. Eichin <eichin at thok.org>  Mon, 20 May 2002 03:57:10 -0400
+
+bins (1.1.7-1) unstable; urgency=low
+
+  * New upstream version.  Includes gui 0.5 (with i18n support.)
+  * debian/rules: use ??.mo names to guess languages.  Install gui i18n
+    files.
+
+ -- Mark W. Eichin <eichin at thok.org>  Fri, 17 May 2002 01:08:14 -0400
+
+bins (1.1.6-1) unstable; urgency=low
+
+  * New upstream version.  Includes gui 0.4.
+
+ -- Mark W. Eichin <eichin at thok.org>  Tue, 14 May 2002 00:05:46 -0400
+
+bins (1.1.5-6) unstable; urgency=low
+
+  * debian/rules (LFILES, install): install .mo files in the right place,
+    don't copy intl subdir.
+
+ -- Mark W. Eichin <eichin at thok.org>  Mon, 13 May 2002 18:12:27 -0400
+
+bins (1.1.5-5) unstable; urgency=low
+
+  * debian/copyright: fix spelling error (and remember to run lintian more
+    often :)
+  * bins-edit-gui, bins-edit-gui.glade, debian/bins-edit-gui.sgml: update
+    from bins-edit-gui 0.4 release.
+
+ -- Mark W. Eichin <eichin at thok.org>  Sun, 12 May 2002 00:44:42 -0400
+
+bins (1.1.5-4) unstable; urgency=low
+
+  * debian/control: Thanks to Ardo van Rangelrooij for pointing out that
+    libxml-enno-perl is obsolete, and really is replaced by the individual
+    components. (Closes: #146640) for real this time.
+
+ -- Mark W. Eichin <eichin at thok.org>  Sat, 11 May 2002 16:42:00 -0400
+
+bins (1.1.5-3) unstable; urgency=low
+
+  * bins-edit-gui, bins-edit-gui.glade, debian/bins-edit-gui.sgml: update
+    from bins-edit-gui 0.3 release.
+  * debian/copyright: note secondary upstream.
+  * debian/rules: add libxml-enno-perl (for XML::DOM, XML::XQL) which my
+    scary dlocate script did find, but I mistakenly thought was already
+    brought in by something else. (Closes: #146640) 
+    add libxml-writer-perl (same excuse.)
+
+ -- Mark W. Eichin <eichin at thok.org>  Sat, 11 May 2002 12:18:53 -0400
+
+bins (1.1.5-2) unstable; urgency=low
+
+  * debian/control: add missing deps for bins-edit-gui, and mention it in
+    control message.
+  * bins-edit-gui (load_image): fix massive memory leak (fixed upstream.)
+
+ -- Mark W. Eichin <eichin at thok.org>  Thu,  9 May 2002 15:44:56 -0400
+
+bins (1.1.5-1) unstable; urgency=low
+
+  * New upstream release.  All local cosmetic fixes have been integrated
+    upstream.
+  * debian/rules (install): patch locale paths in-place, to avoid
+    outstanding diff content.
+    (build-stamp, clean, binary-arch): handle bins-edit-gui man page.
+  * debian/dirs, debian/rules: install new bins-edit-gui and make the
+    .glade file available.
+  * debian/copyright: note new bins-edit-gui (different author)
+  * debian/bins-edit-gui.sgml: new file, simple refentry manpage.
+  * bins-edit-gui: put in stubs for unimplemented functions, developer
+    fallback for glade source (all upstream already.) Fix a spurious
+    focus-related debugging message.
+
+ -- Mark W. Eichin <eichin at thok.org>  Thu,  9 May 2002 15:03:45 -0400
+
+bins (1.1.4-2) unstable; urgency=low
+
+  * bins: fix typo patching $localePath.
+
+ -- Mark W. Eichin <eichin at thok.org>  Tue,  7 May 2002 01:14:26 -0400
+
+bins (1.1.4-1) unstable; urgency=low
+
+  * New upstream release.  (Closes: #144836)
+  * debian/control: punctuation fixes, from Meinolf Sander. (Closes: #144992)
+
+ -- Mark W. Eichin <eichin at thok.org>  Tue, 30 Apr 2002 23:57:55 -0400
+
+bins (1.1.3-2) unstable; urgency=low
+
+  * debian/control: add missing depends on libstorable-perl. 
+    (Closes: #144844)
+
+ -- Mark W. Eichin <eichin at thok.org>  Sun, 28 Apr 2002 12:00:12 -0400
+
+bins (1.1.3-1) unstable; urgency=low
+
+  * New upstream release.  Includes patches from Rene Weber 
+    (Closes: #144433, #144436, #144437, #144438)
+  * debian/rules, debian/dirs: /etc/bins/templates.default instead of
+    /etc/bins, to allow --style option.
+
+ -- Mark W. Eichin <eichin at thok.org>  Sat, 27 Apr 2002 10:20:48 -0400
+
+bins (1.1.2-1) unstable; urgency=low
+
+  * New upstream release.  (not actually released, to avoid /etc/bins
+    -> /etc/bins/templates.default renaming issue)
+  * bins, debian/bins.sgml: fix wording of -p description.
+  * bins, debian/rules, debian/bins.sgml, debian/dirs: move from
+    /usr/share/bins to /etc/bins (upstream change, allows site-wide
+    customization of templates.) Also falls back per-file instead of whole
+    directory.
+
+ -- Mark W. Eichin <eichin at thok.org>  Thu, 25 Apr 2002 21:54:39 -0400
+
+bins (1.1.1-2) unstable; urgency=low
+
+  * debian/rules (install): oops, no need for second copy of bins_edit.
+    (binary-arch): tell it where the man pages are, it isn't quite that
+    magic.
+
+ -- Mark W. Eichin <eichin at thok.org>  Tue, 23 Apr 2002 03:02:07 -0400
+
+bins (1.1.1-1) unstable; urgency=low
+
+  * Initial Release.
+  * bins, intl/messages.po: fix some typos (already reported upstream.)
+  * bins: change localePath to real one.
+  * bins: set up /usr/share/bins/template as fallback; fail if -t arg
+    missing.  Document in -h.
+  * debian/bins.sgml: new file, simple manpage.
+  * debian/bins_edit.sgml: new file, simple manpage.
+  * bins_edit: fix typo in -h output.
+
+ -- Mark W. Eichin <eichin at thok.org>  Tue, 23 Apr 2002 01:15:54 -0400
+

Copied: tags/1.1.29-16/debian/patches/39_fix_local_install (from rev 165, trunk/debian/patches/39_fix_local_install)
===================================================================
--- tags/1.1.29-16/debian/patches/39_fix_local_install	                        (rev 0)
+++ tags/1.1.29-16/debian/patches/39_fix_local_install	2012-08-21 21:43:48 UTC (rev 167)
@@ -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.
+ 

Deleted: tags/1.1.29-16/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2012-06-22 21:42:34 UTC (rev 164)
+++ tags/1.1.29-16/debian/patches/series	2012-08-21 21:43:48 UTC (rev 167)
@@ -1,25 +0,0 @@
-23_bashism
-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
-34_bins.1
-35_bins_jpeg
-36_bins_linksize
-37_bins_thumbnails
-38_bins_search

Copied: tags/1.1.29-16/debian/patches/series (from rev 166, trunk/debian/patches/series)
===================================================================
--- tags/1.1.29-16/debian/patches/series	                        (rev 0)
+++ tags/1.1.29-16/debian/patches/series	2012-08-21 21:43:48 UTC (rev 167)
@@ -0,0 +1,25 @@
+23_bashism
+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
+34_bins.1
+35_bins_jpeg
+36_bins_linksize
+38_bins_search
+39_fix_local_install