[Pkg-cli-apps-commits] [smuxi] 03/04: refresh and remove patches applied upstream

[Victor Seva Lopez]

This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch master
in repository smuxi.

commit fffb12f87a283c35a7ceea3577842b39dbabf844
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Thu Jul 9 20:10:41 2015 +0200

    refresh and remove patches applied upstream
---
 .../patches/build_db4o_with_default_compiler.patch | 14 ++++++------
 debian/patches/debian_default_settings.patch       |  2 +-
 debian/patches/fix_desktop.patch                   | 25 ----------------------
 debian/patches/fix_man.patch                       | 24 ---------------------
 debian/patches/series                              |  2 --
 5 files changed, 8 insertions(+), 59 deletions(-)

diff --git a/debian/patches/build_db4o_with_default_compiler.patch b/debian/patches/build_db4o_with_default_compiler.patch
index 31e4fe2..939a6c1 100644
--- a/debian/patches/build_db4o_with_default_compiler.patch
+++ b/debian/patches/build_db4o_with_default_compiler.patch
@@ -1,18 +1,18 @@
-Author: Mirco Bauer <meebey at meebey.net>
-Date:   Tue Jan 3 09:05:06 2012 +0100
-Subject: Build db4o-net with the system default compiler
-
----
+Author: Mirco Bauer <meebey at meebey.net>
+Date:   Tue Jan 3 09:05:06 2012 +0100
+Subject: Build db4o-net with the system default compiler
+
+---
 --- a/lib/db4o-net/Db4objects.Db4o/Db4objects.Db4o-2008.csproj
 +++ b/lib/db4o-net/Db4objects.Db4o/Db4objects.Db4o-2008.csproj
 @@ -1,5 +1,5 @@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
--<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="3.5">
+-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="4.0">
 +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
    <PropertyGroup>
      <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
      <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -10,7 +10,6 @@
+@@ -10,7 +10,6 @@
      <AppDesignerFolder>Properties</AppDesignerFolder>
      <RootNamespace>Db4objects.Db4o</RootNamespace>
      <AssemblyName>Db4objects.Db4o</AssemblyName>
diff --git a/debian/patches/debian_default_settings.patch b/debian/patches/debian_default_settings.patch
index 151d6ca..289428c 100644
--- a/debian/patches/debian_default_settings.patch
+++ b/debian/patches/debian_default_settings.patch
@@ -5,7 +5,7 @@ Subject: append debian channel to default config
 ---
 --- a/src/Engine/Config/Config.cs
 +++ b/src/Engine/Config/Config.cs
-@@ -337,6 +337,7 @@
+@@ -338,6 +338,7 @@
              Get(prefix + "OnConnectCommands",
                  new string[] {
                      "/join #smuxi",
diff --git a/debian/patches/fix_desktop.patch b/debian/patches/fix_desktop.patch
deleted file mode 100644
index aac15e8..0000000
--- a/debian/patches/fix_desktop.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 33f8de0b22664a2d6ee51f220671951c62ab0fb7 Mon Sep 17 00:00:00 2001
-From: Victor Seva <linuxmaniac at torreviejawireless.org>
-Date: Fri, 22 May 2015 20:15:24 +0200
-Subject: [PATCH] Frontend-GNOME: append _Keywords to .desktop file
-
-Thanks lintian for caring
----
- src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in b/src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in
-index 0cac68f..178a53b 100644
---- a/src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in
-+++ b/src/Frontend-GNOME/smuxi-frontend-gnome.desktop.in
-@@ -4,6 +4,7 @@ _Name=Smuxi
- _GenericName=IRC Chat
- _X-GNOME-FullName=Smuxi IRC Client
- _Comment=Chat with other people on IRC
-+_Keywords=chat;messaging;im;gnome;gtk;irc;twitter;facebook;gtalk;xmpp;jabber;campfire;jabbr
- Exec=smuxi-frontend-gnome
- Terminal=false
- Type=Application
--- 
-2.1.4
-
diff --git a/debian/patches/fix_man.patch b/debian/patches/fix_man.patch
deleted file mode 100644
index c8f806b..0000000
--- a/debian/patches/fix_man.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 228bed7d0db64f5ba15f7dceb8498f4e0f0aa8c1 Mon Sep 17 00:00:00 2001
-From: Victor Seva <linuxmaniac at torreviejawireless.org>
-Date: Fri, 22 May 2015 00:29:26 +0200
-Subject: [PATCH] fix man format for smuxi-message-buffer.1
-
----
- src/Engine-MessageBuffer/smuxi-message-buffer.1 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Engine-MessageBuffer/smuxi-message-buffer.1 b/src/Engine-MessageBuffer/smuxi-message-buffer.1
-index d0702cd..d864818 100644
---- a/src/Engine-MessageBuffer/smuxi-message-buffer.1
-+++ b/src/Engine-MessageBuffer/smuxi-message-buffer.1
-@@ -38,6 +38,7 @@ Show the arguments Smuxi takes.
- Manually specify a source format. Options include auto (figured out via filename), db4o, and sqlite.
- .It Fl \-destination-format Ns = Ns Ar format
- Manually specify a source destination, if converting. Options include auto (figured out via filename), db4o, and sqlite. 
-+.El
- .Sh SEE ALSO
- .Xr smuxi-frontend-gnome 1 ,
- .Xr smuxi-frontend-stfl 1 ,
--- 
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 6c0d720..c46fdca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,3 @@ build_Twitterizer2_with_default_compiler.patch
 build_db4o_with_default_compiler.patch
 build_agsxmpp_with_default_compiler.patch
 debian_default_settings.patch
-fix_man.patch
-fix_desktop.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/smuxi.git