package details updated to reflect the binary name change to fosdem-maemo

diff --git a/data/Makefile b/data/Makefile
index 5e6ab6c08b9e3b8fb574a178062476f15369c9dc..a851b9835f58fde62a1a3b0a70ffe697e7c73ed3 100644 (file)
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,6 +1,7 @@
 # Makefile - install Maemo specific data files 
 
 # Makefile - install Maemo specific data files 
 

-PKG            = fosdem
+PKG            = fosdem-schedule
+ICON           = fosdem

 PREFIX         = $(INSTALL_ROOT)/usr/share
 INSTALL_FILE   = install -m 644 -p
 CHK_DIR                = test -d
 PREFIX         = $(INSTALL_ROOT)/usr/share
 INSTALL_FILE   = install -m 644 -p
 CHK_DIR                = test -d


@@ -15,20 +16,20 @@ install:
        $(INSTALL_FILE) ./maemo/$(PKG).desktop $(PREFIX)/applications/hildon/
 
        $(CHK_DIR) $(PREFIX)/icons/hicolor/26x26/hildon/ || $(MKDIR) $(PREFIX)/icons/hicolor/26x26/hildon/ 
        $(INSTALL_FILE) ./maemo/$(PKG).desktop $(PREFIX)/applications/hildon/
 
        $(CHK_DIR) $(PREFIX)/icons/hicolor/26x26/hildon/ || $(MKDIR) $(PREFIX)/icons/hicolor/26x26/hildon/ 

-       $(INSTALL_FILE) ./26x26/$(PKG).png $(PREFIX)/icons/hicolor/26x26/hildon/
+       $(INSTALL_FILE) ./26x26/$(ICON).png $(PREFIX)/icons/hicolor/26x26/hildon/

 
        $(CHK_DIR) $(PREFIX)/icons/hicolor/48x48/hildon/ || $(MKDIR) $(PREFIX)/icons/hicolor/48x48/hildon/ 
 
        $(CHK_DIR) $(PREFIX)/icons/hicolor/48x48/hildon/ || $(MKDIR) $(PREFIX)/icons/hicolor/48x48/hildon/ 

-       $(INSTALL_FILE) ./48x48/$(PKG).png $(PREFIX)/icons/hicolor/48x48/hildon/
+       $(INSTALL_FILE) ./48x48/$(ICON).png $(PREFIX)/icons/hicolor/48x48/hildon/

 
        $(CHK_DIR) $(PREFIX)/icons/hicolor/64x64/hildon/ || $(MKDIR) $(PREFIX)/icons/hicolor/64x64/hildon/
 
        $(CHK_DIR) $(PREFIX)/icons/hicolor/64x64/hildon/ || $(MKDIR) $(PREFIX)/icons/hicolor/64x64/hildon/

-       $(INSTALL_FILE) ./64x64/$(PKG).png $(PREFIX)/icons/hicolor/64x64/hildon/
+       $(INSTALL_FILE) ./64x64/$(ICON).png $(PREFIX)/icons/hicolor/64x64/hildon/

 
 
 uninstall:
        $(RM) $(PREFIX)/applications/hildon/$(PKG).desktop
 
 
 uninstall:
        $(RM) $(PREFIX)/applications/hildon/$(PKG).desktop

-       $(RM) $(PREFIX)/icons/hicolor/26x26/hildon/$(PKG).png
-       $(RM) $(PREFIX)/icons/hicolor/48x48/hildon/$(PKG).png
-       $(RM) $(PREFIX)/icons/hicolor/64x64/hildon/$(PKG).png
+       $(RM) $(PREFIX)/icons/hicolor/26x26/hildon/$(ICON).png
+       $(RM) $(PREFIX)/icons/hicolor/48x48/hildon/$(ICON).png
+       $(RM) $(PREFIX)/icons/hicolor/64x64/hildon/$(ICON).png

 
 clean:
 
 
 clean:
 

diff --git a/data/maemo/fosdem-schedule.desktop b/data/maemo/fosdem-schedule.desktop
new file mode 100644 (file)
index 0000000..fc9bfaa
--- /dev/null
+++ b/data/maemo/fosdem-schedule.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.1
+Type=Application
+Name=FOSDEM'10
+Exec=/usr/bin/fosdem-schedule
+Icon=fosdem
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
+

diff --git a/data/maemo/fosdem.desktop b/data/maemo/fosdem.desktop
deleted file mode 100644 (file)
index 58ed35c..0000000
--- a/data/maemo/fosdem.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.1
-Type=Application
-Name=FOSDEM'10
-Exec=/usr/bin/fosdem
-Icon=fosdem
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
-

diff --git a/debian/control b/debian/control
index 032adc7db010b230902425a33da6d18bfe5cde31..2f29c1103fbf79947cb81cc2aeb9990fa863c5e5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: fosdem-schedule
 Section: user/support
 Priority: optional
 Maintainer: Matus Uzak <matus.uzak@ixonos.com>
 Section: user/support
 Priority: optional
 Maintainer: Matus Uzak <matus.uzak@ixonos.com>

-Build-Depends: debhelper (>= 5) libqt4-dev (>= 4.5)
+Build-Depends: libc6 (>= 2.5.0-1), libgcc1 (>= 1:4.2.1), libqt4-dev (>= 4.5), liqt4-dbus (>= 4.5), libqt4-sql (>= 4.5), libqt4-sql-sqlite (>= 4.5) 

 Standards-Version: 3.7.2
 
 Package: fosdem-schedule
 Standards-Version: 3.7.2
 
 Package: fosdem-schedule

diff --git a/fosdem-maemo.pro b/fosdem-maemo.pro
deleted file mode 100644 (file)
index 53db6bc..0000000
--- a/fosdem-maemo.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-# fosdem-maemo.pro
-
-QMAKEVERSION = $$[QMAKE_VERSION]
-ISQT4 = $$find(QMAKEVERSION, ^[2-9])
-isEmpty( ISQT4 ) {
-error("Use the qmake include with Qt4.4 or greater, on Debian that is
-qmake-qt4");
-}
-
-TEMPLATE = subdirs
-SUBDIRS = data src

diff --git a/fosdem-schedule.pro b/fosdem-schedule.pro
new file mode 100644 (file)
index 0000000..8896386
--- /dev/null
+++ b/fosdem-schedule.pro
@@ -0,0 +1,11 @@
+# fosdem-schedule.pro
+
+QMAKEVERSION = $$[QMAKE_VERSION]
+ISQT4 = $$find(QMAKEVERSION, ^[2-9])
+isEmpty( ISQT4 ) {
+error("Use the qmake include with Qt4.4 or greater, on Debian that is
+qmake-qt4");
+}
+
+TEMPLATE = subdirs
+SUBDIRS = data src