- Added TomboyExporter.

- Corrected proxy issues with OAuth
- Corrected hang on startup if sync on startup is specified & SSL libraries are not found.
- Corrected stupid mistake of disabling uploads due to debugging.
- Search history drop down won't clear when switching notebooks.

diff --git a/changelog.txt b/changelog.txt
index e08cc9a..8270a11 100644 (file)
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,11 @@
+NixNote (1.4) stable; urgency=low
+  * Added better proxy support for OAuth
+  * Search text dialog box won't clear if clicking "all notes".
+  * Tag names are taken into account when searching text (changed or new notes only).
+  * Corrected hang on startup if OAuth wasn't present and sync on startup was specified.
+  * Added better errors if ssl support wasn't found.
+  * Added better errors if behind a proxy & can't connect.
+
 NixNote (1.3) stable; urgency=low
   * Authentication changed from userid/password to OAuth
   * Added updated russian translation

diff --git a/extras/TomboyExporter.tar.gz b/extras/TomboyExporter.tar.gz
new file mode 100644 (file)
index 0000000..6833a94
Binary files /dev/null and b/extras/TomboyExporter.tar.gz differ

diff --git a/extras/TomboyExporter_readme.txt b/extras/TomboyExporter_readme.txt
new file mode 100644 (file)
index 0000000..c7c1a7e
--- /dev/null
+++ b/extras/TomboyExporter_readme.txt
@@ -0,0 +1,21 @@
+Tomboy Exporter is a utility provided as-is by another user.  He was kind enough
+to provide it.  Below is how he used it.
+
+
+
+chris@chris-ThinkPad-X120e:~/TomboyExporter/bin$ mkdir ../Nixnote
+chris@chris-ThinkPad-X120e:~/TomboyExporter/bin$ java Exporter
+../Nixnote/ ~/.local/share/tomboy/*.note
+chris@chris-ThinkPad-X120e:~/TomboyExporter/bin$ ls ../Nixnote/
+personal--ongoing.nnex  stocks--ongoing.nnex  travel.nnex
+work--log.nnex
+...
+
+
+At which point I create the notebooks in Nixnote, and import the
+individual .nnex's.
+
+
+As for building, I was able to rebuild it with a simple 'javac
+Exporter.java', although that may not be the desired way (there's a
+reason I didn't program this myself).

diff --git a/package_scripts/deb/amd64/control b/package_scripts/deb/amd64/control
index cf03e24..a1c95b0 100644 (file)
--- a/package_scripts/deb/amd64/control
+++ b/package_scripts/deb/amd64/control
@@ -1,10 +1,10 @@
 Package: nixnote
-Version: 1.3
+Version: 1.4
 Section: x11 
 Priority: optional
 Architecture: amd64
 Installed-Size: 133120
-Depends: openjdk-6-jre | openjdk-6-jdk | sun-java6-jdk | sun-java6-jre | java6-sdk | java6-runtime | default-jre, libssl (>=0.9.8)
+Depends: openjdk-6-jre | openjdk-6-jdk | sun-java6-jdk | sun-java6-jre | java6-sdk | java6-runtime | default-jre, libssl0.9.8, libpng12-0
 Maintainer: Randy Baumgarte <randy@fbn.cx>
 Description: Open Source Evernote client.
  NixNote is a client for the Evernote service (www.evernote.com).  It

diff --git a/package_scripts/deb/build.sh b/package_scripts/deb/build.sh
index 243eeee..a5d7c5b 100755 (executable)
--- a/package_scripts/deb/build.sh
+++ b/package_scripts/deb/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-version="1.3"
+version="1.4"
 arch="i386"
 qtversion="4.5.2_01" 
 

diff --git a/package_scripts/deb/i386/control b/package_scripts/deb/i386/control
index aa25530..0521c7f 100644 (file)
--- a/package_scripts/deb/i386/control
+++ b/package_scripts/deb/i386/control
@@ -1,5 +1,5 @@
 Package: nixnote
-Version: 1.3
+Version: 1.4
 Section: x11 
 Priority: optional
 Architecture: i386

diff --git a/package_scripts/tar/build.sh b/package_scripts/tar/build.sh
index 876ed2b..12ce33c 100755 (executable)
--- a/package_scripts/tar/build.sh
+++ b/package_scripts/tar/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-version="1.333"
+version="1.4"
 arch="i386"
 qtversion="4.5.2_01"