From c4c2abed48977c3b9f4f721f84ec30abf2a40e2f Mon Sep 17 00:00:00 2001 From: "Antenore Gatta (tmow)" Date: Wed, 30 Jun 2021 11:54:35 +0200 Subject: Updating to Debian and plugins cleaning-up Signed-off-by: Antenore Gatta (tmow) --- debian/README.NX | 16 ------ debian/changelog | 6 +++ debian/compat | 1 - debian/control | 92 ++++++++++++++-------------------- debian/copyright | 21 ++++++++ debian/patches/0001-Fix_manpages.patch | 56 +++++++++++++++++++++ debian/patches/series | 1 + debian/remmina-plugin-kiosk.install | 3 ++ debian/remmina-plugin-kwallet.install | 1 - debian/remmina-plugin-nx.docs | 1 - debian/remmina-plugin-nx.install | 1 - debian/remmina-plugin-xdmcp.install | 1 - debian/remmina.1 | 21 -------- debian/remmina.install | 2 +- debian/remmina.manpages | 2 +- debian/upstream/metadata | 6 +++ debian/watch | 8 ++- 17 files changed, 138 insertions(+), 101 deletions(-) delete mode 100644 debian/README.NX delete mode 100644 debian/compat create mode 100644 debian/patches/0001-Fix_manpages.patch create mode 100644 debian/patches/series create mode 100644 debian/remmina-plugin-kiosk.install delete mode 100644 debian/remmina-plugin-nx.docs delete mode 100644 debian/remmina-plugin-nx.install delete mode 100644 debian/remmina-plugin-xdmcp.install delete mode 100644 debian/remmina.1 create mode 100644 debian/upstream/metadata diff --git a/debian/README.NX b/debian/README.NX deleted file mode 100644 index 8ed10e3..0000000 --- a/debian/README.NX +++ /dev/null @@ -1,16 +0,0 @@ -A short warning on NX technology --------------------------------- - -Other than RDP or VNC, NX connects a remote X11 session directly to -your local X11 session. So from a security perspective, connecting -to an NX based X11 sessions is very similar to running ssh -X (with -all insecurity implications this may have). - -However, the performance that gets introduced with NX technology is -much better compared to normall X11 forwarding via SSH. - -This could have security implications you should consider before -using the NX technology. - -More information can be found on the nxproxy documentation, available -on /usr/share/doc/nxproxy/README.NX-technology+security diff --git a/debian/changelog b/debian/changelog index 30b38d8..5639f22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +remmina (1.4.19-1+ppa1.3) unstable; urgency=medium + + * Aligned to debian and removed deprecated plugins (WIP). + + -- Antenore Gatta Wed, 30 Jun 2021 11:51:57 +0200 + remmina (1.4.19-1+ppa1.2) unstable; urgency=medium * Using ayatana diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index f99c163..f929da8 100644 --- a/debian/control +++ b/debian/control @@ -6,14 +6,15 @@ Uploaders: Antenore Gatta , Giovanni Panozzo Build-Depends: - cmake (>= 2.8), - debhelper (>= 9~), + cmake (>= 3.5), + debhelper-compat (= 13), libfreerdp-dev (>= 2.0.0~) | freerdp2-dev (>= 2.2.0~), intltool, libayatana-appindicator3-dev, libavahi-ui-gtk3-dev (>= 0.6.0), libcups2-dev, libgcrypt-dev | libgcrypt20-dev, + libglib2.0-dev, libgnutls-dev | libgnutls28-dev, libgtk-3-dev, libjavascriptcoregtk-4.0-dev | libjavascriptcoregtk-3.0-dev, @@ -22,8 +23,9 @@ Build-Depends: libkf5wallet-dev, libpcre2-dev, libsecret-1-dev, - libsoup2.4-dev, libsodium-dev, + libsoup2.4-dev, + libspice-client-glib-2.0-dev, libspice-client-gtk-3.0-dev, libspice-protocol-dev, libssh-dev (>= 0.6), @@ -31,8 +33,11 @@ Build-Depends: libvte-2.91-dev | libvte-2.90-dev, libwebkit2gtk-4.0-dev | libwebkit2gtk-3.0-dev, libxkbfile-dev -Standards-Version: 4.1.4 +Standards-Version: 4.5.1 +Rules-Requires-Root: no Homepage: http://www.remmina.org/ +Vcs-Git: https://gitlab.com/Remmina/Remmina-Ubuntu-PPA.git +Vcs-Browser: https://gitlab.com/Remmina/Remmina-Ubuntu-PPA Package: remmina Architecture: any @@ -46,13 +51,11 @@ Depends: Recommends: remmina-plugin-rdp, remmina-plugin-vnc, - remmina-plugin-secret, - remmina-plugin-spice + remmina-plugin-secret Suggests: - remmina-plugin-nx, remmina-plugin-exec, remmina-plugin-kwallet, - remmina-plugin-xdmcp, + remmina-plugin-spice, remmina-plugin-www Description: GTK+ Remote Desktop Client Remmina is a remote desktop client written in GTK+, aiming to be @@ -63,7 +66,7 @@ Description: GTK+ Remote Desktop Client Remmina supports multiple network protocols in an integrated and consistent user interface. . - Currently RDP, VNC, SPICE, WWW, NX, XDMCP and SSH are supported. + Currently RDP, VNC, SPICE, WWW, EXEC and SSH are supported. Package: remmina-common Architecture: all @@ -144,36 +147,14 @@ Description: VNC plugin for Remmina . This package contains the VNC plugin for Remmina. -Package: remmina-plugin-xdmcp -Architecture: any -Multi-Arch: same -Depends: - ${shlibs:Depends}, - ${misc:Depends}, - remmina (= ${binary:Version}), - xserver-xephyr -Description: XDMCP plugin for Remmina - Remmina is a remote desktop client written in GTK+, aiming to be - useful for system 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, WWW, NX, XDMCP, EXEC and SSH are supported. - . - This package contains the XDMCP plugin for Remmina. - -Package: remmina-plugin-nx +Package: remmina-plugin-spice Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, remmina (= ${binary:Version}), - nxproxy -Description: NX plugin for Remmina +Description: Spice plugin for Remmina Remmina is a remote desktop client written in GTK+, aiming to be useful for system administrators and travellers, who need to work with lots of remote computers in front of either large monitors or @@ -184,16 +165,18 @@ Description: NX plugin for Remmina . Currently RDP, VNC, SPICE, WWW, NX, XDMCP, EXEC and SSH are supported. . - This package contains the NX plugin for Remmina. + This package contains the Spice plugin for Remmina. -Package: remmina-plugin-spice +Package: remmina-plugin-secret Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, - remmina (= ${binary:Version}), -Description: Spice plugin for Remmina + remmina (= ${binary:Version}) +Breaks: remmina-plugin-gnome +Replaces: remmina-plugin-gnome +Description: Secret plugin for Remmina Remmina is a remote desktop client written in GTK+, aiming to be useful for system administrators and travellers, who need to work with lots of remote computers in front of either large monitors or @@ -204,16 +187,18 @@ Description: Spice plugin for Remmina . Currently RDP, VNC, SPICE, WWW, NX, XDMCP, EXEC and SSH are supported. . - This package contains the Spice plugin for Remmina. + This package contains the secret plugin for Remmina, which + allows one to store and retrieve passwords from GNOME Keyring + or KWallet. -Package: remmina-plugin-www +Package: remmina-plugin-exec Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, - remmina (= ${binary:Version}), -Description: WWW plugin for Remmina + remmina (= ${binary:Version}) +Description: EXEC plugin for Remmina Remmina is a remote desktop client written in GTK+, aiming to be useful for system administrators and travellers, who need to work with lots of remote computers in front of either large monitors or @@ -224,18 +209,16 @@ Description: WWW plugin for Remmina . Currently RDP, VNC, SPICE, WWW, NX, XDMCP, EXEC and SSH are supported. . - This package contains the WWW plugin for Remmina, used to open Web based consoles. + This package contains the EXEC plugin for Remmina. -Package: remmina-plugin-secret +Package: remmina-plugin-kwallet Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, remmina (= ${binary:Version}) -Breaks: remmina-plugin-gnome -Replaces: remmina-plugin-gnome -Description: Secret plugin for Remmina +Description: KWallet plugin for Remmina Remmina is a remote desktop client written in GTK+, aiming to be useful for system administrators and travellers, who need to work with lots of remote computers in front of either large monitors or @@ -246,17 +229,17 @@ Description: Secret plugin for Remmina . Currently RDP, VNC, SPICE, WWW, NX, XDMCP, EXEC and SSH are supported. . - This package contains the secret plugin for Remmina, which - allows one to store and retrieve passwords from GNOME Keyring. + This package contains the KWallet plugin for Remmina, which + allows one to store and retrieve passwords using the KDE wallet. -Package: remmina-plugin-kwallet +Package: remmina-plugin-www Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, remmina (= ${binary:Version}) -Description: KWallet plugin for Remmina +Description: WWW plugin for Remmina Remmina is a remote desktop client written in GTK+, aiming to be useful for system administrators and travellers, who need to work with lots of remote computers in front of either large monitors or @@ -267,17 +250,16 @@ Description: KWallet plugin for Remmina . Currently RDP, VNC, SPICE, WWW, NX, XDMCP, EXEC and SSH are supported. . - This package contains the KWallet plugin for Remmina, which - allows one to store and retrieve passwords using the KDE wallet. + This package contains the WWW plugin for Remmina, used to open Web based consoles. -Package: remmina-plugin-exec +Package: remmina-plugin-kiosk Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, remmina (= ${binary:Version}) -Description: EXEC plugin for Remmina +Description: Kiosk plugin for Remmina Remmina is a remote desktop client written in GTK+, aiming to be useful for system administrators and travellers, who need to work with lots of remote computers in front of either large monitors or @@ -288,4 +270,4 @@ Description: EXEC plugin for Remmina . Currently RDP, VNC, SPICE, WWW, NX, XDMCP, EXEC and SSH are supported. . - This package contains the EXEC plugin for Remmina. + This package contains the Kiosk plugin for Remmina. diff --git a/debian/copyright b/debian/copyright index 7cf82d1..30ebbb7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,9 +5,11 @@ Source: http://www.remmina.org/ Files-Excluded: .github .gitignore + .gitlab-ci.yml .gitmodules .travis.yml _config.yml + data/reports flatpak scripts snap @@ -30,6 +32,11 @@ Files: cmake/FindOptionalPackage.cmake Copyright: 2011, Nils Andresen License: Apache-2.0 +Files: data/desktop/org.remmina.Remmina.appdata.xml +Copyright: 2019 Antenore Gatta + 2019 Giovanni Panozzo +License: CC0-1.0 + Files: debian/* Copyright: 2009-2015 Luca Falavigna 2015-2017 Jörg Frings-Fürst @@ -84,3 +91,17 @@ License: Apache-2.0 . On Debian systems, the full text of the Apache License version 2.0 can be found in the file `/usr/share/common-licenses/Apache-2.0'. + +License: CC0-1.0 + This license is acceptable for Free Cultural Works. + . + * The person who associated a work with this document has dedicated + this work to the Commons by waiving all of his or her rights to the + work under copyright law and all related or neighboring legal + rights he or she had in the work, to the extent allowable by law. + . + * Other Rights — In no way are any of the following rights affected by CC0: + - Patent or trademark rights held by the person who + associated this document with a work. + - Rights other persons may have either in the work itself or + in how the work is used, such as publicity or privacy rights. diff --git a/debian/patches/0001-Fix_manpages.patch b/debian/patches/0001-Fix_manpages.patch new file mode 100644 index 0000000..9a46429 --- /dev/null +++ b/debian/patches/0001-Fix_manpages.patch @@ -0,0 +1,56 @@ +From: "Matteo F. Vescovi" +Date: Sat, 22 May 2021 23:17:29 +0200 +Forwarded: not-needed +Subject: Fix_manpages + +--- + data/desktop/remmina-gnome.1 | 6 +++--- + src/remmina.1 | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/data/desktop/remmina-gnome.1 b/data/desktop/remmina-gnome.1 +index d0fe6d7..fcbc10d 100644 +--- a/data/desktop/remmina-gnome.1 ++++ b/data/desktop/remmina-gnome.1 +@@ -11,14 +11,14 @@ If you have a freedesktop compliant Login Manager, a Remmina kiosk mode will be + added in the list of available sessions. + .Sh USAGE + Ports from the 5901-5999 range map directly to VNC displays numbered 1-99. +- ++.Lp + For example, to connect to server at 192.168.0.1 to the screen :1, + write the IP address 192.168.0.1 in the address field. +- ++.Lp + To connect to display number :2, refer to the display number by writing + the address as 192.168.0.1:2. Another way is to refer to the port by specifying + the address as 192.168.0.1:5902. + .Sh SEE ALSO + .Xr remmina 1 + .Sh AUTHORS +-.An Antenore Gatta Aq Mt antenore@simbiosi.org +\ No newline at end of file ++.An Antenore Gatta Aq Mt antenore@simbiosi.org +diff --git a/src/remmina.1 b/src/remmina.1 +index 41f452f..0a07470 100644 +--- a/src/remmina.1 ++++ b/src/remmina.1 +@@ -95,15 +95,15 @@ remmina -c vnc://username@server + remmina -c vnc://server?VncUsername=username + remmina -c ssh://user@server + remmina -c spice://server +- ++.Lp + To quick connect using a URI along with an encrypted password: + remmina -c rdp://username:encrypted-password@server + remmina -c vnc://username:encrypted-password@server + remmina -c vnc://server?VncUsername=username\\&VncPassword=encrypted-password +- ++.Lp + To encrypt a password for use with a URI: + remmina --encrypt-password +- ++.Lp + .fi + .RE + .Lp diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..86cc30d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Fix_manpages.patch diff --git a/debian/remmina-plugin-kiosk.install b/debian/remmina-plugin-kiosk.install new file mode 100644 index 0000000..4081456 --- /dev/null +++ b/debian/remmina-plugin-kiosk.install @@ -0,0 +1,3 @@ +usr/bin/gnome-session-remmina +usr/share/gnome-session +usr/share/xsessions diff --git a/debian/remmina-plugin-kwallet.install b/debian/remmina-plugin-kwallet.install index 08d43a7..c054fd2 100644 --- a/debian/remmina-plugin-kwallet.install +++ b/debian/remmina-plugin-kwallet.install @@ -1,2 +1 @@ usr/lib/*/remmina/plugins/remmina-plugin-kwallet.so - diff --git a/debian/remmina-plugin-nx.docs b/debian/remmina-plugin-nx.docs deleted file mode 100644 index 4f98be6..0000000 --- a/debian/remmina-plugin-nx.docs +++ /dev/null @@ -1 +0,0 @@ -debian/README.NX diff --git a/debian/remmina-plugin-nx.install b/debian/remmina-plugin-nx.install deleted file mode 100644 index 1a28eb9..0000000 --- a/debian/remmina-plugin-nx.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/remmina/plugins/remmina-plugin-nx.so diff --git a/debian/remmina-plugin-xdmcp.install b/debian/remmina-plugin-xdmcp.install deleted file mode 100644 index 64b5fa4..0000000 --- a/debian/remmina-plugin-xdmcp.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/remmina/plugins/remmina-plugin-xdmcp.so diff --git a/debian/remmina.1 b/debian/remmina.1 deleted file mode 100644 index 0eddf67..0000000 --- a/debian/remmina.1 +++ /dev/null @@ -1,21 +0,0 @@ -.TH remmina 1 2009-12-12 "remmina" -.SH NAME -remmina \- remote desktop client for GNOME desktop environment -.SH SYNOPSIS -.B remmina -.SH DESCRIPTION -Remmina is a remote desktop connection client able to display and control a -remote desktop session. It can connect to a VNC platform as well as windows -terminal servers. -.SH AUTHORS -Remmina was written by Vic Lee -.PP -This manual page was written by Luca Falavigna -.SH COPYRIGHT -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any -later version. -.PP -On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-2' diff --git a/debian/remmina.install b/debian/remmina.install index a070ea0..8e93bf0 100644 --- a/debian/remmina.install +++ b/debian/remmina.install @@ -1,4 +1,4 @@ -usr/bin +usr/bin/remmina* usr/share/applications usr/share/metainfo usr/share/mime diff --git a/debian/remmina.manpages b/debian/remmina.manpages index 8dbc759..4450a71 100644 --- a/debian/remmina.manpages +++ b/debian/remmina.manpages @@ -1 +1 @@ -debian/remmina.1 +debian/tmp/usr/share/man/man1/*.1 diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..bfb74da --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,6 @@ +--- +Bug-Database: https://gitlab.com/Remmina/Remmina/issues +Bug-Submit: https://gitlab.com/Remmina/Remmina/issues/new +Name: Remmina +Repository: https://gitlab.com/Remmina/Remmina/Remmina.git +Repository-Browse: https://gitlab.com/Remmina/Remmina diff --git a/debian/watch b/debian/watch index 27fa722..33f6f69 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,6 @@ -version=3 -https://github.com/FreeRDP/Remmina/releases /FreeRDP/Remmina/archive/v(.+)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) +version=4 +opts="dversionmangle=s%\+dfsg\d*$%%, \ +filenamemangle=s%.*\/archive\/v(\d\S+)\/Remmina.*\.tar\.gz%remmina-$1\.tar\.gz%, \ +repack, \ +repacksuffix=+dfsg" \ +https://gitlab.com/Remmina/Remmina/tags?sort=updated_desc .*/archive/v(\d\S+)/.*\.tar\.gz -- cgit v1.2.3