Removed one comment and fixed typos.

[toast/confclerk.git] / README

diff --git a/README b/README
index f149a6e8c35c8a3393e3f7a997e31d42db76f2aa..52fb6014a7a45167a50a806702df7a154413c5fc 100644 (file)
--- a/README
+++ b/README
@@ -11,8 +11,8 @@ location, etc.) and enables you to select favorite events and create your own
 schedule.
 
 At the moment ConfClerk is able to import schedules in XML format created by
-the PentaBarf conference management system used by e.g. FOSDEM, DebConf, and
-the CCC.
+the PentaBarf conference management system (or frab) used by e.g. FOSDEM,
+DebConf, FrOSCon, Grazer Linuxtage, and the CCC.
 
 ConfClerk is targetted at mobile devices like the Nokia N810 and N900 but
 works on any sytem running Qt.
@@ -40,31 +40,61 @@ Copyright and License:
   with this program; if not, write to the Free Software Foundation, Inc.,
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+data/confclerk.*:
 
-//! TODO
+  Copyright (C) 2011, Christian Kling <kling_christian@gmx.at>
 
-Files add.png, reload.png, remove.png in  src/icons/ directory
-are taken from Ubuntu package gnome-icon-theme. Copyright notice
-for them copied here:
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+src/icons/*:
+All icons are taken from the Debian package gnome-icon-theme, which contains
+the following notice (as of 2011-06-24):
+
+  Copyright © 2002-2008:
+    Ulisse Perusin <uli.peru@gmail.com>
+    Riccardo Buzzotta <raozuzu@yahoo.it>
+    Josef Vybíral <cornelius@vybiral.info>
+    Hylke Bons <h.bons@student.rug.nl>
+    Ricardo González <rick@jinlabs.com>
+    Lapo Calamandrei <calamandrei@gmail.com>
+    Rodney Dawes <dobey@novell.com>
+    Luca Ferretti <elle.uca@libero.it>
+    Tuomas Kuosmanen <tigert@gimp.org>
+    Andreas Nilsson <nisses.mail@home.se>
+    Jakub Steiner <jimmac@novell.com>
+
+  GNOME icon theme is distributed under the terms of either
+  GNU LGPL v.3 or Creative Commons BY-SA 3.0 license.
+
+src/icons/emblem-new*:
+
+  Copyright (C) 2011, Philipp Spitzer
 
-> This package was debianized by Takuo KITAME <kitame@debian.org> on
-> Fri, 17 Jan 2003 14:57:28 +0900.
-> 
-> It was downloaded from <http://download.gnome.org/sources/gnome-icon-theme/>
-> 
-> Copyright © 2002-2008:
->    Ulisse Perusin <uli.peru@gmail.com>
->    Riccardo Buzzotta <raozuzu@yahoo.it>
->    Josef Vybíral <cornelius@vybiral.info>
->    Hylke Bons <h.bons@student.rug.nl>
->    Ricardo González <rick@jinlabs.com>
->    Lapo Calamandrei <calamandrei@gmail.com>
->    Rodney Dawes <dobey@novell.com>
->    Luca Ferretti <elle.uca@libero.it>
->    Tuomas Kuosmanen <tigert@gimp.org>
->    Andreas Nilsson <nisses.mail@home.se>
->    Jakub Steiner <jimmac@novell.com>
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 History:
@@ -82,3 +112,20 @@ The project was started after fosdem-schedule was not actively developped
 anymore and with the "blessing" of the fosdem-schedule developers; cf.
 http://sourceforge.net/mailarchive/forum.php?thread_name=20110621171440.GA4521%40nerys.comodo.priv.at&forum_name=fosdem-maemo-devel
 Thanks guys!
+
+
+Contact:
+
+Philipp Spitzer, gregor herrmann
+Toastfreeware
+<toast+confclerk@toastfreeware.priv.at>
+http://www.toastfreeware.priv.at/confclerk/
+
+
+Tested pentabarf instances:
+
+- FOSDEM (2011): http://fosdem.org/schedule/xml
+- DebConf (2010): http://penta.debconf.org/dc10_schedule/schedule.en.xml
+- DebConf (2011): http://penta.debconf.org/dc11_schedule/schedule.en.xml
+- 27C3: http://events.ccc.de/congress/2010/Fahrplan/schedule.en.xml
+- FrOSCon (2011): http://programm.froscon.org/2011/schedule.xml