[Pkg-cli-apps-commits] [SCM] Blam - a simple news reader branch, master, updated. debian/1.8.9-3-5-gfae1d13

[Carlos Martín Nieto]

The following commit has been merged in the master branch:
commit 29ad774da9f46cd52dc26120c4b8120bbc286abe
Author: Carlos Martín Nieto <cmn at dwim.me>
Date:   Fri Jun 21 11:20:06 2013 +0200

    debian/patches: refresh
    
    The debian feed patch needed refreshing and the other two don't apply
    anymore.

diff --git a/debian/patches/0001-Add-the-Planet-Debian-feed-by-default.patch b/debian/patches/0001-Add-the-Planet-Debian-feed-by-default.patch
index b5faebd..ba36fbd 100644
--- a/debian/patches/0001-Add-the-Planet-Debian-feed-by-default.patch
+++ b/debian/patches/0001-Add-the-Planet-Debian-feed-by-default.patch
@@ -6,14 +6,13 @@ Subject: [PATCH] Add the Planet Debian feed by default
  collection.xml |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
-diff --git a/collection.xml b/collection.xml
-index 0d1553c..d1f058f 100644
---- a/collection.xml
-+++ b/collection.xml
-@@ -12,4 +12,5 @@
+Index: blam/collection.xml
+===================================================================
+--- blam.orig/collection.xml	2013-06-21 11:16:52.767384643 +0200
++++ blam/collection.xml	2013-06-21 11:16:52.759384643 +0200
+@@ -7,4 +7,5 @@
  
-     <Channel Name="GnomeFiles" Url="http://www.gnomefiles.org/files/gnomefiles.rdf"/>
+     <Channel Name="Plannet Jabber" Url="http://planet.jabber.org/rss20.xml"/>
  
 +    <Channel Name="Planet Debian" Url="http://planet.debian.org/rss20.xml"/>
  </ChannelCollection>
--- 
diff --git a/debian/patches/0002-Use-elif.patch b/debian/patches/0002-Use-elif.patch
deleted file mode 100644
index 15a35fe..0000000
--- a/debian/patches/0002-Use-elif.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Use correct preprocessor directive to avoid FTBFS
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648547
-Author: Carlos Martín Nieto <carlos at cmartin.tk>
-
-Index: blam/src/Application.cs
-===================================================================
---- blam.orig/src/Application.cs	2011-08-01 16:06:44.000000000 +0200
-+++ blam/src/Application.cs	2011-08-01 16:07:17.000000000 +0200
-@@ -22,7 +22,7 @@
- #if DBUS_SHARP
- using DBus;
- using org.freedesktop.DBus;
--#elseif NDESK_DBUS
-+#elif NDESK_DBUS
- using NDesk.DBus;
- using org.freedesktop.DBus;
- #endif
diff --git a/debian/patches/0003-Make-Show-in-browser-a-link-in-the-blam-theme.patch b/debian/patches/0003-Make-Show-in-browser-a-link-in-the-blam-theme.patch
deleted file mode 100644
index 0444488..0000000
--- a/debian/patches/0003-Make-Show-in-browser-a-link-in-the-blam-theme.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Make "Show in browser" a link in the 'blam' theme
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646750
-Author: Carlos Martín Nieto <carlos at cmartin.tk>
-
-diff --git a/themes/blam/theme.html b/themes/blam/theme.html
-index 2dbc50f..552e85c 100644
---- a/themes/blam/theme.html
-+++ b/themes/blam/theme.html
-@@ -16,7 +16,7 @@
- 	</div>
- 
- 	<div id="footer">
--	  <span class="link">${link}</span>
-+	  <span class="link"><a href="${url}">${link}</a></span>
- 	  <span class="author">${author}</span>
- 	</div>
-   </body>
--- 
-1.7.5.2.354.g349bf
-
diff --git a/debian/patches/series b/debian/patches/series
index 6876116..5d46629 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-Add-the-Planet-Debian-feed-by-default.patch
-0002-Use-elif.patch
-0003-Make-Show-in-browser-a-link-in-the-blam-theme.patch

-- 
Blam - a simple news reader