[SCM] maria packaging branch, master, updated. debian/1.3.5-3-8-g1562ac5

[Ralf Treinen]

The following commit has been merged in the master branch:
commit c1a019d6455819b4d058fbbe43e71b1fc70a2dc2
Author: Ralf Treinen <treinen at free.fr>
Date:   Fri May 13 22:00:03 2011 +0200

    migrate NEWS to utf8

diff --git a/debian/changelog b/debian/changelog
index e73e669..5606a79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ maria (1.3.5-4) unstable; urgency=low
     - set maintainer to debian-science
     - add Vcs-Git/Browse fields
   * Simplify calls to debhelpers
+  * patch utf8: migrate NEWS file to utf8
 
- -- Ralf Treinen <treinen at debian.org>  Fri, 13 May 2011 21:38:52 +0200
+ -- Ralf Treinen <treinen at debian.org>  Fri, 13 May 2011 21:59:53 +0200
 
 maria (1.3.5-3) unstable; urgency=low
 
diff --git a/debian/patches/series b/debian/patches/series
index 082f952..d2e9c2b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 lefty_path
 compile_options
 gcc4.6
+utf8
diff --git a/debian/patches/utf8 b/debian/patches/utf8
new file mode 100644
index 0000000..32d897d
--- /dev/null
+++ b/debian/patches/utf8
@@ -0,0 +1,40 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: migrate to utf8 encoding, remove some cruft
+
+Index: maria/NEWS
+===================================================================
+--- maria.orig/NEWS	2011-05-13 21:56:52.000000000 +0200
++++ maria/NEWS	2011-05-13 21:57:59.000000000 +0200
+@@ -1,7 +1,7 @@
+ Maria NEWS -- history of user-visible changes.  29th July 2005
+-Copyright © 2002,2003,2004,2005 Marko Mäkelä
++Copyright © 2002,2003,2004,2005 Marko Mäkelä
+ See the end for copying conditions.
+-
++
+ * Maria 1.3.5 is a maintenance release with performance and portability fixes
+ 
+ ** Identified performance bottlenecks with OProfile on GNU/Linux x86
+@@ -230,12 +230,11 @@
+ *** The liveness property checker was slightly optimised.
+ 
+ * Maria 1.0 was the first official release.
+-
+ 
+ ----------------------------------------------------------------------
+ Copyright information:
+ 
+-Copyright © 2002,2003,2004,2005 Marko Mäkelä
++Copyright © 2002,2003,2004,2005 Marko Mäkelä
+ 
+    Permission is granted to anyone to make or distribute verbatim copies
+    of this document as received, in any medium, provided that the
+@@ -246,8 +245,3 @@
+    of this document, or of portions of it,
+    under the above conditions, provided also that they
+    carry prominent notices stating who last changed them.
+-
+-Local variables:
+-mode: outline
+-paragraph-separate: "[ 	]*$"
+-end:

-- 
maria packaging