From 23a0555bc94f530b78b7673526846099d60f0d6d Mon Sep 17 00:00:00 2001 From: totaam Date: Mon, 24 Oct 2022 11:01:07 +0700 Subject: [PATCH] move docs to fs/ and just keep a symlink at the top level --- docs | 1 + {docs => fs/share/doc/xpra}/Build/Debian.md | 0 {docs => fs/share/doc/xpra}/Build/Dependencies.md | 0 {docs => fs/share/doc/xpra}/Build/MSWindows.md | 0 {docs => fs/share/doc/xpra}/Build/MacOS.md | 0 {docs => fs/share/doc/xpra}/Build/Other.md | 0 {docs => fs/share/doc/xpra}/Build/README.md | 0 {docs => fs/share/doc/xpra}/Build/RPM.md | 0 {docs => fs/share/doc/xpra}/CHANGELOG.md | 0 {docs => fs/share/doc/xpra}/FAQ.md | 0 {docs => fs/share/doc/xpra}/Features/Audio.md | 0 {docs => fs/share/doc/xpra}/Features/Clipboard.md | 0 {docs => fs/share/doc/xpra}/Features/DPI.md | 0 {docs => fs/share/doc/xpra}/Features/Display.md | 0 .../share/doc/xpra}/Features/File-Transfers.md | 0 {docs => fs/share/doc/xpra}/Features/Image-Depth.md | 0 {docs => fs/share/doc/xpra}/Features/Keyboard.md | 0 .../share/doc/xpra}/Features/Notifications.md | 0 {docs => fs/share/doc/xpra}/Features/Printing.md | 0 {docs => fs/share/doc/xpra}/Features/README.md | 0 {docs => fs/share/doc/xpra}/Features/System-Tray.md | 0 {docs => fs/share/doc/xpra}/Features/Webcam.md | 0 {docs => fs/share/doc/xpra}/Network/AES.md | 0 {docs => fs/share/doc/xpra}/Network/Encryption.md | 0 .../share/doc/xpra}/Network/Multicast-DNS.md | 0 {docs => fs/share/doc/xpra}/Network/README.md | 0 {docs => fs/share/doc/xpra}/Network/SSH.md | 0 {docs => fs/share/doc/xpra}/Network/SSL.md | 0 {docs => fs/share/doc/xpra}/README.md | 0 {docs => fs/share/doc/xpra}/Usage/Apache-Proxy.md | 0 {docs => fs/share/doc/xpra}/Usage/Authentication.md | 0 {docs => fs/share/doc/xpra}/Usage/Client-OpenGL.md | 0 {docs => fs/share/doc/xpra}/Usage/Client.md | 0 {docs => fs/share/doc/xpra}/Usage/Configuration.md | 0 {docs => fs/share/doc/xpra}/Usage/Encodings.md | 0 {docs => fs/share/doc/xpra}/Usage/Logging.md | 0 {docs => fs/share/doc/xpra}/Usage/NVENC.md | 0 {docs => fs/share/doc/xpra}/Usage/OpenGL.md | 0 {docs => fs/share/doc/xpra}/Usage/Proxy-Server.md | 0 {docs => fs/share/doc/xpra}/Usage/README.md | 0 {docs => fs/share/doc/xpra}/Usage/Seamless.md | 0 {docs => fs/share/doc/xpra}/Usage/Security.md | 0 {docs => fs/share/doc/xpra}/Usage/Service.md | 0 {docs => fs/share/doc/xpra}/Usage/Shadow-Server.md | 0 {docs => fs/share/doc/xpra}/Usage/Start-Desktop.md | 0 {docs => fs/share/doc/xpra}/Usage/WSL.md | 0 {docs => fs/share/doc/xpra}/Usage/Xdummy.md | 0 {docs => fs/share/doc/xpra}/images/Xpra-Proxy.png | Bin {docs => fs/share/doc/xpra}/images/icons/X11.png | Bin .../share/doc/xpra}/images/icons/authentication.png | Bin .../share/doc/xpra}/images/icons/clipboard.png | Bin .../share/doc/xpra}/images/icons/connect.png | Bin {docs => fs/share/doc/xpra}/images/icons/debian.png | Bin .../share/doc/xpra}/images/icons/encoding.png | Bin .../share/doc/xpra}/images/icons/freebsd.png | Bin .../share/doc/xpra}/images/icons/keyboard.png | Bin {docs => fs/share/doc/xpra}/images/icons/mdns.png | Bin {docs => fs/share/doc/xpra}/images/icons/nvidia.png | Bin {docs => fs/share/doc/xpra}/images/icons/opengl.png | Bin {docs => fs/share/doc/xpra}/images/icons/osx.png | Bin .../share/doc/xpra}/images/icons/package.png | Bin .../share/doc/xpra}/images/icons/printer.png | Bin {docs => fs/share/doc/xpra}/images/icons/rpm.png | Bin .../doc/xpra}/images/icons/server-connected.png | Bin {docs => fs/share/doc/xpra}/images/icons/sound.png | Bin {docs => fs/share/doc/xpra}/images/icons/ssh.png | Bin {docs => fs/share/doc/xpra}/images/icons/ubuntu.png | Bin {docs => fs/share/doc/xpra}/images/icons/upload.png | Bin {docs => fs/share/doc/xpra}/images/icons/webcam.png | Bin .../share/doc/xpra}/images/icons/windows.png | Bin {docs => fs/share/doc/xpra}/images/mdns-gui.png | Bin .../share/doc/xpra}/images/pavucontrol-client.png | Bin .../share/doc/xpra}/images/pavucontrol-server.png | Bin .../share/doc/xpra}/images/session-info-graphs.png | Bin .../share/doc/xpra}/images/session-info-sound.png | Bin {docs => fs/share/doc/xpra}/images/upload.png | Bin .../doc/xpra}/images/win32-shadow-tray-menu.png | Bin packaging/MacOS/make-app.sh | 2 +- setup.py | 8 ++------ 79 files changed, 4 insertions(+), 7 deletions(-) create mode 120000 docs rename {docs => fs/share/doc/xpra}/Build/Debian.md (100%) rename {docs => fs/share/doc/xpra}/Build/Dependencies.md (100%) rename {docs => fs/share/doc/xpra}/Build/MSWindows.md (100%) rename {docs => fs/share/doc/xpra}/Build/MacOS.md (100%) rename {docs => fs/share/doc/xpra}/Build/Other.md (100%) rename {docs => fs/share/doc/xpra}/Build/README.md (100%) rename {docs => fs/share/doc/xpra}/Build/RPM.md (100%) rename {docs => fs/share/doc/xpra}/CHANGELOG.md (100%) rename {docs => fs/share/doc/xpra}/FAQ.md (100%) rename {docs => fs/share/doc/xpra}/Features/Audio.md (100%) rename {docs => fs/share/doc/xpra}/Features/Clipboard.md (100%) rename {docs => fs/share/doc/xpra}/Features/DPI.md (100%) rename {docs => fs/share/doc/xpra}/Features/Display.md (100%) rename {docs => fs/share/doc/xpra}/Features/File-Transfers.md (100%) rename {docs => fs/share/doc/xpra}/Features/Image-Depth.md (100%) rename {docs => fs/share/doc/xpra}/Features/Keyboard.md (100%) rename {docs => fs/share/doc/xpra}/Features/Notifications.md (100%) rename {docs => fs/share/doc/xpra}/Features/Printing.md (100%) rename {docs => fs/share/doc/xpra}/Features/README.md (100%) rename {docs => fs/share/doc/xpra}/Features/System-Tray.md (100%) rename {docs => fs/share/doc/xpra}/Features/Webcam.md (100%) rename {docs => fs/share/doc/xpra}/Network/AES.md (100%) rename {docs => fs/share/doc/xpra}/Network/Encryption.md (100%) rename {docs => fs/share/doc/xpra}/Network/Multicast-DNS.md (100%) rename {docs => fs/share/doc/xpra}/Network/README.md (100%) rename {docs => fs/share/doc/xpra}/Network/SSH.md (100%) rename {docs => fs/share/doc/xpra}/Network/SSL.md (100%) rename {docs => fs/share/doc/xpra}/README.md (100%) rename {docs => fs/share/doc/xpra}/Usage/Apache-Proxy.md (100%) rename {docs => fs/share/doc/xpra}/Usage/Authentication.md (100%) rename {docs => fs/share/doc/xpra}/Usage/Client-OpenGL.md (100%) rename {docs => fs/share/doc/xpra}/Usage/Client.md (100%) rename {docs => fs/share/doc/xpra}/Usage/Configuration.md (100%) rename {docs => fs/share/doc/xpra}/Usage/Encodings.md (100%) rename {docs => fs/share/doc/xpra}/Usage/Logging.md (100%) rename {docs => fs/share/doc/xpra}/Usage/NVENC.md (100%) rename {docs => fs/share/doc/xpra}/Usage/OpenGL.md (100%) rename {docs => fs/share/doc/xpra}/Usage/Proxy-Server.md (100%) rename {docs => fs/share/doc/xpra}/Usage/README.md (100%) rename {docs => fs/share/doc/xpra}/Usage/Seamless.md (100%) rename {docs => fs/share/doc/xpra}/Usage/Security.md (100%) rename {docs => fs/share/doc/xpra}/Usage/Service.md (100%) rename {docs => fs/share/doc/xpra}/Usage/Shadow-Server.md (100%) rename {docs => fs/share/doc/xpra}/Usage/Start-Desktop.md (100%) rename {docs => fs/share/doc/xpra}/Usage/WSL.md (100%) rename {docs => fs/share/doc/xpra}/Usage/Xdummy.md (100%) rename {docs => fs/share/doc/xpra}/images/Xpra-Proxy.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/X11.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/authentication.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/clipboard.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/connect.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/debian.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/encoding.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/freebsd.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/keyboard.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/mdns.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/nvidia.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/opengl.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/osx.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/package.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/printer.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/rpm.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/server-connected.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/sound.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/ssh.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/ubuntu.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/upload.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/webcam.png (100%) rename {docs => fs/share/doc/xpra}/images/icons/windows.png (100%) rename {docs => fs/share/doc/xpra}/images/mdns-gui.png (100%) rename {docs => fs/share/doc/xpra}/images/pavucontrol-client.png (100%) rename {docs => fs/share/doc/xpra}/images/pavucontrol-server.png (100%) rename {docs => fs/share/doc/xpra}/images/session-info-graphs.png (100%) rename {docs => fs/share/doc/xpra}/images/session-info-sound.png (100%) rename {docs => fs/share/doc/xpra}/images/upload.png (100%) rename {docs => fs/share/doc/xpra}/images/win32-shadow-tray-menu.png (100%) diff --git a/docs b/docs new file mode 120000 index 0000000000..2d8fb3c465 --- /dev/null +++ b/docs @@ -0,0 +1 @@ +fs/share/doc/xpra \ No newline at end of file diff --git a/docs/Build/Debian.md b/fs/share/doc/xpra/Build/Debian.md similarity index 100% rename from docs/Build/Debian.md rename to fs/share/doc/xpra/Build/Debian.md diff --git a/docs/Build/Dependencies.md b/fs/share/doc/xpra/Build/Dependencies.md similarity index 100% rename from docs/Build/Dependencies.md rename to fs/share/doc/xpra/Build/Dependencies.md diff --git a/docs/Build/MSWindows.md b/fs/share/doc/xpra/Build/MSWindows.md similarity index 100% rename from docs/Build/MSWindows.md rename to fs/share/doc/xpra/Build/MSWindows.md diff --git a/docs/Build/MacOS.md b/fs/share/doc/xpra/Build/MacOS.md similarity index 100% rename from docs/Build/MacOS.md rename to fs/share/doc/xpra/Build/MacOS.md diff --git a/docs/Build/Other.md b/fs/share/doc/xpra/Build/Other.md similarity index 100% rename from docs/Build/Other.md rename to fs/share/doc/xpra/Build/Other.md diff --git a/docs/Build/README.md b/fs/share/doc/xpra/Build/README.md similarity index 100% rename from docs/Build/README.md rename to fs/share/doc/xpra/Build/README.md diff --git a/docs/Build/RPM.md b/fs/share/doc/xpra/Build/RPM.md similarity index 100% rename from docs/Build/RPM.md rename to fs/share/doc/xpra/Build/RPM.md diff --git a/docs/CHANGELOG.md b/fs/share/doc/xpra/CHANGELOG.md similarity index 100% rename from docs/CHANGELOG.md rename to fs/share/doc/xpra/CHANGELOG.md diff --git a/docs/FAQ.md b/fs/share/doc/xpra/FAQ.md similarity index 100% rename from docs/FAQ.md rename to fs/share/doc/xpra/FAQ.md diff --git a/docs/Features/Audio.md b/fs/share/doc/xpra/Features/Audio.md similarity index 100% rename from docs/Features/Audio.md rename to fs/share/doc/xpra/Features/Audio.md diff --git a/docs/Features/Clipboard.md b/fs/share/doc/xpra/Features/Clipboard.md similarity index 100% rename from docs/Features/Clipboard.md rename to fs/share/doc/xpra/Features/Clipboard.md diff --git a/docs/Features/DPI.md b/fs/share/doc/xpra/Features/DPI.md similarity index 100% rename from docs/Features/DPI.md rename to fs/share/doc/xpra/Features/DPI.md diff --git a/docs/Features/Display.md b/fs/share/doc/xpra/Features/Display.md similarity index 100% rename from docs/Features/Display.md rename to fs/share/doc/xpra/Features/Display.md diff --git a/docs/Features/File-Transfers.md b/fs/share/doc/xpra/Features/File-Transfers.md similarity index 100% rename from docs/Features/File-Transfers.md rename to fs/share/doc/xpra/Features/File-Transfers.md diff --git a/docs/Features/Image-Depth.md b/fs/share/doc/xpra/Features/Image-Depth.md similarity index 100% rename from docs/Features/Image-Depth.md rename to fs/share/doc/xpra/Features/Image-Depth.md diff --git a/docs/Features/Keyboard.md b/fs/share/doc/xpra/Features/Keyboard.md similarity index 100% rename from docs/Features/Keyboard.md rename to fs/share/doc/xpra/Features/Keyboard.md diff --git a/docs/Features/Notifications.md b/fs/share/doc/xpra/Features/Notifications.md similarity index 100% rename from docs/Features/Notifications.md rename to fs/share/doc/xpra/Features/Notifications.md diff --git a/docs/Features/Printing.md b/fs/share/doc/xpra/Features/Printing.md similarity index 100% rename from docs/Features/Printing.md rename to fs/share/doc/xpra/Features/Printing.md diff --git a/docs/Features/README.md b/fs/share/doc/xpra/Features/README.md similarity index 100% rename from docs/Features/README.md rename to fs/share/doc/xpra/Features/README.md diff --git a/docs/Features/System-Tray.md b/fs/share/doc/xpra/Features/System-Tray.md similarity index 100% rename from docs/Features/System-Tray.md rename to fs/share/doc/xpra/Features/System-Tray.md diff --git a/docs/Features/Webcam.md b/fs/share/doc/xpra/Features/Webcam.md similarity index 100% rename from docs/Features/Webcam.md rename to fs/share/doc/xpra/Features/Webcam.md diff --git a/docs/Network/AES.md b/fs/share/doc/xpra/Network/AES.md similarity index 100% rename from docs/Network/AES.md rename to fs/share/doc/xpra/Network/AES.md diff --git a/docs/Network/Encryption.md b/fs/share/doc/xpra/Network/Encryption.md similarity index 100% rename from docs/Network/Encryption.md rename to fs/share/doc/xpra/Network/Encryption.md diff --git a/docs/Network/Multicast-DNS.md b/fs/share/doc/xpra/Network/Multicast-DNS.md similarity index 100% rename from docs/Network/Multicast-DNS.md rename to fs/share/doc/xpra/Network/Multicast-DNS.md diff --git a/docs/Network/README.md b/fs/share/doc/xpra/Network/README.md similarity index 100% rename from docs/Network/README.md rename to fs/share/doc/xpra/Network/README.md diff --git a/docs/Network/SSH.md b/fs/share/doc/xpra/Network/SSH.md similarity index 100% rename from docs/Network/SSH.md rename to fs/share/doc/xpra/Network/SSH.md diff --git a/docs/Network/SSL.md b/fs/share/doc/xpra/Network/SSL.md similarity index 100% rename from docs/Network/SSL.md rename to fs/share/doc/xpra/Network/SSL.md diff --git a/docs/README.md b/fs/share/doc/xpra/README.md similarity index 100% rename from docs/README.md rename to fs/share/doc/xpra/README.md diff --git a/docs/Usage/Apache-Proxy.md b/fs/share/doc/xpra/Usage/Apache-Proxy.md similarity index 100% rename from docs/Usage/Apache-Proxy.md rename to fs/share/doc/xpra/Usage/Apache-Proxy.md diff --git a/docs/Usage/Authentication.md b/fs/share/doc/xpra/Usage/Authentication.md similarity index 100% rename from docs/Usage/Authentication.md rename to fs/share/doc/xpra/Usage/Authentication.md diff --git a/docs/Usage/Client-OpenGL.md b/fs/share/doc/xpra/Usage/Client-OpenGL.md similarity index 100% rename from docs/Usage/Client-OpenGL.md rename to fs/share/doc/xpra/Usage/Client-OpenGL.md diff --git a/docs/Usage/Client.md b/fs/share/doc/xpra/Usage/Client.md similarity index 100% rename from docs/Usage/Client.md rename to fs/share/doc/xpra/Usage/Client.md diff --git a/docs/Usage/Configuration.md b/fs/share/doc/xpra/Usage/Configuration.md similarity index 100% rename from docs/Usage/Configuration.md rename to fs/share/doc/xpra/Usage/Configuration.md diff --git a/docs/Usage/Encodings.md b/fs/share/doc/xpra/Usage/Encodings.md similarity index 100% rename from docs/Usage/Encodings.md rename to fs/share/doc/xpra/Usage/Encodings.md diff --git a/docs/Usage/Logging.md b/fs/share/doc/xpra/Usage/Logging.md similarity index 100% rename from docs/Usage/Logging.md rename to fs/share/doc/xpra/Usage/Logging.md diff --git a/docs/Usage/NVENC.md b/fs/share/doc/xpra/Usage/NVENC.md similarity index 100% rename from docs/Usage/NVENC.md rename to fs/share/doc/xpra/Usage/NVENC.md diff --git a/docs/Usage/OpenGL.md b/fs/share/doc/xpra/Usage/OpenGL.md similarity index 100% rename from docs/Usage/OpenGL.md rename to fs/share/doc/xpra/Usage/OpenGL.md diff --git a/docs/Usage/Proxy-Server.md b/fs/share/doc/xpra/Usage/Proxy-Server.md similarity index 100% rename from docs/Usage/Proxy-Server.md rename to fs/share/doc/xpra/Usage/Proxy-Server.md diff --git a/docs/Usage/README.md b/fs/share/doc/xpra/Usage/README.md similarity index 100% rename from docs/Usage/README.md rename to fs/share/doc/xpra/Usage/README.md diff --git a/docs/Usage/Seamless.md b/fs/share/doc/xpra/Usage/Seamless.md similarity index 100% rename from docs/Usage/Seamless.md rename to fs/share/doc/xpra/Usage/Seamless.md diff --git a/docs/Usage/Security.md b/fs/share/doc/xpra/Usage/Security.md similarity index 100% rename from docs/Usage/Security.md rename to fs/share/doc/xpra/Usage/Security.md diff --git a/docs/Usage/Service.md b/fs/share/doc/xpra/Usage/Service.md similarity index 100% rename from docs/Usage/Service.md rename to fs/share/doc/xpra/Usage/Service.md diff --git a/docs/Usage/Shadow-Server.md b/fs/share/doc/xpra/Usage/Shadow-Server.md similarity index 100% rename from docs/Usage/Shadow-Server.md rename to fs/share/doc/xpra/Usage/Shadow-Server.md diff --git a/docs/Usage/Start-Desktop.md b/fs/share/doc/xpra/Usage/Start-Desktop.md similarity index 100% rename from docs/Usage/Start-Desktop.md rename to fs/share/doc/xpra/Usage/Start-Desktop.md diff --git a/docs/Usage/WSL.md b/fs/share/doc/xpra/Usage/WSL.md similarity index 100% rename from docs/Usage/WSL.md rename to fs/share/doc/xpra/Usage/WSL.md diff --git a/docs/Usage/Xdummy.md b/fs/share/doc/xpra/Usage/Xdummy.md similarity index 100% rename from docs/Usage/Xdummy.md rename to fs/share/doc/xpra/Usage/Xdummy.md diff --git a/docs/images/Xpra-Proxy.png b/fs/share/doc/xpra/images/Xpra-Proxy.png similarity index 100% rename from docs/images/Xpra-Proxy.png rename to fs/share/doc/xpra/images/Xpra-Proxy.png diff --git a/docs/images/icons/X11.png b/fs/share/doc/xpra/images/icons/X11.png similarity index 100% rename from docs/images/icons/X11.png rename to fs/share/doc/xpra/images/icons/X11.png diff --git a/docs/images/icons/authentication.png b/fs/share/doc/xpra/images/icons/authentication.png similarity index 100% rename from docs/images/icons/authentication.png rename to fs/share/doc/xpra/images/icons/authentication.png diff --git a/docs/images/icons/clipboard.png b/fs/share/doc/xpra/images/icons/clipboard.png similarity index 100% rename from docs/images/icons/clipboard.png rename to fs/share/doc/xpra/images/icons/clipboard.png diff --git a/docs/images/icons/connect.png b/fs/share/doc/xpra/images/icons/connect.png similarity index 100% rename from docs/images/icons/connect.png rename to fs/share/doc/xpra/images/icons/connect.png diff --git a/docs/images/icons/debian.png b/fs/share/doc/xpra/images/icons/debian.png similarity index 100% rename from docs/images/icons/debian.png rename to fs/share/doc/xpra/images/icons/debian.png diff --git a/docs/images/icons/encoding.png b/fs/share/doc/xpra/images/icons/encoding.png similarity index 100% rename from docs/images/icons/encoding.png rename to fs/share/doc/xpra/images/icons/encoding.png diff --git a/docs/images/icons/freebsd.png b/fs/share/doc/xpra/images/icons/freebsd.png similarity index 100% rename from docs/images/icons/freebsd.png rename to fs/share/doc/xpra/images/icons/freebsd.png diff --git a/docs/images/icons/keyboard.png b/fs/share/doc/xpra/images/icons/keyboard.png similarity index 100% rename from docs/images/icons/keyboard.png rename to fs/share/doc/xpra/images/icons/keyboard.png diff --git a/docs/images/icons/mdns.png b/fs/share/doc/xpra/images/icons/mdns.png similarity index 100% rename from docs/images/icons/mdns.png rename to fs/share/doc/xpra/images/icons/mdns.png diff --git a/docs/images/icons/nvidia.png b/fs/share/doc/xpra/images/icons/nvidia.png similarity index 100% rename from docs/images/icons/nvidia.png rename to fs/share/doc/xpra/images/icons/nvidia.png diff --git a/docs/images/icons/opengl.png b/fs/share/doc/xpra/images/icons/opengl.png similarity index 100% rename from docs/images/icons/opengl.png rename to fs/share/doc/xpra/images/icons/opengl.png diff --git a/docs/images/icons/osx.png b/fs/share/doc/xpra/images/icons/osx.png similarity index 100% rename from docs/images/icons/osx.png rename to fs/share/doc/xpra/images/icons/osx.png diff --git a/docs/images/icons/package.png b/fs/share/doc/xpra/images/icons/package.png similarity index 100% rename from docs/images/icons/package.png rename to fs/share/doc/xpra/images/icons/package.png diff --git a/docs/images/icons/printer.png b/fs/share/doc/xpra/images/icons/printer.png similarity index 100% rename from docs/images/icons/printer.png rename to fs/share/doc/xpra/images/icons/printer.png diff --git a/docs/images/icons/rpm.png b/fs/share/doc/xpra/images/icons/rpm.png similarity index 100% rename from docs/images/icons/rpm.png rename to fs/share/doc/xpra/images/icons/rpm.png diff --git a/docs/images/icons/server-connected.png b/fs/share/doc/xpra/images/icons/server-connected.png similarity index 100% rename from docs/images/icons/server-connected.png rename to fs/share/doc/xpra/images/icons/server-connected.png diff --git a/docs/images/icons/sound.png b/fs/share/doc/xpra/images/icons/sound.png similarity index 100% rename from docs/images/icons/sound.png rename to fs/share/doc/xpra/images/icons/sound.png diff --git a/docs/images/icons/ssh.png b/fs/share/doc/xpra/images/icons/ssh.png similarity index 100% rename from docs/images/icons/ssh.png rename to fs/share/doc/xpra/images/icons/ssh.png diff --git a/docs/images/icons/ubuntu.png b/fs/share/doc/xpra/images/icons/ubuntu.png similarity index 100% rename from docs/images/icons/ubuntu.png rename to fs/share/doc/xpra/images/icons/ubuntu.png diff --git a/docs/images/icons/upload.png b/fs/share/doc/xpra/images/icons/upload.png similarity index 100% rename from docs/images/icons/upload.png rename to fs/share/doc/xpra/images/icons/upload.png diff --git a/docs/images/icons/webcam.png b/fs/share/doc/xpra/images/icons/webcam.png similarity index 100% rename from docs/images/icons/webcam.png rename to fs/share/doc/xpra/images/icons/webcam.png diff --git a/docs/images/icons/windows.png b/fs/share/doc/xpra/images/icons/windows.png similarity index 100% rename from docs/images/icons/windows.png rename to fs/share/doc/xpra/images/icons/windows.png diff --git a/docs/images/mdns-gui.png b/fs/share/doc/xpra/images/mdns-gui.png similarity index 100% rename from docs/images/mdns-gui.png rename to fs/share/doc/xpra/images/mdns-gui.png diff --git a/docs/images/pavucontrol-client.png b/fs/share/doc/xpra/images/pavucontrol-client.png similarity index 100% rename from docs/images/pavucontrol-client.png rename to fs/share/doc/xpra/images/pavucontrol-client.png diff --git a/docs/images/pavucontrol-server.png b/fs/share/doc/xpra/images/pavucontrol-server.png similarity index 100% rename from docs/images/pavucontrol-server.png rename to fs/share/doc/xpra/images/pavucontrol-server.png diff --git a/docs/images/session-info-graphs.png b/fs/share/doc/xpra/images/session-info-graphs.png similarity index 100% rename from docs/images/session-info-graphs.png rename to fs/share/doc/xpra/images/session-info-graphs.png diff --git a/docs/images/session-info-sound.png b/fs/share/doc/xpra/images/session-info-sound.png similarity index 100% rename from docs/images/session-info-sound.png rename to fs/share/doc/xpra/images/session-info-sound.png diff --git a/docs/images/upload.png b/fs/share/doc/xpra/images/upload.png similarity index 100% rename from docs/images/upload.png rename to fs/share/doc/xpra/images/upload.png diff --git a/docs/images/win32-shadow-tray-menu.png b/fs/share/doc/xpra/images/win32-shadow-tray-menu.png similarity index 100% rename from docs/images/win32-shadow-tray-menu.png rename to fs/share/doc/xpra/images/win32-shadow-tray-menu.png diff --git a/packaging/MacOS/make-app.sh b/packaging/MacOS/make-app.sh index d1365d7913..f7b2b0a120 100755 --- a/packaging/MacOS/make-app.sh +++ b/packaging/MacOS/make-app.sh @@ -312,7 +312,7 @@ echo " * fixup pixbuf loader" sed -i '' -e "s+@executable_path/++g" "${RSCDIR}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" echo " * docs" -if [ -d "${JHBUILD_PREFIX}/share/xpra/doc" ]; then +if [ -d "${JHBUILD_PREFIX}/share/doc/xpra" ]; then mkdir -p ${RSCDIR}/share/doc/xpra rsync -rplogt ${JHBUILD_PREFIX}/share/doc/xpra/* ${RSCDIR}/share/doc/xpra/ fi diff --git a/setup.py b/setup.py index 1bb9038269..4d41670aa6 100755 --- a/setup.py +++ b/setup.py @@ -1746,12 +1746,8 @@ def addconf(name, dst_name=None): copytodir("fs/etc/dbus-1/system.d/xpra.conf", "/etc/dbus-1/system.d") if docs_ENABLED: - if WIN32 or OSX: - #keep everything in our own directory: - doc_dir = f"{self.install_dir}/share/xpra/doc" - else: - doc_dir = f"{self.install_dir}/share/doc/xpra/" - convert_doc_dir("./docs", doc_dir) + doc_dir = f"{self.install_dir}/share/doc/xpra/" + convert_doc_dir("./fs/share/doc/xpra", doc_dir) if data_ENABLED: for d in ("http-headers", "content-type", "content-categories", "content-parent"):