Merge aurora

diff --cc aurora/.gitignore
index 0000000,0000000..041f332
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/aurora/.gitignore
@@@ -1,0 -1,0 +1,16 @@@
++#compilation
++*.exe
++.ctmp
++libAurora*
++*.dll
++*.a
++*.lib
++src/Makefile*
++
++#external tools
++tclkit*
++gpg
++
++#other temp stuff
++tmp
++*~

diff --cc aurora/.gitmodules
index 0000000,ccecbd2..ccecbd2
mode 000000,100644..100644
--- /dev/null
--- 2/.gitmodules
+++ b/aurora/.gitmodules

diff --cc aurora/COPYING.GPL
index 0000000,4432540..4432540
mode 000000,100644..100644
--- /dev/null
--- 2/COPYING.GPL
+++ b/aurora/COPYING.GPL

diff --cc aurora/COPYING.LGPL
index 0000000,fc8a5de..fc8a5de
mode 000000,100644..100644
--- /dev/null
--- 2/COPYING.LGPL
+++ b/aurora/COPYING.LGPL

diff --cc aurora/README
index 0000000,0000000..63859dc
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/aurora/README
@@@ -1,0 -1,0 +1,51 @@@
++README for Aurora
++==================
++
++(c) Konrad Rosenbaum, 2012-2013
++protected under the GNU LGPL v.3
++see LICENSE.LGPL for details
++for 3rd-party components' copyright see installer/libs
++
++Aurora is a library for program updates.
++
++Warning to Windows Fanatics: this library needs a lot of GNU tools to work.
++I have actually no clue how you could build this library with Visual Studio!
++
++Requirements:
++==============
++
++* Qt 5.x
++* GnuPG/libassuan/GPGME (included as GIT submodules)
++* GNU Autotools
++  -> Linux: install the autotools packages autoconf and automake
++  -> Windows: install MinGW and MSys
++
++Building the library:
++======================
++
++You have to build GPG first. Make sure you have all submodules:
++git submodule init
++git submodule update
++
++Build GPG: ./build-gpg.sh
++For MinGW builds: do this inside the MSys shell
++For VC builds: you are on your own, sorry.
++
++
++Then build the actual Aurora library:
++cd src && qmake && make
++For MinGW builds: do this in a normal cmd.exe shell,
++  MSys may behave unexpectedly
++For VC builds: if you somehow translated GPGME, this will work with your
++  favourite way of building Qt projects
++
++
++Creating Packages
++==================
++
++Create a ZIP file that contains the entire program. For Aurora this includes
++the following:
++
++libAurora.so* (or Aurora.dll)
++gpg(.exe) (from gpg/bin/gpg(.exe))
++

diff --cc aurora/build-gpg.sh
index 0000000,2a13096..2a13096
mode 000000,100755..100755
--- /dev/null
--- 2/build-gpg.sh
+++ b/aurora/build-gpg.sh

diff --cc aurora/clean-gpg.sh
index 0000000,2595284..2595284
mode 000000,100755..100755
--- /dev/null
--- 2/clean-gpg.sh
+++ b/aurora/clean-gpg.sh

diff --cc aurora/gnupg
index 0000000,0bd168b..0bd168b
mode 000000,160000..160000
--- /dev/null
--- 2/gnupg
+++ b/aurora/gnupg

diff --cc aurora/gpgme
index 0000000,ef5cd38..ef5cd38
mode 000000,160000..160000
--- /dev/null
--- 2/gpgme
+++ b/aurora/gpgme

diff --cc aurora/libassuan
index 0000000,7d227ac..7d227ac
mode 000000,160000..160000
--- /dev/null
--- 2/libassuan
+++ b/aurora/libassuan

diff --cc aurora/libgpg-error
index 0000000,3367ff0..3367ff0
mode 000000,160000..160000
--- /dev/null
--- 2/libgpg-error
+++ b/aurora/libgpg-error

diff --cc aurora/src/aurora.cpp
index 0000000,ea5de4c..ea5de4c
mode 000000,100644..100644
--- /dev/null
--- 2/src/aurora.cpp
+++ b/aurora/src/aurora.cpp

diff --cc aurora/src/aurora.h
index 0000000,ef2c4d9..ef2c4d9
mode 000000,100644..100644
--- /dev/null
--- 2/src/aurora.h
+++ b/aurora/src/aurora.h

diff --cc aurora/src/aurora.pro
index 0000000,6ed1973..6ed1973
mode 000000,100644..100644
--- /dev/null
--- 2/src/aurora.pro
+++ b/aurora/src/aurora.pro