[Pkg-cli-apps-commits] [smuxi] 05/07: Refresh patches

Felipe Sateler fsateler at moszumanska.debian.org
Fri May 8 00:26:13 UTC 2015 

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

fsateler pushed a commit to branch master
in repository smuxi.

commit 1c15f1dee3ac771d4f22c27e21f6a6aba1845f10
Author: Felipe Sateler <fsateler at debian.org>
Date:   Thu May 7 20:55:33 2015 -0300

    Refresh patches
    
    Drop fix_man_pages, applied upstream
---
 ...ild_Newtonsoft.Json_with_default_compiler.patch |  6 +-
 .../build_Twitterizer2_with_default_compiler.patch | 13 +---
 .../build_agsxmpp_with_default_compiler.patch      |  6 +-
 .../patches/build_db4o_with_default_compiler.patch |  6 +-
 debian/patches/debian_default_settings.patch       |  8 +--
 debian/patches/fix_man_pages.patch                 | 77 ----------------------
 debian/patches/fix_reautogen.patch                 |  6 +-
 debian/patches/series                              |  1 -
 8 files changed, 13 insertions(+), 110 deletions(-)

diff --git a/debian/patches/build_Newtonsoft.Json_with_default_compiler.patch b/debian/patches/build_Newtonsoft.Json_with_default_compiler.patch
index c31eafe..b9c99c9 100644
--- a/debian/patches/build_Newtonsoft.Json_with_default_compiler.patch
+++ b/debian/patches/build_Newtonsoft.Json_with_default_compiler.patch
@@ -1,7 +1,5 @@
-Index: smuxi/lib/Newtonsoft.Json/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
-===================================================================
---- smuxi.orig/lib/Newtonsoft.Json/Src/Newtonsoft.Json/Newtonsoft.Json.csproj	2013-05-25 21:34:12.041270721 +0200
-+++ smuxi/lib/Newtonsoft.Json/Src/Newtonsoft.Json/Newtonsoft.Json.csproj	2013-05-25 21:34:46.601271455 +0200
+--- a/lib/Newtonsoft.Json/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
++++ b/lib/Newtonsoft.Json/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
 @@ -1,5 +1,5 @@
  <?xml version="1.0" encoding="utf-8"?>
 -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
diff --git a/debian/patches/build_Twitterizer2_with_default_compiler.patch b/debian/patches/build_Twitterizer2_with_default_compiler.patch
index 666ec74..6ca4462 100644
--- a/debian/patches/build_Twitterizer2_with_default_compiler.patch
+++ b/debian/patches/build_Twitterizer2_with_default_compiler.patch
@@ -1,7 +1,5 @@
-Index: smuxi/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj
-===================================================================
---- smuxi.orig/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj	2014-02-16 20:06:09.321429788 +0100
-+++ smuxi/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj	2014-02-16 20:06:09.321429788 +0100
+--- a/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj
++++ b/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj
 @@ -1,5 +1,5 @@
  <?xml version="1.0" encoding="utf-8"?>
 -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
@@ -9,10 +7,3 @@ Index: smuxi/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj
    <PropertyGroup>
      <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
      <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -359,4 +359,4 @@
-       <Name>Newtonsoft.Json</Name>
-     </ProjectReference>
-   </ItemGroup>
--</Project>
-\ No newline at end of file
-+</Project>
diff --git a/debian/patches/build_agsxmpp_with_default_compiler.patch b/debian/patches/build_agsxmpp_with_default_compiler.patch
index b68d1cc..dcce9f8 100644
--- a/debian/patches/build_agsxmpp_with_default_compiler.patch
+++ b/debian/patches/build_agsxmpp_with_default_compiler.patch
@@ -1,7 +1,5 @@
-Index: smuxi/lib/agsxmpp/agsxmpp/agsxmpp.csproj
-===================================================================
---- smuxi.orig/lib/agsxmpp/agsxmpp/agsxmpp.csproj	2013-08-25 21:28:53.754863111 +0200
-+++ smuxi/lib/agsxmpp/agsxmpp/agsxmpp.csproj	2013-08-25 21:38:47.058838297 +0200
+--- a/lib/agsxmpp/agsxmpp/agsxmpp.csproj
++++ b/lib/agsxmpp/agsxmpp/agsxmpp.csproj
 @@ -1,5 +1,5 @@
  <?xml version="1.0" encoding="utf-8"?>
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
diff --git a/debian/patches/build_db4o_with_default_compiler.patch b/debian/patches/build_db4o_with_default_compiler.patch
index de7cd4a..da3cc88 100644
--- a/debian/patches/build_db4o_with_default_compiler.patch
+++ b/debian/patches/build_db4o_with_default_compiler.patch
@@ -1,7 +1,5 @@
-Index: smuxi/lib/db4o-net/Db4objects.Db4o/Db4objects.Db4o-2008.csproj
-===================================================================
---- smuxi.orig/lib/db4o-net/Db4objects.Db4o/Db4objects.Db4o-2008.csproj	2012-02-09 22:33:28.000000000 +0100
-+++ smuxi/lib/db4o-net/Db4objects.Db4o/Db4objects.Db4o-2008.csproj	2012-06-30 16:12:13.000000000 +0200
+--- 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">
diff --git a/debian/patches/debian_default_settings.patch b/debian/patches/debian_default_settings.patch
index 90b841b..09cb5ac 100644
--- a/debian/patches/debian_default_settings.patch
+++ b/debian/patches/debian_default_settings.patch
@@ -1,8 +1,6 @@
-Index: smuxi/src/Engine/Config/Config.cs
-===================================================================
---- smuxi.orig/src/Engine/Config/Config.cs	2014-02-16 20:06:24.493233068 +0100
-+++ smuxi/src/Engine/Config/Config.cs	2014-02-16 20:06:24.493233068 +0100
-@@ -329,6 +329,7 @@
+--- a/src/Engine/Config/Config.cs
++++ b/src/Engine/Config/Config.cs
+@@ -329,6 +329,7 @@ namespace Smuxi.Engine
              Get(prefix + "OnConnectCommands",
                  new string[] {
                      "/join #smuxi",
diff --git a/debian/patches/fix_man_pages.patch b/debian/patches/fix_man_pages.patch
deleted file mode 100644
index d65ae65..0000000
--- a/debian/patches/fix_man_pages.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/src/Frontend-STFL/smuxi-frontend-stfl.1
-+++ b/src/Frontend-STFL/smuxi-frontend-stfl.1
-@@ -24,6 +24,7 @@
- List the available engines Smuxi can connect to.
- .It Fl e Ar engine , Fl \-engine Ns = Ns Ar engine
- Connect to a remote engine.
-+.El
- .Sh KEY BINDINGS
- The keyboards are similar to that of irssi and similar clients. Note that some terminal control characters (like C-c, C-z, etc) are not intercepted. Common line editing keys that work in graphical applications will also work. In the following examples, C-x means Control-x.
- .Pp
-@@ -46,6 +47,7 @@
- delete word
- .It C-c
- exit frontend
-+.El
- .Sh SMUXI COMMANDS
- Like most IRC clients, Smuxi uses commands prefixed with "/", and most use the same commands, also including its own set of commands for the client and engine. In the following examples, the "/" prefix is not included.
- .Bl -tag -width xx -offset -ident
-@@ -69,6 +71,7 @@
- Set the configuration key's value.
- .It shutdown
- Shuts down the current engine.
-+.El
- .Sh FILES
- .Bl -tag -width -compact
- .It Pa $XDG_DATA_HOME/smuxi/share/smuxi-frontend-stfl.log
-@@ -77,6 +80,7 @@
- smuxi local engine config
- .It Pa $XDG_CONFIG_HOME/smuxi/smuxi-frontend.ini
- smuxi frontend configuration and remote engine list
-+.El
- .Sh SEE ALSO
- .Xr smuxi-frontend-gnome 1 ,
- .Xr smuxi-server 1 ,
---- a/src/Server/smuxi-server.1
-+++ b/src/Server/smuxi-server.1
-@@ -42,12 +42,14 @@
- When adding or modifying a user, use that password.
- .It Fl \-optimize-message-buffers Ns = Ns Ar action
- Optimizes the message buffers. Valid values are none, defrag, index, and all.
-+.El
- .Sh FILES
- .Bl -tag -width -compact
- .It Pa $XDG_DATA_HOME/smuxi/share/smuxi-server.log
- smuxi debug log
- .It Pa $XDG_CONFIG_HOME/smuxi/smuxi-engine.ini
- smuxi engine config
-+.El
- .Sh SIGNALS
- Smuxi will handle and catch these signals:
- .Bl -tag -width xxxxxxxx -compact
-@@ -55,6 +57,7 @@
- Gracefully exits the server.
- .It SIGTERM
- Gracefully exits the server.
-+.El
- .Sh SEE ALSO
- .Xr smuxi-frontend-gnome 1 ,
- .Xr smuxi-frontend-stfl 1 ,
---- a/src/Frontend-GNOME/smuxi-frontend-gnome.1
-+++ b/src/Frontend-GNOME/smuxi-frontend-gnome.1
-@@ -22,6 +22,7 @@
- Show the arguments Smuxi takes.
- .It Fl e Ar engine , Fl \-engine Ns = Ns Ar engine
- Connect to a remote engine.
-+.El
- .Sh FILES
- .Bl -tag -width -compact
- .It Pa $XDG_DATA_HOME/smuxi/share/smuxi-frontend-gnome.log
-@@ -30,6 +31,7 @@
- smuxi local engine config
- .It Pa $XDG_CONFIG_HOME/smuxi/smuxi-frontend.ini
- smuxi frontend configuration and remote engine list
-+.El
- .Sh SEE ALSO
- .Xr smuxi-frontend-stfl 1 ,
- .Xr smuxi-server 1 ,
diff --git a/debian/patches/fix_reautogen.patch b/debian/patches/fix_reautogen.patch
index 92a2517..e43214f 100644
--- a/debian/patches/fix_reautogen.patch
+++ b/debian/patches/fix_reautogen.patch
@@ -1,7 +1,5 @@
-Index: smuxi/lib/Makefile.am
-===================================================================
---- smuxi.orig/lib/Makefile.am	2014-01-21 04:56:18.000000000 +0100
-+++ smuxi/lib/Makefile.am	2014-01-21 05:38:26.232960558 +0100
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
 @@ -1,4 +1,4 @@
 -SUBDIRS =	$(MESSAGINGMENU_SHARP_SUBDIR)
 +SUBDIRS =
diff --git a/debian/patches/series b/debian/patches/series
index a1f3afe..c46fdca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +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_pages.patch

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

More information about the Pkg-cli-apps-commits mailing list