[Pkg-cli-apps-commits] [SCM] Blam - a simple news reader branch, master, updated. debian/1.8.8-1-7-ga2bd116

[Carlos Martín Nieto]

The following commit has been merged in the master branch:
commit a0da9fc608106e8d971de005437f20744d4b0b65
Author: Carlos Martín Nieto <carlos at cmartin.tk>
Date:   Sun Jul 31 17:20:03 2011 +0200

    Drop POTFILES patch, added upstream

diff --git a/debian/changelog b/debian/changelog
index 58713e5..19202da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 blam (1.8.9-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches: drop POTFILES patch as it's included upstream.
 
  -- Carlos Martín Nieto <carlos at cmartin.tk>  Sun, 31 Jul 2011 16:45:15 +0200
 
diff --git a/debian/patches/0001-Add-files-to-po-POTFILES.-in-skip.patch b/debian/patches/0001-Add-files-to-po-POTFILES.-in-skip.patch
deleted file mode 100644
index d89750b..0000000
--- a/debian/patches/0001-Add-files-to-po-POTFILES.-in-skip.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <carlos at cmartin.tk>
-Date: Mon, 13 Sep 2010 23:49:02 +0100
-Subject: [PATCH] Add files to po/POTFILES.{in,skip}
-
----
- po/POTFILES.in   |    2 ++
- po/POTFILES.skip |    1 +
- 2 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index 76765d4..118780a 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -10,3 +10,5 @@ src/Application.cs
- src/Dialogs.cs
- src/ItemView.cs
- src/Opml.cs
-+src/UnreadNotification.cs
-+src/TrayIcon.cs
-diff --git a/po/POTFILES.skip b/po/POTFILES.skip
-index e69de29..037c359 100644
---- a/po/POTFILES.skip
-+++ b/po/POTFILES.skip
-@@ -0,0 +1 @@
-+blam.desktop.in
--- 
diff --git a/debian/patches/0002-Add-the-Planet-Debian-feed-by-default.patch b/debian/patches/0001-Add-the-Planet-Debian-feed-by-default.patch
similarity index 100%
rename from debian/patches/0002-Add-the-Planet-Debian-feed-by-default.patch
rename to debian/patches/0001-Add-the-Planet-Debian-feed-by-default.patch
diff --git a/debian/patches/series b/debian/patches/series
index 2894d7c..5d46629 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Add-files-to-po-POTFILES.-in-skip.patch
-0002-Add-the-Planet-Debian-feed-by-default.patch
+0001-Add-the-Planet-Debian-feed-by-default.patch

-- 
Blam - a simple news reader