Merge branch 'master' of https://vcs.maemo.org/git/buliscores

Conflicts:
	src/src.pro

diff --git a/debian/changelog b/debian/changelog
index 1a440a5..6f32289 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+buliscores (0.0.2-6) unstable; urgency=high
+
+  * fix font size
+
+ -- David Solbach <d@vidsolbach.de>  Wed, 3 Nov 2010 10:50:00 +0200
+
+
+buliscores (0.0.2-5) unstable; urgency=high
+
+  * fix broken buttons in settings dialog
+
+ -- David Solbach <d@vidsolbach.de>  Wed, 3 Nov 2010 10:22:00 +0200
+
+buliscores (0.0.2-4) unstable; urgency=high
+
+  * new description
+
+ -- David Solbach <d@vidsolbach.de>  Thu, 21 Oct 2010 21:45:00 +0200
+
 buliscores (0.0.2-3) unstable; urgency=high
 
   * fix installation, second try

diff --git a/debian/control b/debian/control
index ba9078f..7c1c1c0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: extra
 Maintainer: David Solbach <d@vidsolbach.de>
 Build-Depends: debhelper (>= 7), libqt4-dev, libqt4-experimental-dev, libhildon1-dev, libhildondesktop1-dev
 Standards-Version: 3.8.3
-Homepage: <insert the upstream URL, if relevant>
 
 Package: buliscores
 Architecture: any
@@ -13,7 +12,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-core (>= 4.6.1),
          libqt4-network (>= 4.6.1), qt4-homescreen-loader
 Description: BuLi Scores displays live football scores on the N900 home screen.
  BuLi Scores automatically downloads live scores from the internet and displays them
- on your homescreen currently the following leagues are supported TODO.
+ on your homescreen currently the following leagues are supported:
+   - 1. Bundesliga (Germany)
+   - 2. Bundesliga (Germany)
+   - tipp3 Bundesliga (Österreich).
 XB-Maemo-Icon-26: 
  iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABJ0
  AAASdAHeZh94AAAO8UlEQVRoge2aaYxdZ3nHf+ecu9+5M2OP17GdOPGMl9gx