From f6457956becd9fb7742869d1c477ce7d4404eddd Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 12 Mar 2013 09:53:50 +0100
Subject: [PATCH] cleaned patch

---
 scripts/resources.patch | 79 ++++-------------------------------------
 1 file changed, 6 insertions(+), 73 deletions(-)

diff --git a/scripts/resources.patch b/scripts/resources.patch
index d2f0c73a7..020d2075c 100644
--- a/scripts/resources.patch
+++ b/scripts/resources.patch
@@ -1,6 +1,6 @@
 === modified file 'openlp/core/resources.py'
---- openlp/core/resources.py	2013-03-12 08:44:54 +0000
-+++ openlp/core/resources.py	2013-03-12 08:45:42 +0000
+--- openlp/core/resources.py    2013-03-12 08:44:54 +0000
++++ openlp/core/resources.py    2013-03-12 08:45:42 +0000
 @@ -1,10 +1,35 @@
  # -*- coding: utf-8 -*-
 -
@@ -41,90 +41,23 @@
 +store for use by OpenLP.
 +"""
  from PyQt4 import QtCore
- 
+
  qt_resource_data = "\
 @@ -71953,9 +71978,14 @@
  "
- 
+
  def qInitResources():
 +    """
 +    Initialise OpenLP resources at application startup.
 +    """
      QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
- 
+
  def qCleanupResources():
 +    """
 +    Cleanup OpenLP resources when the application shuts down.
 +    """
      QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
- 
+
 -qInitResources()
 
-=== modified file 'scripts/resources.patch'
---- scripts/resources.patch	2012-12-29 20:56:56 +0000
-+++ scripts/resources.patch	2013-03-12 08:45:44 +0000
-@@ -1,63 +0,0 @@
----- openlp/core/resources.py.old    Mon Jun 21 23:16:19 2010
--+++ openlp/core/resources.py    Mon Jun 21 23:27:48 2010
--@@ -1,10 +1,35 @@
-- # -*- coding: utf-8 -*-
--+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
--
---# Resource object code
---#
---#
---# WARNING! All changes made in this file will be lost!
---
--+###############################################################################
--+# OpenLP - Open Source Lyrics Projection                                      #
--+# --------------------------------------------------------------------------- #
--+# Copyright (c) 2008-2013 Raoul Snyman                                        #
--+# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan      #
--+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub,      #
--+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer.   #
--+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru,          #
--+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,             #
--+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock,              #
--+# Frode Woldsund, Martin Zibricky, Patrick Zimmermann                         #
--+# --------------------------------------------------------------------------- #
--+# This program is free software; you can redistribute it and/or modify it     #
--+# under the terms of the GNU General Public License as published by the Free  #
--+# Software Foundation; version 2 of the License.                              #
--+#                                                                             #
--+# This program is distributed in the hope that it will be useful, but WITHOUT #
--+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
--+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
--+# more details.                                                               #
--+#                                                                             #
--+# You should have received a copy of the GNU General Public License along     #
--+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
--+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
--+###############################################################################
--+"""
--+The :mod:`resources` module provides application images and icons in a central
--+store for use by OpenLP.
--+"""
-- from PyQt4 import QtCore
--
-- qt_resource_data = "\
--@@ -48643,9 +48664,16 @@
-- "
--
-- def qInitResources():
---    QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
--+    """
--+    Initialise OpenLP resources at application startup.
--+    """
--+    QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name,
--+        qt_resource_data)
--
-- def qCleanupResources():
---    QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
--+    """
--+    Cleanup OpenLP resources when the application shuts down.
--+    """
--+    QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name,
--+        qt_resource_data)
--
---qInitResources()