[SCM] qapt packaging branch, master, updated. debian/1.2.2-1-6-ga221ed1

[Pino Toscano]

The following commit has been merged in the master branch:
commit a221ed118ab46388f9a6a836745e380e05c48720
Author: Pino Toscano <pino at debian.org>
Date:   Thu Dec 15 13:48:42 2011 +0100

    drop patch Fix-spelling-errors.patch
    
    it breaks translations
---
 debian/changelog                         |    3 +++
 debian/patches/Fix-spelling-errors.patch |   28 ----------------------------
 debian/patches/series                    |    1 -
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index defc9ec..75a98eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ qapt (1.2.2-2) UNRELEASED; urgency=low
     - Remove override for dh_strip, not needed.
     - Added .PHONY line.
 
+  [ Pino Toscano ]
+  * Drop patch Fix-spelling-errors.patch, which breaks translations.
+
  -- Kai Wasserbäch <curan at debian.org>  Wed, 14 Dec 2011 18:56:08 +0100
 
 qapt (1.2.2-1) experimental; urgency=low
diff --git a/debian/patches/Fix-spelling-errors.patch b/debian/patches/Fix-spelling-errors.patch
deleted file mode 100644
index 28c93da..0000000
--- a/debian/patches/Fix-spelling-errors.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Subject: Fix a spelling mistake found by Lintian.
-From: Kai Wasserbäch <curan at debian.org>
-Last-Update: 2011-12-14
-Forwarded: yes, by e-mail
----
- utils/qapt-deb-installer/DebViewer.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/utils/qapt-deb-installer/DebViewer.cpp
-+++ b/utils/qapt-deb-installer/DebViewer.cpp
-@@ -61,7 +61,7 @@ DebViewer::DebViewer(QWidget *parent)
- 
-     // nameStatusGrid, row 0
-     QLabel *namePrefixLabel = new QLabel(nameStatusBox);
--    namePrefixLabel->setText(i18nc("@label Label preceeding the package name",
-+    namePrefixLabel->setText(i18nc("@label Label preceding the package name",
-                                    "Package:"));
-     m_nameLabel = new QLabel(nameStatusBox);
-     nameStatusGrid->addWidget(namePrefixLabel, 0, 0, Qt::AlignRight);
-@@ -69,7 +69,7 @@ DebViewer::DebViewer(QWidget *parent)
- 
-     // nameStatusGrid, row 1
-     QLabel *statusPrefixLabel = new QLabel(nameStatusBox);
--    statusPrefixLabel->setText(i18nc("@label Label preceeding the package status",
-+    statusPrefixLabel->setText(i18nc("@label Label preceding the package status",
-                                      "Status:"));
-     m_statusLabel = new QLabel(nameStatusBox);
-     nameStatusGrid->addWidget(statusPrefixLabel, 1, 0, Qt::AlignRight);
diff --git a/debian/patches/series b/debian/patches/series
index 5418aa0..42bba69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 Fix-FTBFS-due-to-symbol-collision.patch
-Fix-spelling-errors.patch

-- 
qapt packaging