]> git.donarmstrong.com Git - lilypond.git/log
lilypond.git
6 years agoDebian release 2.19.80-1~exp1 debian-experimental
Dr. Tobias Quathamer [Mon, 16 Oct 2017 15:09:41 +0000 (17:09 +0200)]
Debian release 2.19.80-1~exp1

6 years agoMerge tag 'upstream/2.19.80' into debian-experimental
Dr. Tobias Quathamer [Mon, 16 Oct 2017 15:03:48 +0000 (17:03 +0200)]
Merge tag 'upstream/2.19.80' into debian-experimental

Upstream version 2.19.80

6 years agoNew upstream version 2.19.80 upstream
Dr. Tobias Quathamer [Mon, 16 Oct 2017 15:03:43 +0000 (17:03 +0200)]
New upstream version 2.19.80

6 years agoRegenerate package stanzas
Dr. Tobias Quathamer [Mon, 16 Oct 2017 14:36:38 +0000 (16:36 +0200)]
Regenerate package stanzas

6 years agoRemove unused lintian overrides
Dr. Tobias Quathamer [Wed, 11 Oct 2017 11:08:19 +0000 (13:08 +0200)]
Remove unused lintian overrides

6 years agoRemove some more obsolete package names
Dr. Tobias Quathamer [Fri, 6 Oct 2017 12:38:38 +0000 (14:38 +0200)]
Remove some more obsolete package names

6 years agoRemove Replaces/Breaks for lilypond-doc (<< 2.16.2-1~exp+1).
Dr. Tobias Quathamer [Fri, 6 Oct 2017 12:34:37 +0000 (14:34 +0200)]
Remove Replaces/Breaks for lilypond-doc (<< 2.16.2-1~exp+1).
Even oldstable has 2.18.2-4, so an upgrade should be possible without problems.

6 years agoFix typo in package description
Dr. Tobias Quathamer [Fri, 6 Oct 2017 12:28:27 +0000 (14:28 +0200)]
Fix typo in package description

6 years agoFix typo in d/copyright, spotted by lintian
Dr. Tobias Quathamer [Fri, 6 Oct 2017 11:57:37 +0000 (13:57 +0200)]
Fix typo in d/copyright, spotted by lintian

6 years agoDebian release 2.19.65-1~exp2
Dr. Tobias Quathamer [Fri, 6 Oct 2017 10:08:12 +0000 (12:08 +0200)]
Debian release 2.19.65-1~exp2

6 years agoRemove unneeded --parallel options from debhelper calls
Dr. Tobias Quathamer [Fri, 6 Oct 2017 07:44:55 +0000 (09:44 +0200)]
Remove unneeded --parallel options from debhelper calls

6 years agoUse debhelper v10
Dr. Tobias Quathamer [Fri, 6 Oct 2017 07:44:14 +0000 (09:44 +0200)]
Use debhelper v10

6 years agoRun d/update_doc_packages to generate new package stanzas
Dr. Tobias Quathamer [Thu, 5 Oct 2017 15:39:09 +0000 (17:39 +0200)]
Run d/update_doc_packages to generate new package stanzas

6 years agoAdd new language Catalan for HTML and PDF doc packages
Dr. Tobias Quathamer [Thu, 5 Oct 2017 15:36:36 +0000 (17:36 +0200)]
Add new language Catalan for HTML and PDF doc packages

6 years agoUpdate Standards-Version to 4.1.1, no changes needed
Dr. Tobias Quathamer [Tue, 3 Oct 2017 13:51:51 +0000 (15:51 +0200)]
Update Standards-Version to 4.1.1, no changes needed

6 years agoUpdate watch file for new upstream location
Dr. Tobias Quathamer [Tue, 3 Oct 2017 13:46:39 +0000 (15:46 +0200)]
Update watch file for new upstream location

6 years agoUse component guile18 for gbp buildpackage
Dr. Tobias Quathamer [Tue, 3 Oct 2017 13:16:57 +0000 (15:16 +0200)]
Use component guile18 for gbp buildpackage

6 years agoUpdate d/changelog
Dr. Tobias Quathamer [Tue, 3 Oct 2017 13:14:13 +0000 (15:14 +0200)]
Update d/changelog

6 years agoInclude changelog entries from branch debian
Dr. Tobias Quathamer [Tue, 3 Oct 2017 13:09:55 +0000 (15:09 +0200)]
Include changelog entries from branch debian

6 years agoInclude two updates from branch debian
Dr. Tobias Quathamer [Tue, 3 Oct 2017 13:08:58 +0000 (15:08 +0200)]
Include two updates from branch debian

6 years agoRemove patch support_guile_2, applied upstream
Dr. Tobias Quathamer [Tue, 3 Oct 2017 12:57:22 +0000 (14:57 +0200)]
Remove patch support_guile_2, applied upstream

6 years agoRemove patch hurd_file_name_support, applied upstream
Dr. Tobias Quathamer [Tue, 3 Oct 2017 12:56:49 +0000 (14:56 +0200)]
Remove patch hurd_file_name_support, applied upstream

6 years agoUpdate d/copyright
Dr. Tobias Quathamer [Tue, 3 Oct 2017 12:55:27 +0000 (14:55 +0200)]
Update d/copyright

6 years agoUse real guile binary instead of libtool wrapper in guile-config
Anthony Fok [Sun, 29 Jan 2017 07:27:41 +0000 (00:27 -0700)]
Use real guile binary instead of libtool wrapper in guile-config

Fix FTBFS (introduced by me in 2.18.2-5) on kfreebsd-{amd64,i386}.

6 years agoInclude subsequent fixes to d/rules from branch debian
Dr. Tobias Quathamer [Tue, 3 Oct 2017 12:39:53 +0000 (14:39 +0200)]
Include subsequent fixes to d/rules from branch debian

6 years agoSort Uploaders alphabetically
Dr. Tobias Quathamer [Tue, 3 Oct 2017 12:30:07 +0000 (14:30 +0200)]
Sort Uploaders alphabetically

6 years agoCherry-pick 6a73776004 with minor adaptions in d/control and d/rules
Anthony Fok [Fri, 27 Jan 2017 11:58:07 +0000 (04:58 -0700)]
Cherry-pick 6a73776004 with minor adaptions in d/control and d/rules

Bundle our own private copy of guile-1.8

Superceded by guile-2.0, the old guile-1.8 was finally removed from Debian
in May 2016.

Unfortunately, LilyPond 2.18.2 still requires Guile 1.8,
and LilyPond 2.19.x and Guile 2 are just not yet ready for each other.
So, it would seem that bundling our own private guile-1.8 is the only
viable option to keep LilyPond 2.18.2 in Debian for the time being.

Hope this would allow LilyPond to re-enter Debian 9 "stretch"!

6 years agoMerge tag 'upstream/2.19.65' into debian-experimental
Dr. Tobias Quathamer [Tue, 3 Oct 2017 12:06:41 +0000 (14:06 +0200)]
Merge tag 'upstream/2.19.65' into debian-experimental

Upstream version 2.19.65

6 years agoNew upstream version 2.19.65
Dr. Tobias Quathamer [Tue, 3 Oct 2017 12:06:37 +0000 (14:06 +0200)]
New upstream version 2.19.65

6 years agoAdapt debian/gbp.conf for multiple upstream tarballs
Dr. Tobias Quathamer [Tue, 3 Oct 2017 12:04:01 +0000 (14:04 +0200)]
Adapt debian/gbp.conf for multiple upstream tarballs

7 years agoFix FTBFS when built with dpkg-buildpackage -A
Anthony Fok [Fri, 27 Jan 2017 20:01:56 +0000 (13:01 -0700)]
Fix FTBFS when built with dpkg-buildpackage -A

Previously, "$(MAKE) install" was not run for arch-independent build,
hence dh_install was unable to find the non-documentation files that are
destined for lilypond-data.

Thanks to Santiago Vila for the bug report. (Closes: #806067)

7 years agodebian/rules: Leave PDF documentation uncompressed
Anthony Fok [Fri, 27 Jan 2017 19:56:09 +0000 (12:56 -0700)]
debian/rules: Leave PDF documentation uncompressed

7 years agoUpdate DEP-3 header in debian/patches/hurd_file_name_support
Anthony Fok [Fri, 27 Jan 2017 17:41:39 +0000 (10:41 -0700)]
Update DEP-3 header in debian/patches/hurd_file_name_support

In particular, to show more complete Author information
and to reflect that the patch is now forwarded upstream.

7 years agoMake lilypond-doc-html Depends on lilypond-doc for its PNG images
Anthony Fok [Fri, 27 Jan 2017 12:01:45 +0000 (05:01 -0700)]
Make lilypond-doc-html Depends on lilypond-doc for its PNG images

7 years agoRemove bitmap fonts from Build-Depends and use vector fonts only
Anthony Fok [Fri, 27 Jan 2017 17:32:50 +0000 (10:32 -0700)]
Remove bitmap fonts from Build-Depends and use vector fonts only

AFAIK, LilyPond nowadays cannot and does not use bitmap fonts from X11.

Also:
 - Add fonts-linuxlibertine because it is specifically used in the
   UTF-8 snippet;
 - Change fonts-freefont-ttf to fonts-freefont-otf as suggested in the docs;
 - Remove fonts-ipafont-gothic because fonts-ipafont-mincho alone is used,
   and, as a serif font, IPAMincho matches LilyPond's default fonts better.

Also, Build-Conflicts with fonts-noto-cjk which contains OpenType
Collection (OTC) fonts, which unfortunately Ghostscript does not yet
support and would cause the build to abort.

7 years agoFix some minor errors and omissions in debian/copyright
Anthony Fok [Fri, 27 Jan 2017 17:23:46 +0000 (10:23 -0700)]
Fix some minor errors and omissions in debian/copyright

Also add Dr. Tobias Quathamer and me as contributors to debian/*,
and update some copyright years to match those listed in the current
LilyPond 2.19.53 source.

7 years agoAdd "--no-parallel" to dh_auto_clean in debian/rules
Anthony Fok [Thu, 26 Jan 2017 23:52:08 +0000 (16:52 -0700)]
Add "--no-parallel" to dh_auto_clean in debian/rules

The use of a parallel "$(MAKE) -j4 distclean" tends to fail
after a full build.

7 years agoRemove libgmp3-dev and libltdl-dev from Build-Depends
Anthony Fok [Wed, 25 Jan 2017 09:47:34 +0000 (02:47 -0700)]
Remove libgmp3-dev and libltdl-dev from Build-Depends

The added build-dependencies was a workaround first introduced in
lilypond (2.8.7-1) in October 2006 due to missing dependencies in
guile-1.8-dev, which was fixed as of December 2006, i.e. ten years ago.

7 years agoAdd myself to the Uploaders field
Anthony Fok [Fri, 27 Jan 2017 17:14:12 +0000 (10:14 -0700)]
Add myself to the Uploaders field

Also, bump Standards-Version to 3.9.8 (no change)

7 years agoAdd debian/gbp.conf for debian-experimental branch
Anthony Fok [Fri, 27 Jan 2017 17:08:56 +0000 (10:08 -0700)]
Add debian/gbp.conf for debian-experimental branch

7 years agoUpdate changelog
Dr. Tobias Quathamer [Mon, 26 Dec 2016 09:57:37 +0000 (10:57 +0100)]
Update changelog

7 years agoMerge tag 'upstream/2.19.53' into debian-experimental
Dr. Tobias Quathamer [Mon, 26 Dec 2016 09:46:49 +0000 (10:46 +0100)]
Merge tag 'upstream/2.19.53' into debian-experimental

Upstream version 2.19.53

7 years agoImported Upstream version 2.19.53
Dr. Tobias Quathamer [Mon, 26 Dec 2016 09:46:45 +0000 (10:46 +0100)]
Imported Upstream version 2.19.53

7 years agoBuild-Depends on extractpdfmark to generate smaller PDF files
Dr. Tobias Quathamer [Wed, 14 Dec 2016 08:59:15 +0000 (09:59 +0100)]
Build-Depends on extractpdfmark to generate smaller PDF files

7 years agoReplace ttf-dejavu and ttf-freefont with new package names
Dr. Tobias Quathamer [Sun, 11 Dec 2016 11:25:29 +0000 (12:25 +0100)]
Replace ttf-dejavu and ttf-freefont with new package names

7 years agoAdd libfl-dev to Build-Depends
Dr. Tobias Quathamer [Fri, 9 Dec 2016 11:23:20 +0000 (12:23 +0100)]
Add libfl-dev to Build-Depends

7 years agoUpdate changelog
Dr. Tobias Quathamer [Fri, 9 Dec 2016 11:15:36 +0000 (12:15 +0100)]
Update changelog

7 years agoMerge tag 'upstream/2.19.52' into debian-experimental
Dr. Tobias Quathamer [Fri, 9 Dec 2016 11:06:36 +0000 (12:06 +0100)]
Merge tag 'upstream/2.19.52' into debian-experimental

Upstream version 2.19.52

7 years agoImported Upstream version 2.19.52
Dr. Tobias Quathamer [Fri, 9 Dec 2016 11:06:32 +0000 (12:06 +0100)]
Imported Upstream version 2.19.52

7 years agoAdd changelog entry for NMU.
Dr. Tobias Quathamer [Sun, 20 Nov 2016 13:23:24 +0000 (14:23 +0100)]
Add changelog entry for NMU.

The corresponding patch to d/control has already been applied
in 048ba15.

7 years agoUpdate changelog
Dr. Tobias Quathamer [Sun, 20 Nov 2016 12:46:48 +0000 (13:46 +0100)]
Update changelog

7 years agoRefresh patch
Dr. Tobias Quathamer [Sun, 20 Nov 2016 12:46:19 +0000 (13:46 +0100)]
Refresh patch

7 years agoMerge tag 'upstream/2.19.51' into debian-experimental
Dr. Tobias Quathamer [Sun, 20 Nov 2016 12:20:33 +0000 (13:20 +0100)]
Merge tag 'upstream/2.19.51' into debian-experimental

Upstream version 2.19.51

7 years agoImported Upstream version 2.19.51
Dr. Tobias Quathamer [Sun, 20 Nov 2016 12:20:29 +0000 (13:20 +0100)]
Imported Upstream version 2.19.51

7 years agoAdd two bug numbers for guile-2.0 to d/changelog
Dr. Tobias Quathamer [Sun, 20 Nov 2016 11:26:05 +0000 (12:26 +0100)]
Add two bug numbers for guile-2.0 to d/changelog

7 years agoReorder patches/series
Dr. Tobias Quathamer [Wed, 16 Nov 2016 11:00:11 +0000 (12:00 +0100)]
Reorder patches/series

7 years agoRemove patches, no longer needed since 2013-12-13 (commit 6650aef)
Dr. Tobias Quathamer [Wed, 16 Nov 2016 10:58:20 +0000 (11:58 +0100)]
Remove patches, no longer needed since 2013-12-13 (commit 6650aef)

7 years agoUpdate changelog
Dr. Tobias Quathamer [Wed, 16 Nov 2016 08:42:41 +0000 (09:42 +0100)]
Update changelog

7 years agoMerge tag 'upstream/2.19.50' into debian-experimental
Dr. Tobias Quathamer [Wed, 16 Nov 2016 08:37:58 +0000 (09:37 +0100)]
Merge tag 'upstream/2.19.50' into debian-experimental

Upstream version 2.19.50

7 years agoImported Upstream version 2.19.50
Dr. Tobias Quathamer [Wed, 16 Nov 2016 08:37:54 +0000 (09:37 +0100)]
Imported Upstream version 2.19.50

7 years agoUpdate changelog
Dr. Tobias Quathamer [Fri, 28 Oct 2016 15:36:21 +0000 (17:36 +0200)]
Update changelog

7 years agoRefresh patch
Dr. Tobias Quathamer [Fri, 28 Oct 2016 15:34:37 +0000 (17:34 +0200)]
Refresh patch

7 years agoMerge tag 'upstream/2.19.49' into debian-experimental
Dr. Tobias Quathamer [Fri, 28 Oct 2016 15:31:53 +0000 (17:31 +0200)]
Merge tag 'upstream/2.19.49' into debian-experimental

Upstream version 2.19.49

7 years agoImported Upstream version 2.19.49
Dr. Tobias Quathamer [Fri, 28 Oct 2016 15:31:49 +0000 (17:31 +0200)]
Imported Upstream version 2.19.49

7 years agoUpdate changelog
Dr. Tobias Quathamer [Thu, 22 Sep 2016 08:46:27 +0000 (10:46 +0200)]
Update changelog

7 years agoMerge tag 'upstream/2.19.48' into debian-experimental
Dr. Tobias Quathamer [Thu, 22 Sep 2016 08:34:02 +0000 (10:34 +0200)]
Merge tag 'upstream/2.19.48' into debian-experimental

Upstream version 2.19.48

7 years agoImported Upstream version 2.19.48
Dr. Tobias Quathamer [Thu, 22 Sep 2016 08:33:58 +0000 (10:33 +0200)]
Imported Upstream version 2.19.48

7 years agoUpdate changelog
Dr. Tobias Quathamer [Fri, 9 Sep 2016 12:23:29 +0000 (14:23 +0200)]
Update changelog

7 years agoRefresh patch
Dr. Tobias Quathamer [Fri, 9 Sep 2016 12:22:07 +0000 (14:22 +0200)]
Refresh patch

7 years agoMerge tag 'upstream/2.19.47' into debian-experimental
Dr. Tobias Quathamer [Fri, 9 Sep 2016 12:15:59 +0000 (14:15 +0200)]
Merge tag 'upstream/2.19.47' into debian-experimental

Upstream version 2.19.47

7 years agoImported Upstream version 2.19.47
Dr. Tobias Quathamer [Fri, 9 Sep 2016 12:15:55 +0000 (14:15 +0200)]
Imported Upstream version 2.19.47

7 years agoReplace removed fonts ttf-kochi-gothic and ttf-kochi-mincho with fonts-ipafont-gothic...
Dr. Tobias Quathamer [Mon, 25 Jul 2016 16:22:01 +0000 (18:22 +0200)]
Replace removed fonts ttf-kochi-gothic and ttf-kochi-mincho with fonts-ipafont-gothic and fonts-ipafont-mincho

7 years agoAdd myself as uploader
Dr. Tobias Quathamer [Mon, 25 Jul 2016 15:44:03 +0000 (17:44 +0200)]
Add myself as uploader

7 years agoUpdate Vcs-* fields with new repository location
Dr. Tobias Quathamer [Mon, 25 Jul 2016 15:42:02 +0000 (17:42 +0200)]
Update Vcs-* fields with new repository location

7 years agoFix patch for FTBFS on hurd. Thanks to Petter Reinholdtsen for the bug report and...
Dr. Tobias Quathamer [Mon, 18 Jul 2016 16:10:51 +0000 (18:10 +0200)]
Fix patch for FTBFS on hurd. Thanks to Petter Reinholdtsen for the bug report and patch. (Closes: #761036)

7 years agoUpdate changelog
Dr. Tobias Quathamer [Mon, 18 Jul 2016 15:37:28 +0000 (17:37 +0200)]
Update changelog

7 years agoEnable usage of guile2 during configure
Dr. Tobias Quathamer [Mon, 18 Jul 2016 15:23:40 +0000 (17:23 +0200)]
Enable usage of guile2 during configure

7 years agoAdd fonts-texgyre to Build-Depends
Dr. Tobias Quathamer [Mon, 18 Jul 2016 15:23:02 +0000 (17:23 +0200)]
Add fonts-texgyre to Build-Depends

7 years agoUpdate package dependencies to guile-2.0
Dr. Tobias Quathamer [Mon, 18 Jul 2016 15:20:02 +0000 (17:20 +0200)]
Update package dependencies to guile-2.0

7 years agoAdd new patch to support guile-2.0
Dr. Tobias Quathamer [Mon, 18 Jul 2016 15:19:17 +0000 (17:19 +0200)]
Add new patch to support guile-2.0

7 years agoRefresh patches
Dr. Tobias Quathamer [Mon, 18 Jul 2016 15:17:51 +0000 (17:17 +0200)]
Refresh patches

7 years agoMerge tag 'upstream/2.19.45' into debian-experimental
Dr. Tobias Quathamer [Mon, 18 Jul 2016 15:11:36 +0000 (17:11 +0200)]
Merge tag 'upstream/2.19.45' into debian-experimental

Upstream version 2.19.45

7 years agoImported Upstream version 2.19.45
Dr. Tobias Quathamer [Mon, 18 Jul 2016 15:11:33 +0000 (17:11 +0200)]
Imported Upstream version 2.19.45

9 years agoRemove now useless mktexlsr calls and such from lilypond-doc.post{inst,rm}. Thanks...
Don Armstrong [Mon, 1 Dec 2014 23:01:59 +0000 (15:01 -0800)]
Remove now useless mktexlsr calls and such from lilypond-doc.post{inst,rm}. Thanks to Julian Gilbey (Closes: #771732)

9 years agoFix the wrong maintscript-helper invocation which was trying to symlink to /usr/share... debian/2.18.2-4
Don Armstrong [Tue, 18 Nov 2014 07:06:47 +0000 (23:06 -0800)]
Fix the wrong maintscript-helper invocation which was trying to symlink to /usr/share/doc/lilypond/Documentation/user instead of /usr/share/doc/lilypond/Documentation. (Closes: #768272)

* Fix the wrong maintscript-helper invocation which was trying to
  symlink to /usr/share/doc/lilypond/Documentation/user instead of
  /usr/share/doc/lilypond/Documentation. (Closes: #768272)
* Add missing Pre-Depends: ${misc:Depends} for dpkg-maintscript-helper.

9 years agoadd missing Pre-Depends: ${misc:Pre-Depends} for dpkg-maintscript-helper symlink
Don Armstrong [Mon, 17 Nov 2014 01:37:56 +0000 (17:37 -0800)]
add missing Pre-Depends: ${misc:Pre-Depends} for dpkg-maintscript-helper symlink

9 years agodisable autoreconf for the time being
Don Armstrong [Thu, 25 Sep 2014 22:34:48 +0000 (15:34 -0700)]
disable autoreconf for the time being

9 years agodisable guile2 support for now
Don Armstrong [Fri, 19 Sep 2014 20:33:19 +0000 (13:33 -0700)]
disable guile2 support for now

9 years agouse autoreconf to rebuild the configuration scripts
Don Armstrong [Fri, 19 Sep 2014 20:32:08 +0000 (13:32 -0700)]
use autoreconf to rebuild the configuration scripts

9 years agostop setting HOME to /tmp in debian/rules
Don Armstrong [Fri, 19 Sep 2014 20:31:47 +0000 (13:31 -0700)]
stop setting HOME to /tmp in debian/rules

9 years agoadd guile patch to series
Don Armstrong [Tue, 16 Sep 2014 22:58:51 +0000 (15:58 -0700)]
add guile patch to series

9 years agoadd initial work on guile2.0 patch
Don Armstrong [Tue, 16 Sep 2014 22:58:35 +0000 (15:58 -0700)]
add initial work on guile2.0 patch

9 years agoRevert previous patch (no parallel); the issue was actually running tests on architec...
Don Armstrong [Tue, 16 Sep 2014 21:52:01 +0000 (14:52 -0700)]
Revert previous patch (no parallel); the issue was actually running tests on architecture independent builds which had not built any of the documentation. (Closes: #760794)

9 years agoDisable parallel support on !amd64 to avoid build failures on those architectures... debian/2.18.2-2
Don Armstrong [Tue, 16 Sep 2014 21:42:39 +0000 (14:42 -0700)]
Disable parallel support on !amd64 to avoid build failures on those architectures. This is a temporary fix; a real fix to the (possibly) broken makefiles needs to be written. (Closes: #760794)

9 years agofinalize 2.18.2-1 upload debian/2.18.2-1
Don Armstrong [Tue, 9 Sep 2014 15:14:01 +0000 (08:14 -0700)]
finalize 2.18.2-1 upload

9 years agoswitch from pre/postinst to maintscript
Don Armstrong [Wed, 3 Sep 2014 19:33:50 +0000 (12:33 -0700)]
switch from pre/postinst to maintscript

9 years agoFix Broken usage of dpkg-maintscript-helper (relative pathnames vs. aboslute pathname...
Don Armstrong [Wed, 3 Sep 2014 18:43:57 +0000 (11:43 -0700)]
Fix Broken usage of dpkg-maintscript-helper (relative pathnames vs. aboslute pathnames), thanks to Guillem Jover and Petter Reinholdtsen (Closes: #758787).

9 years agoNew upstream version
Don Armstrong [Tue, 2 Sep 2014 23:25:16 +0000 (16:25 -0700)]
New upstream version

9 years agoMerge tag 'upstream/2.18.2' into debian
Don Armstrong [Wed, 21 May 2014 20:16:09 +0000 (13:16 -0700)]
Merge tag 'upstream/2.18.2' into debian

Upstream version 2.18.2

9 years agoImported Upstream version 2.18.2 upstream/2.18.2
Don Armstrong [Wed, 21 May 2014 20:15:58 +0000 (13:15 -0700)]
Imported Upstream version 2.18.2