r61715 - in /trunk/jifty/debian: changelog control copyright patches/60354-Jifty-FTBFS-with-YAML-Syck-1.12.diff patches/series

[ansgar-guest at users.alioth.debian.org]

Author: ansgar-guest
Date: Wed Aug 18 10:06:34 2010
New Revision: 61715

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=61715
Log:
* Team Upload.
* Apply patch to fix FTBFS with YAML-Syck 1.12. (Closes: #592981)
  + new patch: 60354-Jifty-FTBFS-with-YAML-Syck-1.12.diff
* debian/copyright: Refer to /usr/share/common-licenses/GPL-1.
* Bump Standards-Version to 3.9.1.

Added:
    trunk/jifty/debian/patches/60354-Jifty-FTBFS-with-YAML-Syck-1.12.diff
Modified:
    trunk/jifty/debian/changelog
    trunk/jifty/debian/control
    trunk/jifty/debian/copyright
    trunk/jifty/debian/patches/series

Modified: trunk/jifty/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/changelog?rev=61715&op=diff
==============================================================================
--- trunk/jifty/debian/changelog (original)
+++ trunk/jifty/debian/changelog Wed Aug 18 10:06:34 2010
@@ -1,3 +1,13 @@
+jifty (0.91117+dfsg-3) unstable; urgency=low
+
+  * Team Upload.
+  * Apply patch to fix FTBFS with YAML-Syck 1.12. (Closes: #592981)
+    + new patch: 60354-Jifty-FTBFS-with-YAML-Syck-1.12.diff
+  * debian/copyright: Refer to /usr/share/common-licenses/GPL-1.
+  * Bump Standards-Version to 3.9.1.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Wed, 18 Aug 2010 19:05:24 +0900
+
 jifty (0.91117+dfsg-2) unstable; urgency=low
 
   * Install localized manpages into language-specific directories; remove now

Modified: trunk/jifty/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/control?rev=61715&op=diff
==============================================================================
--- trunk/jifty/debian/control (original)
+++ trunk/jifty/debian/control Wed Aug 18 10:06:34 2010
@@ -48,7 +48,7 @@
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: AGOSTINI Yves <agostini at univ-metz.fr>,
  gregor herrmann <gregoa at debian.org>
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://search.cpan.org/dist/Jifty/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/jifty/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/jifty/

Modified: trunk/jifty/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/copyright?rev=61715&op=diff
==============================================================================
--- trunk/jifty/debian/copyright (original)
+++ trunk/jifty/debian/copyright Wed Aug 18 10:06:34 2010
@@ -174,7 +174,7 @@
  it under the terms of the Artistic License, which comes with Perl.
  .
  On Debian GNU/Linux systems, the complete text of the Artistic License
- can be found in `/usr/share/common-licenses/Artistic'
+ can be found in `/usr/share/common-licenses/Artistic'.
 
 License: GPL-1+
  This program is free software; you can redistribute it and/or modify
@@ -182,5 +182,5 @@
  the Free Software Foundation; either version 1, or (at your option)
  any later version.
  .
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'
+ On Debian GNU/Linux systems, the complete text of version 1 of the GNU
+ General Public License can be found in `/usr/share/common-licenses/GPL-1'.

Added: trunk/jifty/debian/patches/60354-Jifty-FTBFS-with-YAML-Syck-1.12.diff
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/patches/60354-Jifty-FTBFS-with-YAML-Syck-1.12.diff?rev=61715&op=file
==============================================================================
--- trunk/jifty/debian/patches/60354-Jifty-FTBFS-with-YAML-Syck-1.12.diff (added)
+++ trunk/jifty/debian/patches/60354-Jifty-FTBFS-with-YAML-Syck-1.12.diff Wed Aug 18 10:06:34 2010
@@ -1,0 +1,21 @@
+From: Ansgar Burchardt <ansgar at 43-1.org>
+Date: Sun, 15 Aug 2010 12:47:55 +0900
+Bug-Debian: http://bugs.debian.org/592981
+Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=60354
+Origin: vendor
+Subject: Test failure with YAML-Syck 1.12
+
+Update t/TestApp-Plugin-SetupWizard/lib/TestApp/Plugin/SetupWizard/Test.pm for
+changes in YAML-Syck 1.10_01.
+
+--- jifty-0.91117+dfsg.orig/t/TestApp-Plugin-SetupWizard/lib/TestApp/Plugin/SetupWizard/Test.pm
++++ jifty-0.91117+dfsg/t/TestApp-Plugin-SetupWizard/lib/TestApp/Plugin/SetupWizard/Test.pm
+@@ -34,7 +34,7 @@ sub site_config_is {
+     my $name     = shift;
+ 
+     my $got = eval { Jifty::YAML::LoadFile('etc/site_config.yml') };
+-    die $@ if $@ && $@ !~ /Cannot read from/;
++    die $@ if $@ && $@ !~ /Cannot read from/ && $@ !~ /is empty or non-existant/;
+ 
+     Test::More::is_deeply($got, $expected, $name);
+ }

Modified: trunk/jifty/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/patches/series?rev=61715&op=diff
==============================================================================
--- trunk/jifty/debian/patches/series (original)
+++ trunk/jifty/debian/patches/series Wed Aug 18 10:06:34 2010
@@ -2,3 +2,4 @@
 manpage-has-bad-whatis-entry.patch
 follow-symlink.patch
 spelling.patch
+60354-Jifty-FTBFS-with-YAML-Syck-1.12.diff