Some tweaks to get the autobuilder to accept the package, and updated screenshots...

diff --git a/Makefile b/Makefile
index 18dfe43..b48fe15 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ distclean: clean
 
 # See: http://wiki.maemo.org/Uploading_to_Extras#Debian_tooling
 build-package:
-       dpkg-buildpackage -rfakeroot -sa -i -I.git
+       dpkg-buildpackage -rfakeroot -sa -kkristoffer.gronlund@purplescout.se -i -I.git
 
 #messagespot:
 #      xgettext -k_ --from-code utf-8 --language Python \

diff --git a/setup.py b/setup.py
index 94be7b8..0782d26 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -26,10 +26,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\r
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
 \r
-from setuptools import setup, find_packages\r
+from distutils.core import setup\r
 from glob import glob\r
-import os\r
-import sys\r
 \r
 data_files = [\r
     ('/opt/jamaendo', glob('data/icon_*.png') + ['data/bg.png', 'data/album.png']),\r
@@ -45,15 +43,13 @@ data_files = [
 #    modir = os.path.dirname(mofile).replace('data', 'share')\r
 #    translation_files.append((modir, [mofile]))\r
 \r
-import sys\r
 setup(\r
     name = "jamaendo",\r
-    version = '0.1',\r
+    version = '0.2',\r
     author = "Kristoffer Gronlund",\r
     author_email = "kristoffer.gronlund@purplescout.se",\r
     url = "http://jamaendo.garage.maemo.org/",\r
     packages = ['jamaendo', 'jamaui'],\r
-    zip_safe=False,\r
     scripts = ['scripts/jamaendo'],\r
     data_files = data_files# + translation_files,\r
     )\r

diff --git a/www/img/Screenshot-20100106-222553.png b/www/img/Screenshot-20100106-222553.png
new file mode 100644 (file)
index 0000000..12f68c2
Binary files /dev/null and b/www/img/Screenshot-20100106-222553.png differ

diff --git a/www/img/Screenshot-20100106-222603.png b/www/img/Screenshot-20100106-222603.png
new file mode 100644 (file)
index 0000000..cfde8d7
Binary files /dev/null and b/www/img/Screenshot-20100106-222603.png differ

diff --git a/www/img/Screenshot-20100106-222614.png b/www/img/Screenshot-20100106-222614.png
new file mode 100644 (file)
index 0000000..99fc441
Binary files /dev/null and b/www/img/Screenshot-20100106-222614.png differ

diff --git a/www/img/Screenshot-20100106-222628.png b/www/img/Screenshot-20100106-222628.png
new file mode 100644 (file)
index 0000000..3e91a30
Binary files /dev/null and b/www/img/Screenshot-20100106-222628.png differ

diff --git a/www/img/Screenshot-20100106-222644.png b/www/img/Screenshot-20100106-222644.png
new file mode 100644 (file)
index 0000000..2140050
Binary files /dev/null and b/www/img/Screenshot-20100106-222644.png differ

diff --git a/www/img/Screenshot-20100106-222710.png b/www/img/Screenshot-20100106-222710.png
new file mode 100644 (file)
index 0000000..49d28d7
Binary files /dev/null and b/www/img/Screenshot-20100106-222710.png differ

diff --git a/www/img/makethumbs b/www/img/makethumbs
new file mode 100755 (executable)
index 0000000..a64cfdc
--- /dev/null
+++ b/www/img/makethumbs
@@ -0,0 +1,3 @@
+#!/bin/sh
+mogrify -path thumbs -thumbnail 200x120  -quality 95 -format png *.png
+

diff --git a/www/img/thumbs/Screenshot-20100103-025602.png b/www/img/thumbs/Screenshot-20100103-025602.png
index 9f9feec..3aef1d7 100644 (file)
Binary files a/www/img/thumbs/Screenshot-20100103-025602.png and b/www/img/thumbs/Screenshot-20100103-025602.png differ

diff --git a/www/img/thumbs/Screenshot-20100103-025614.png b/www/img/thumbs/Screenshot-20100103-025614.png
index b188bed..f2fad1c 100644 (file)
Binary files a/www/img/thumbs/Screenshot-20100103-025614.png and b/www/img/thumbs/Screenshot-20100103-025614.png differ

diff --git a/www/img/thumbs/Screenshot-20100103-025622.png b/www/img/thumbs/Screenshot-20100103-025622.png
index ee862d5..91dfb38 100644 (file)
Binary files a/www/img/thumbs/Screenshot-20100103-025622.png and b/www/img/thumbs/Screenshot-20100103-025622.png differ

diff --git a/www/img/thumbs/Screenshot-20100103-025639.png b/www/img/thumbs/Screenshot-20100103-025639.png
index 98ef696..09c61e8 100644 (file)
Binary files a/www/img/thumbs/Screenshot-20100103-025639.png and b/www/img/thumbs/Screenshot-20100103-025639.png differ

diff --git a/www/img/thumbs/Screenshot-20100103-025657.png b/www/img/thumbs/Screenshot-20100103-025657.png
index 64cbc2e..5c27673 100644 (file)
Binary files a/www/img/thumbs/Screenshot-20100103-025657.png and b/www/img/thumbs/Screenshot-20100103-025657.png differ

diff --git a/www/img/thumbs/Screenshot-20100103-025705.png b/www/img/thumbs/Screenshot-20100103-025705.png
index 210c271..8bde6e9 100644 (file)
Binary files a/www/img/thumbs/Screenshot-20100103-025705.png and b/www/img/thumbs/Screenshot-20100103-025705.png differ

diff --git a/www/img/thumbs/Screenshot-20100103-025728.png b/www/img/thumbs/Screenshot-20100103-025728.png
index fcaa233..9776ce9 100644 (file)
Binary files a/www/img/thumbs/Screenshot-20100103-025728.png and b/www/img/thumbs/Screenshot-20100103-025728.png differ

diff --git a/www/img/thumbs/Screenshot-20100106-222553.png b/www/img/thumbs/Screenshot-20100106-222553.png
new file mode 100644 (file)
index 0000000..8bde845
Binary files /dev/null and b/www/img/thumbs/Screenshot-20100106-222553.png differ

diff --git a/www/img/thumbs/Screenshot-20100106-222603.png b/www/img/thumbs/Screenshot-20100106-222603.png
new file mode 100644 (file)
index 0000000..175774b
Binary files /dev/null and b/www/img/thumbs/Screenshot-20100106-222603.png differ

diff --git a/www/img/thumbs/Screenshot-20100106-222614.png b/www/img/thumbs/Screenshot-20100106-222614.png
new file mode 100644 (file)
index 0000000..83e6a60
Binary files /dev/null and b/www/img/thumbs/Screenshot-20100106-222614.png differ

diff --git a/www/img/thumbs/Screenshot-20100106-222628.png b/www/img/thumbs/Screenshot-20100106-222628.png
new file mode 100644 (file)
index 0000000..e523de7
Binary files /dev/null and b/www/img/thumbs/Screenshot-20100106-222628.png differ

diff --git a/www/img/thumbs/Screenshot-20100106-222644.png b/www/img/thumbs/Screenshot-20100106-222644.png
new file mode 100644 (file)
index 0000000..74772a6
Binary files /dev/null and b/www/img/thumbs/Screenshot-20100106-222644.png differ

diff --git a/www/img/thumbs/Screenshot-20100106-222710.png b/www/img/thumbs/Screenshot-20100106-222710.png
new file mode 100644 (file)
index 0000000..04b803a
Binary files /dev/null and b/www/img/thumbs/Screenshot-20100106-222710.png differ

diff --git a/www/index.html b/www/index.html
index 1d83acd..a987759 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -55,6 +55,16 @@ git clone https://git.maemo.org/projects/jamaendo
 
 <h2>Screenshots</h2>
 
+<h3>Version 0.2</h3>
+<p>
+<a href="img/Screenshot-20100106-222553.png" rel="lightbox[screenshots]" title="v0.2 main screen"><img src="img/thumbs/Screenshot-20100106-222553.png" /></a>
+<a href="img/Screenshot-20100106-222603.png" rel="lightbox[screenshots]" title="New: Playlist support"><img src="img/thumbs/Screenshot-20100106-222603.png" /></a>
+<a href="img/Screenshot-20100106-222614.png" rel="lightbox[screenshots]" title="More featured lists"><img src="img/thumbs/Screenshot-20100106-222614.png" /></a>
+<a href="img/Screenshot-20100106-222628.png" rel="lightbox[screenshots]" title="Top 50 tag playlists"><img src="img/thumbs/Screenshot-20100106-222628.png" /></a>
+<a href="img/Screenshot-20100106-222710.png" rel="lightbox[screenshots]" title="Revised player interface"><img src="img/thumbs/Screenshot-20100106-222710.png" /></a>
+</p>
+
+<h3>Version 0.1</h3>
 <p>
 <a href="img/Screenshot-20100103-025639.png" rel="lightbox[screenshots]" title="The main screen"><img src="img/thumbs/Screenshot-20100103-025639.png" /></a>
 <a href="img/Screenshot-20100103-025705.png" rel="lightbox[screenshots]" title="Featured playlists"><img src="img/thumbs/Screenshot-20100103-025705.png" /></a>