[SCM] ciderwebmail Debian packaging branch, master, updated. debian/1.04_20120610-2-18-g77522ad

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit cdae270e060e68c9a50db877f3e757e671cde84e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Jun 23 04:54:05 2012 +0200

    Drop patch 1001: Adopted upstream.

diff --git a/debian/patches/1001_avoid_Text-Flowed.patch b/debian/patches/1001_avoid_Text-Flowed.patch
deleted file mode 100644
index aea1080..0000000
--- a/debian/patches/1001_avoid_Text-Flowed.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/lib/CiderWebmail/Part/TextCalendar.pm
-+++ b/lib/CiderWebmail/Part/TextCalendar.pm
-@@ -6,7 +6,7 @@
- use DateTime::Format::ISO8601;
- use HTML::Entities;
- 
--use Text::Flowed;
-+use Text::Autoformat;
- 
- use Carp qw/ croak /;
- 
-@@ -39,7 +39,7 @@
-         my $description;
-         if ($entry->property('description')) {
-             $description = $entry->property('description');
--            $description = Text::Flowed::reformat( ($description->[0]->value or '') );
-+            $description = (autoformat($description->[0]->value, { tabspace => 4, all => 1 }) or '');
-             $description =~ s/\n/<br \/>/gxm;
-         }
-        
diff --git a/debian/patches/series b/debian/patches/series
index 7cee814..13f38bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-1001_avoid_Text-Flowed.patch
 2001_avoid_autoinstall.patch

-- 
ciderwebmail Debian packaging