summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Pethig <gareth.pethig@nokia.com>2009-05-25 20:57:25 +1000
committerGareth Pethig <gareth.pethig@nokia.com>2009-05-25 20:57:25 +1000
commit5c1b5d34558714b8c671a0790780548bfc108b3d (patch)
tree38a13cfa5cad8e3c4fb6d0c432954af6a67edad1
parentef11cd7c711858a2b30b3624e2dc3f50146cf0ca (diff)
Updated Changelog2009W21-0maemo1
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/0001-maemo_changes.diff2
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index c61bdd12..46dcebe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qt4-messagingframework (2009W21-0maemo1) hardy; urgency=low
+
+ * Pull from upstream.
+
+ -- Gareth Pethig <gareth.pethig@nokia.com> Mon, 25 May 2009 20:55:32 +1000
+
qt4-messagingframework (2009W20-0maemo2) hardy; urgency=low
* Made changes to debianazation as required.
diff --git a/debian/patches/0001-maemo_changes.diff b/debian/patches/0001-maemo_changes.diff
index 2bf7a02e..66a69845 100644
--- a/debian/patches/0001-maemo_changes.diff
+++ b/debian/patches/0001-maemo_changes.diff
@@ -18,7 +18,7 @@ index cd9a51e..f7e97ed 100644
src/plugins/contentmanagers/qtopiamailfile \
src/plugins/viewers/generic \
diff --git a/src/applications/qtmail/qtmail.pro b/src/applications/qtmail/qtmail.pro
-index 74c79bc..2ec5e71 100644
+index 04db3ad..343c98f 100644
--- a/src/applications/qtmail/qtmail.pro
+++ b/src/applications/qtmail/qtmail.pro
@@ -11,7 +11,18 @@ INCLUDEPATH += . ../../libraries/qtopiamail \