update ppa

4 files changed, 35 insertions, 95 deletions

diff --git a/scripts/debian/changelog b/scripts/debian/changelog
index df050f8e0..50bbeab84 100644
--- a/scripts/debian/changelog
+++ b/scripts/debian/changelog
@@ -1,89 +1,5 @@
-xmake (2.1.5-1) yakkety; urgency=medium
+xmake (2.3.6-1) xenial; urgency=medium
 
-  * update 2.1.5
+  * update 2.3.6
 
- -- ruki <[email protected]>  Thu, 05 Aug 2017 21:22:12 +0800
-
-xmake (2.1.4-1) yakkety; urgency=medium
-
-  * update 2.1.4
-
- -- ruki <[email protected]>  Thu, 06 Apr 2017 21:22:12 +0800
-
-xmake (2.1.3-13) yakkety; urgency=medium
-
-  * add uninstall
-
- -- ruki <[email protected]>  Thu, 06 Apr 2017 21:22:12 +0800
-
-xmake (2.1.3-12) yakkety; urgency=medium
-
-  * fix bin dir
-
- -- ruki <[email protected]>  Thu, 06 Apr 2017 21:22:12 +0800
-
-xmake (2.1.3-11) yakkety; urgency=medium
-
-  * modify install path
-
- -- ruki <[email protected]>  Thu, 06 Apr 2017 21:22:12 +0800
-
-xmake (2.1.3-10) yakkety; urgency=medium
-
-  * modify install script
-
- -- ruki <[email protected]>  Thu, 06 Apr 2017 21:22:12 +0800
-
-xmake (2.1.3-9) yakkety; urgency=medium
-
-  * remove test xmake
-
- -- ruki <[email protected]>  Thu, 06 Apr 2017 21:22:12 +0800
-
-xmake (2.1.3-8) yakkety; urgency=medium
-
-  * fix binary dir for install debian
-
- -- ruki <[email protected]>  Thu, 06 Apr 2017 21:22:12 +0800
-
-xmake (2.1.3-7) yakkety; urgency=medium
-
-  * modify install dir
-
- -- ruki <[email protected]>  Thu, 06 Apr 2017 21:22:12 +0800
-
-xmake (2.1.3-6) yakkety; urgency=medium
-
-  * remove sudo for install
-
- -- ruki <[email protected]>  Thu, 06 Apr 2017 21:22:12 +0800
-
-xmake (2.1.3-5) yakkety; urgency=medium
-
-  * modify permission problem
-
- -- ruki <[email protected]>  Thu, 06 Apr 2017 21:22:12 +0800
-
-xmake (2.1.3-4) yakkety; urgency=medium
-
-  * modify package ppa script
-
- -- ruki <[email protected]>  Thu, 06 Apr 2017 21:22:12 +0800
-
-xmake (2.1.3-3) yakkety; urgency=medium
-
-  * modify ppa install path
-
- -- ruki <[email protected]>  Thu, 06 Apr 2017 21:22:12 +0800
-
-xmake (2.1.3-2) yakkety; urgency=medium
-
-  * modify debian script
-
- -- ruki <[email protected]>  Thu, 06 Apr 2017 21:22:12 +0800
-
-xmake (2.1.3-1) yakkety; urgency=medium
-
-  * initial release
-
- -- ruki <[email protected]>  Thu, 06 Apr 2017 21:22:12 +0800
+ -- ruki <[email protected]>  Thu, 05 Aug 2020 21:22:12 +0800
diff --git a/scripts/debian/copyright b/scripts/debian/copyright
index f3faea133..6a7cf0cba 100644
--- a/scripts/debian/copyright
+++ b/scripts/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: xmake
 Source: https://github.com/xmake-io/xmake
 
 Files: *
-Copyright: 2015-2017 ruki <[email protected]>
+Copyright: 2015-present ruki <[email protected]>
 License: Apache-2.0
  .
 
diff --git a/scripts/debian/rules b/scripts/debian/rules
index bbf394eb6..b64ef4e04 100755
--- a/scripts/debian/rules
+++ b/scripts/debian/rules
@@ -30,10 +30,7 @@ install: build
 	mkdir -p $(prefix)/bin
 	mkdir -p $(prefix)/share
 	cp -r $(CURDIR)/xmake $(prefix)/share
-	cp $(CURDIR)/core/src/demo/demo.b $(prefix)/share/xmake/xmake 
-	echo '#!/bin/bash' > $(prefix)/bin/xmake
-	echo 'export XMAKE_PROGRAM_DIR=/usr/share/xmake' >> $(prefix)/bin/xmake
-	echo '/usr/share/xmake/xmake "$$@"' >> $(prefix)/bin/xmake
+	cp $(CURDIR)/core/src/demo/demo.b $(prefix)/bin/xmake 
 	chmod 755 $(prefix)/bin/xmake
 
 distclean: clean
diff --git a/scripts/makeppa b/scripts/makeppa
index 8da0d67e9..9618e9d71 100755
--- a/scripts/makeppa
+++ b/scripts/makeppa
@@ -52,7 +52,7 @@ cp -r ../../scripts/debian .
 
 # build package
 echo "building package .."
-debuild -S -k8A0FFB63
+debuild -S -k2C0C68C9
 
 # check package
 echo "checking package .."
@@ -63,7 +63,7 @@ source=xmake_$version-"$patch"_source
 while true; do
     read -p "Do you wish to upload this package? (y/n)" yn
     case $yn in
-        [Yy]* ) if [ -f ../$source.ppa.upload ]; then rm ../$source.ppa.upload; fi ; dput ppa:tboox/xmake ../$source.changes; break;;
+        [Yy]* ) if [ -f ../$source.ppa.upload ]; then rm ../$source.ppa.upload; fi ; dput ppa:xmake-io/xmake ../$source.changes; break;;
         [Nn]* ) exit;;
         * ) echo "Please answer y or n.";;
     esac
@@ -80,4 +80,31 @@ while true; do
     esac
 done
 
-
+# install dh-make and gpg
+# sudo apt install dh-make rng-tools
+#
+# @see https://help.ubuntu.com/community/GnuPrivacyGuardHowto
+#
+# generate key
+# gpg --gen-key
+#
+# save public/private key
+# gpg -a --export 2C0C68C9 > /mnt/xmake_ppa_pgp.pub
+# gpg -a --export-secret-keys 2C0C68C9 > /mnt/xmake_ppa_pgp.sec
+#
+# submit to keykserver and import this key to launchpad.net
+# @see https://launchpad.net/+help-registry/import-pgp-key.html
+# gpg --send-keys --keyserver keyserver.ubuntu.com 2C0C68C9
+#
+# recv email and validate this gpg key
+# gpg --decrypt file.txt
+# goto link
+#
+# show gpg
+# gpg --fingerprint
+# pub   2048R/2C0C68C9 2020-09-08
+#      Key fingerprint = 0271 3554 FA2C E4AA DA20  AB23 167A 22F2 2C0C 68C9
+#
+# build package and upload ppa to launchpad.net
+# https://launchpad.net/~xmake-io/+archive/ubuntu/xmake
+#