[X2Go-Commits] [x2gohtmlclient] 01/01: Rename x2goclient.js to x2gokdriveclient.js.
git-admin at x2go.org
git-admin at x2go.org
Wed Jun 23 20:59:41 CEST 2021
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gohtmlclient.
commit 2e4b7f5e73de92dec69eaee9d30d58dc0557db10
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Jun 23 20:55:48 2021 +0200
Rename x2goclient.js to x2gokdriveclient.js.
---
conf/nginx/sites-available/x2gohtmlclient-demo.conf | 2 +-
.../{libjs-x2goclient.conf => libjs-x2gokdriveclient.conf} | 2 +-
debian/control | 4 ++--
debian/libjs-x2goclient.dirs | 1 -
debian/libjs-x2goclient.install | 8 --------
debian/libjs-x2gokdriveclient.install | 8 ++++++++
debian/rules | 4 ++--
index.html | 2 +-
minify.sh | 4 ++--
package.json | 2 +-
10 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/conf/nginx/sites-available/x2gohtmlclient-demo.conf b/conf/nginx/sites-available/x2gohtmlclient-demo.conf
index 94bf319..1e68b82 100644
--- a/conf/nginx/sites-available/x2gohtmlclient-demo.conf
+++ b/conf/nginx/sites-available/x2gohtmlclient-demo.conf
@@ -55,7 +55,7 @@ server {
root /usr/share/x2gohtmlclient/demo;
- include snippets/libjs-x2goclient.conf;
+ include snippets/libjs-x2gokdriveclient.conf;
include snippets/x2gohtmlclient-css.conf;
include snippets/x2gohtmlclient-rpc.conf;
include snippets/x2gohtmlclient-wswrapper.conf;
diff --git a/conf/nginx/snippets/libjs-x2goclient.conf b/conf/nginx/snippets/libjs-x2gokdriveclient.conf
similarity index 97%
rename from conf/nginx/snippets/libjs-x2goclient.conf
rename to conf/nginx/snippets/libjs-x2gokdriveclient.conf
index fb7907a..5a6de38 100644
--- a/conf/nginx/snippets/libjs-x2goclient.conf
+++ b/conf/nginx/snippets/libjs-x2gokdriveclient.conf
@@ -9,7 +9,7 @@ location /x2go/x2gokdriveclient.html {
}
location /assets/js/ {
- alias /usr/share/javascript/x2goclient/;
+ alias /usr/share/javascript/x2gokdriveclient/;
add_header Strict-Transport-Security "max-age=31536000";
add_header Content-Security-Policy "default-src 'self' 'unsafe-inline' data: blob: ws: wss:; script-src 'self' 'unsafe-inline'";
add_header Feature-Policy "vibrate 'none' ; microphone 'none' ; camera 'none' ; gyroscope 'none' ; magnetometer 'none' ; geolocation 'none' ; midi 'self' ; notifications 'self' ; push 'self' ; sync-xhr 'self'";
diff --git a/debian/control b/debian/control
index 25bd509..cd47faa 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Vcs-Browser: https://code.x2go.org/gitweb?p=x2gohtmlclient.git;a=summary
Package: x2gohtmlclient
Architecture: any
Depends:
- libjs-x2goclient,
+ libjs-x2gokdriveclient,
${misc:Depends},
Recomends:
nginx,
@@ -43,7 +43,7 @@ Description: X2Go HTML5 Client (example html page)
This package contains a demo HTML site utilizing X2Go HTML5 Javascript
Client.
-Package: libjs-x2goclient
+Package: libjs-x2gokdriveclient
Architecture: any
Depends:
${misc:Depends},
diff --git a/debian/libjs-x2goclient.dirs b/debian/libjs-x2goclient.dirs
deleted file mode 100644
index 135d906..0000000
--- a/debian/libjs-x2goclient.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/x2goclient
\ No newline at end of file
diff --git a/debian/libjs-x2goclient.install b/debian/libjs-x2goclient.install
deleted file mode 100644
index 15dc687..0000000
--- a/debian/libjs-x2goclient.install
+++ /dev/null
@@ -1,8 +0,0 @@
-dist/x2goclient.js usr/share/javascript/x2goclient/
-dist/x2goclient.min.js usr/share/javascript/x2goclient/
-img/buttons/png/clip_*_close.png usr/share/x2gohtmlclient/img/
-img/buttons/png/attach.png usr/share/x2gohtmlclient/img/
-img/buttons/png/detach.png usr/share/x2gohtmlclient/img/
-img/backgrounds/svg/x2gobg.svg usr/share/x2gohtmlclient/img/
-conf/nginx/snippets/libjs-x2goclient.conf etc/nginx/snippets/
-x2gokdriveclient.html usr/share/x2gohtmlclient/
\ No newline at end of file
diff --git a/debian/libjs-x2gokdriveclient.install b/debian/libjs-x2gokdriveclient.install
new file mode 100644
index 0000000..b900f0f
--- /dev/null
+++ b/debian/libjs-x2gokdriveclient.install
@@ -0,0 +1,8 @@
+dist/x2gokdriveclient.js usr/share/javascript/x2gokdriveclient/
+dist/x2gokdriveclient.min.js usr/share/javascript/x2gokdriveclient/
+img/buttons/png/clip_*_close.png usr/share/x2gohtmlclient/img/
+img/buttons/png/attach.png usr/share/x2gohtmlclient/img/
+img/buttons/png/detach.png usr/share/x2gohtmlclient/img/
+img/backgrounds/svg/x2gobg.svg usr/share/x2gohtmlclient/img/
+conf/nginx/snippets/libjs-x2gokdriveclient.conf etc/nginx/snippets/
+x2gokdriveclient.html usr/share/x2gohtmlclient/
diff --git a/debian/rules b/debian/rules
index 7d55574..261076d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,5 +18,5 @@ override_dh_auto_build:
override_dh_auto_clean:
dh_auto_clean
- rm -f dist/x2goclient.js
- rm -f dist/x2goclient.min.js
+ rm -f dist/x2gokdriveclient.js
+ rm -f dist/x2gokdriveclient.min.js
diff --git a/index.html b/index.html
index 811e111..81b93c7 100644
--- a/index.html
+++ b/index.html
@@ -496,4 +496,4 @@ function getProxyPass()
</script>
<canvas id="canvas" width="1280" height="920" style="display:none;border:1px solid lightgrey;" tabindex='1' ></canvas>
-<script type="text/javascript" src="/assets/js/x2goclient.min.js"></script>
+<script type="text/javascript" src="/assets/js/x2gokdriveclient.min.js"></script>
diff --git a/minify.sh b/minify.sh
index fc96050..bebc361 100755
--- a/minify.sh
+++ b/minify.sh
@@ -17,5 +17,5 @@
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-cat src/x2godomcontroller.js src/x2gokdrivehtmlclient.js src/x2gohtmlclient.js > dist/x2goclient.js
-minify dist/x2goclient.js > dist/x2goclient.min.js
+cat src/x2godomcontroller.js src/x2gokdrivehtmlclient.js src/x2gohtmlclient.js > dist/x2gokdriveclient.js
+minify dist/x2gokdriveclient.js > dist/x2gokdriveclient.min.js
diff --git a/package.json b/package.json
index 0f00f8d..d825cac 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "x2gohtmlclient",
"version": "1.0.0",
"description": "X2Go HTML Client for X2GoKDrive",
- "main": "dist/x2goclient.js",
+ "main": "dist/x2gokdirveclient.js",
"scripts": {
"build": "./minifyjs.sh"
"test": "echo \"Error: no test specified\" && exit 1"
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gohtmlclient.git
More information about the x2go-commits
mailing list