summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-11 21:31:10 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-11 21:31:10 +0000
commit270fa81e588e0d21da4a0dfc0c00fcfdd204beb2 (patch)
tree0710c6cb41328f9966df965e9179f00411f0a6a8
parentMerging upstream version 1.2.31.3+dfsg. (diff)
downloadremmina-270fa81e588e0d21da4a0dfc0c00fcfdd204beb2.zip
remmina-270fa81e588e0d21da4a0dfc0c00fcfdd204beb2.tar.xz
Merging debian version 1.2.31.3+dfsg-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/0001-Fix_warnings_on_manpages.patch99
-rw-r--r--debian/patches/0002-Fix_Cmake_rule_for_LibSSH.patch25
-rw-r--r--debian/patches/series2
4 files changed, 7 insertions, 126 deletions
diff --git a/debian/changelog b/debian/changelog
index 17c7581..4a0e2fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+remmina (1.2.31.3+dfsg-1) unstable; urgency=medium
+
+ * New upstream hotfix release (Closes: #906154)
+ * debian/patches/: patchset dropped (applied upstream)
+
+ -- Matteo F. Vescovi <mfv@debian.org> Wed, 15 Aug 2018 14:57:25 +0200
+
remmina (1.2.31.2+dfsg-2~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/patches/0001-Fix_warnings_on_manpages.patch b/debian/patches/0001-Fix_warnings_on_manpages.patch
deleted file mode 100644
index 6558a7f..0000000
--- a/debian/patches/0001-Fix_warnings_on_manpages.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From: "Matteo F. Vescovi" <mfv@debian.org>
-Date: Wed, 1 Aug 2018 22:20:07 +0200
-Subject: Fix_warnings_on_manpages
-
----
- data/desktop/remmina-gnome.1 | 1 -
- src/remmina.1 | 23 +++++------------------
- 2 files changed, 5 insertions(+), 19 deletions(-)
-
-diff --git a/data/desktop/remmina-gnome.1 b/data/desktop/remmina-gnome.1
-index 65360db..24683bd 100644
---- a/data/desktop/remmina-gnome.1
-+++ b/data/desktop/remmina-gnome.1
-@@ -13,4 +13,3 @@ added in the list of the available sessions.
- .Xr remmina 1
- .Sh AUTHORS
- .An Antenore Gatta Aq Mt antenore@simbiosi.org
--
-diff --git a/src/remmina.1 b/src/remmina.1
-index 8e5f9d2..17604e6 100644
---- a/src/remmina.1
-+++ b/src/remmina.1
-@@ -1,4 +1,4 @@
--.Dd 2016-10-04
-+.Dd 2018-08-01
- .Dt REMMINA 1
- .Sh NAME
- .Nm remmina
-@@ -19,15 +19,14 @@ administrators and travellers, who need to work with lots of remote computers
- in front of either large monitors or tiny netbooks. Remmina supports multiple
- network protocols in an integrated and consistent user interface.
- Currently RDP, VNC, SPICE, NX, XDMCP and SSH are supported.
--
-+.Lp
- Remmina is released in separated source packages:
--
-+.Lp
- "remmina", the main GTK+ application
- "remmina-plugins", a set of plugins
--
-+.Lp
- Remmina is free and open-source software, released under GNU GPL license.
- .Sh FILES
--.Tp
- \(Do\(lCXDG_CONFIG_DIRS\(rC/remmina.pref or \(Do\(lCXDG_CONFIG_HOME\(rC/remmina/remmina.pref :
- .Lp
- Remmina configuration files.
-@@ -35,7 +34,6 @@ Remmina configuration files.
- At the first Remmina execution the system wide Remmina configuration files,
- will be copied in the \(Do\(lCXDG_CONFIG_HOME\(rC
- .Lp
--.Tp
- \(Do\(lCXDG_DATA_DIRS\(rC/FILE.remmina or \(Do\(lCXDG_DATA_HOME\(rC/remmina/FILE.remmina :
- .Lp
- Remmina profiles, the file name is autogenerated, but you can create manually your
-@@ -46,42 +44,31 @@ own files with the \fBFILE\fR name you prefer.
- Show help options
- .It Fl a
- Show about dialog
--.Tp
- .It Fl c, -connect\fR=\fIFILE\fR
- Connect to a .remmina file
--.Tp
- .It Fl e, -edit\fR=\fIFILE\fR
- Edit a .remmina file
--.Tp
- .It Fl k, -kiosk\fR
- Start Remmina in kiosk mode (thin client)
--.Tp
- .It Fl n, -new\fR
- Create a new connection profile
--.Tp
- .It Fl p, -pref\fR=\fIPAGENR\fR
- Show preferences dialog page
--.Tp
- .It Fl x, -plugin\fR=\fIPLUGIN\fR
- Execute the plugin
--.Tp
- .It Fl q, -quit\fR
- Quit the application
--.Tp
- .It Fl s, -server\fR=\fISERVER\fR
- Use default server name (for \fB\-\-new\fR)
--.Tp
- .It Fl t, -protocol\fR=\fIPROTOCOL\fR
- Use default protocol (for \fB\-\-new\fR)
--.Tp
- .It Fl i, -icon\fR
- Start as tray icon
--.Tp
- .It Fl v, -version\fR
- Show the application's version
--.Tp
- .It Fl \-display\fR=\fIDISPLAY\fR
- X display to use
-+.El
- .Sh SEE ALSO
- .Sh AUTHORS
- Antenore Gatta <antenore at simbiosi dot org> and Giovanni Panozzo <giovanni at panozzo dot it>
diff --git a/debian/patches/0002-Fix_Cmake_rule_for_LibSSH.patch b/debian/patches/0002-Fix_Cmake_rule_for_LibSSH.patch
deleted file mode 100644
index 77976db..0000000
--- a/debian/patches/0002-Fix_Cmake_rule_for_LibSSH.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: "Matteo F. Vescovi" <mfv@debian.org>
-Date: Sun, 12 Aug 2018 14:22:40 +0200
-Subject: Fix_Cmake_rule_for_LibSSH
-
----
- cmake/FindLIBSSH.cmake | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/FindLIBSSH.cmake b/cmake/FindLIBSSH.cmake
-index f003e2d..d1bfe23 100644
---- a/cmake/FindLIBSSH.cmake
-+++ b/cmake/FindLIBSSH.cmake
-@@ -51,7 +51,11 @@ include(FindPackageHandleStandardArgs)
-
- find_package_handle_standard_args(LIBSSH DEFAULT_MSG LIBSSH_LIBRARY LIBSSH_INCLUDE_DIR)
-
--set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY} ${LIBSSH_THREADS_LIBRARY})
-+if (LIBSSH_THREADS_LIBRARY)
-+ set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY} ${LIBSSH_THREADS_LIBRARY})
-+else()
-+ set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY})
-+endif()
- set(LIBSSH_INCLUDE_DIRS ${LIBSSH_INCLUDE_DIR})
-
- mark_as_advanced(LIBSSH_INCLUDE_DIR LIBSSH_LIBRARY)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5138a57..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Fix_warnings_on_manpages.patch
-0002-Fix_Cmake_rule_for_LibSSH.patch