summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2014-12-21 22:52:28 (GMT)
committer Jaromil <jaromil@dyne.org>2014-12-21 22:52:28 (GMT)
commit9e4857a8fae42eb1e476a9a6ea26df172bf8e87e (patch)
tree7c9ac2d4e975e328994bbcbade8014c67f81c042
parentb8c33bb8acffc82b83491ce45b00c725c71b4403 (diff)
version updates for releaseHEADv1.1master
-rw-r--r--VERSION2
-rw-r--r--pack/dojos/1.1/crypto.tree10
-rw-r--r--pack/dojos/1.1/gnomish.tree7
-rw-r--r--pack/dojos/1.1/lang.tree5
-rw-r--r--pack/dojos/1.1/media.tree41
-rw-r--r--pack/dojos/1.1/network.tree22
-rw-r--r--pack/dojos/1.1/system.aliases5
-rw-r--r--pack/dojos/1.1/system.tree29
-rw-r--r--pack/dojos/1.1/text.aliases5
-rw-r--r--pack/dojos/1.1/text.tree7
-rw-r--r--pack/dojos/1.1/toys.tree11
-rw-r--r--termapk/AndroidManifest.xml4
-rw-r--r--termapk/res/layout-land/main.xml4
-rw-r--r--termapk/res/layout/main.xml4
-rw-r--r--termapk/src/org/dyne/zshaolin/startup/installer.java4
15 files changed, 151 insertions, 9 deletions
diff --git a/VERSION b/VERSION
index d3827e7..9459d4b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0
+1.1
diff --git a/pack/dojos/1.1/crypto.tree b/pack/dojos/1.1/crypto.tree
new file mode 100644
index 0000000..75cd334
--- /dev/null
+++ b/pack/dojos/1.1/crypto.tree
@@ -0,0 +1,10 @@
+bin/gpg
+bin/gpgv
+bin/gpg-error
+bin/pinentry
+bin/pinentry-curses
+bin/steghide
+bin/srm
+libexec/gnupg/gpgkeys_hkp
+libexec/gnupg/gpgkeys_finger
+libexec/gnupg/gpgkeys_curl
diff --git a/pack/dojos/1.1/gnomish.tree b/pack/dojos/1.1/gnomish.tree
new file mode 100644
index 0000000..76cc88f
--- /dev/null
+++ b/pack/dojos/1.1/gnomish.tree
@@ -0,0 +1,7 @@
+bin/mc
+bin/mcedit
+bin/mcdiff
+bin/mcview
+libexec/mc
+share/mc
+etc/mc
diff --git a/pack/dojos/1.1/lang.tree b/pack/dojos/1.1/lang.tree
new file mode 100644
index 0000000..e249372
--- /dev/null
+++ b/pack/dojos/1.1/lang.tree
@@ -0,0 +1,5 @@
+./bin/lua
+./share/man/man1/lua.1
+bin/perl
+lib/perl
+
diff --git a/pack/dojos/1.1/media.tree b/pack/dojos/1.1/media.tree
new file mode 100644
index 0000000..f6037ce
--- /dev/null
+++ b/pack/dojos/1.1/media.tree
@@ -0,0 +1,41 @@
+./etc/ImageMagick
+./share/ImageMagick-6.7.8
+./share/doc/ImageMagick-6.7.8
+./share/ffmpeg
+./bin/ffmpeg
+./bin/ffprobe
+./share/doc/speex
+./bin/speexdec
+./bin/speexenc
+./bin/x264
+./bin/rec
+./bin/oggz-info
+./bin/oggz-diff
+./bin/oggz-dump
+./bin/oggz-validate
+./bin/oggz-rip
+./bin/oggz
+./bin/oggz-sort
+./bin/oggz-known-codecs
+./bin/oggz-scan
+./bin/oggz-chop
+./bin/oggz-codecs
+./bin/oggz-comment
+./bin/oggz-merge
+./bin/animate
+./bin/compare
+./bin/composite
+./bin/conjure
+./bin/convert
+./bin/display
+./bin/identify
+./bin/import
+./bin/mogrify
+./bin/montage
+./bin/stream
+./bin/dcraw
+./bin/jhead
+./bin/play
+./bin/sox
+./bin/soxi
+
diff --git a/pack/dojos/1.1/network.tree b/pack/dojos/1.1/network.tree
new file mode 100644
index 0000000..6e3c7e4
--- /dev/null
+++ b/pack/dojos/1.1/network.tree
@@ -0,0 +1,22 @@
+bin/git
+bin/git-upload-pack
+bin/git-shell
+bin/git-receive-pack
+bin/git-upload-archive
+libexec/git-core
+share/git-core
+bin/curl
+bin/rsync
+bin/ssh
+bin/scp
+bin/sftp
+bin/ssh-keygen
+bin/sshd
+bin/lynx
+bin/ncdu
+bin/mongoose
+etc/lynx.lss
+etc/lynx.cfg
+bin/fidentify
+bin/photorec
+bin/testdisk
diff --git a/pack/dojos/1.1/system.aliases b/pack/dojos/1.1/system.aliases
new file mode 100644
index 0000000..74a7cd2
--- /dev/null
+++ b/pack/dojos/1.1/system.aliases
@@ -0,0 +1,5 @@
+bin/htop top
+bin/zsh sh
+bin/zsh ash
+bin/zsh bash
+bin/gawk awk
diff --git a/pack/dojos/1.1/system.tree b/pack/dojos/1.1/system.tree
new file mode 100644
index 0000000..557bc7a
--- /dev/null
+++ b/pack/dojos/1.1/system.tree
@@ -0,0 +1,29 @@
+./share/terminfo
+./share/awk
+./share/zsh
+./share/tabset
+./share/misc
+./share/man/man1
+./share/man/man4
+./share/man/man5
+./share/man/man7
+./share/man/man8
+./share/doc/most
+./share/doc/slang
+./bin/sed
+./bin/htop
+./bin/most
+./bin/nano
+./bin/gawk
+./bin/diff
+./bin/zsh
+./bin/grep
+./bin/mandoc
+./bin/demandoc
+./bin/file
+./bin/tmux
+./libexec
+./libexec/awk
+./libexec/awk/grcat
+./libexec/awk/pwcat
+./busybox
diff --git a/pack/dojos/1.1/text.aliases b/pack/dojos/1.1/text.aliases
new file mode 100644
index 0000000..3afc7e8
--- /dev/null
+++ b/pack/dojos/1.1/text.aliases
@@ -0,0 +1,5 @@
+bin/vim ex
+bin/vim rview
+bin/vim rvim
+bin/vim view
+bin/vim vimdiff
diff --git a/pack/dojos/1.1/text.tree b/pack/dojos/1.1/text.tree
new file mode 100644
index 0000000..9bf6be4
--- /dev/null
+++ b/pack/dojos/1.1/text.tree
@@ -0,0 +1,7 @@
+./bin/nroff
+./bin/preconv
+./bin/mandoc
+./bin/demandoc
+./bin/vim
+./bin/emacs
+./share/vim
diff --git a/pack/dojos/1.1/toys.tree b/pack/dojos/1.1/toys.tree
new file mode 100644
index 0000000..c140294
--- /dev/null
+++ b/pack/dojos/1.1/toys.tree
@@ -0,0 +1,11 @@
+# ./bin/cacaclock
+# ./bin/cacaview
+# ./bin/cacaplay
+bin/cacafire
+bin/sl
+bin/matanza
+bin/curseofwar
+bin/ctris
+bin/cryptoslam
+share/man/man6
+
diff --git a/termapk/AndroidManifest.xml b/termapk/AndroidManifest.xml
index 1942195..46843aa 100644
--- a/termapk/AndroidManifest.xml
+++ b/termapk/AndroidManifest.xml
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.dyne.zshaolin"
- android:versionName="1.0"
- android:versionCode="16">
+ android:versionName="1.1"
+ android:versionCode="18">
<!--android:installLocation="preferExternal" -->
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/termapk/res/layout-land/main.xml b/termapk/res/layout-land/main.xml
index cd1655a..a78db43 100644
--- a/termapk/res/layout-land/main.xml
+++ b/termapk/res/layout-land/main.xml
@@ -72,8 +72,8 @@
android:gravity="center"
android:textColor="#ffffff"
android:textSize="12dip"
- android:text="ZShaolin Nomadic GNU/Linux OS\n
-by Jaromil @ dyne.org (2012-2014)"/>
+ android:text="ZShaolin Nomadic GNU/Linux app\n
+by Jaromil @ dyne.org (2012-2015)"/>
</LinearLayout>
diff --git a/termapk/res/layout/main.xml b/termapk/res/layout/main.xml
index 0ad2bf3..cdba055 100644
--- a/termapk/res/layout/main.xml
+++ b/termapk/res/layout/main.xml
@@ -67,8 +67,8 @@
android:gravity="center"
android:textColor="#ffffff"
android:textSize="12dip"
- android:text="ZShaolin Nomadic GNU/Linux OS\n
-by Jaromil @ dyne.org (2012-2014)"/>
+ android:text="ZShaolin Nomadic GNU/Linux app\n
+by Jaromil @ dyne.org (2012-2015)"/>
</LinearLayout>
diff --git a/termapk/src/org/dyne/zshaolin/startup/installer.java b/termapk/src/org/dyne/zshaolin/startup/installer.java
index ce5db86..486a0ed 100644
--- a/termapk/src/org/dyne/zshaolin/startup/installer.java
+++ b/termapk/src/org/dyne/zshaolin/startup/installer.java
@@ -30,8 +30,8 @@ import org.dyne.zshaolin.startup.setup.filemanager;
public class installer extends Activity implements OnClickListener{
//THE MAIN INSTALL VALUE
- public static int CURRENT_INSTALL_SYSTEM_NUM = 15;
- public static String CURRENT_INSTALL_SYSTEM = "System v1.0";
+ public static int CURRENT_INSTALL_SYSTEM_NUM = 18;
+ public static String CURRENT_INSTALL_SYSTEM = "System v1.1";
public static String CURRENT_INSTALL_ASSETFILE = "system.tar.lzma.mp3";
private ProgressDialog mInstallProgress;