renamed app to simplexbmcremote. added the info missing from the deb package.

diff --git a/src/constants.h b/src/constants.h
index d5f8db2..ce76f3e 100644 (file)
--- a/src/constants.h
+++ b/src/constants.h
@@ -1,17 +1,17 @@
-#ifndef SETTINGS_H
-#define SETTINGS_H
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
 
 // QCoreApplication info
-#define APPLICATION_NAME "xbmcnetmoviesremote"
+#define APPLICATION_NAME "simplexbmcremote"
 #define ORGANIZATION_NAME "Ionutz Borcoman"
 
 // QSettings keys
 #define SETUP_XBMC_SERVER "xbmc/server"
 #define SETUP_XBMC_SERVER_DEFAULT "localhost"
 #define SETUP_XBMC_PORT "xbmc/port"
-#define SETUP_XBMC_PORT_DEFAULT "9090"
+#define SETUP_XBMC_PORT_DEFAULT "8080"
 
 #define SETUP_NOTIFICATION_TIMEOUT "notification/timeout"
 #define SETUP_NOTIFICATION_TIMEOUT_DEFAULT 3000
 
-#endif // SETTINGS_H
+#endif // CONSTANTS_H

diff --git a/src/images/xbmc.svg b/src/images/xbmc.svg
index b5cecde..52cfb9b 100644 (file)
--- a/src/images/xbmc.svg
+++ b/src/images/xbmc.svg
@@ -96,7 +96,6 @@
       <path
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/borco/projects/mobile/xbmcnetmoviesremote/src/btn_subtitle.png"
          transform="matrix(0.76825029,0,0,0.76825029,-362.37407,246.78953)"
          d="m 668.57144,105 a 57.857143,57.857143 0 1 1 -115.71429,0 57.857143,57.857143 0 1 1 115.71429,0 z"
          sodipodi:ry="57.857143"
@@ -109,7 +108,6 @@
       <path
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/borco/projects/mobile/xbmcnetmoviesremote/src/btn_subtitle.png"
          sodipodi:nodetypes="czcacc"
          inkscape:connector-curvature="0"
          id="path5292"
@@ -118,7 +116,6 @@
       <text
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/borco/projects/mobile/xbmcnetmoviesremote/src/btn_subtitle.png"
          sodipodi:linespacing="125%"
          id="text5358"
          y="351.5061"

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 7e4c4de..ea5505e 100644 (file)
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -31,7 +31,7 @@
            <string>...</string>
           </property>
           <property name="icon">
-           <iconset resource="xbmcnetmoviesremote.qrc">
+           <iconset resource="simplexbmcremote.qrc">
             <normaloff>:/images/btn_next_subtitle.png</normaloff>:/images/btn_next_subtitle.png</iconset>
           </property>
           <property name="iconSize">
@@ -54,7 +54,7 @@
            <string>...</string>
           </property>
           <property name="icon">
-           <iconset resource="xbmcnetmoviesremote.qrc">
+           <iconset resource="simplexbmcremote.qrc">
             <normaloff>:/images/btn_next_language.png</normaloff>:/images/btn_next_language.png</iconset>
           </property>
           <property name="iconSize">
@@ -107,7 +107,7 @@
            <string>...</string>
           </property>
           <property name="icon">
-           <iconset resource="xbmcnetmoviesremote.qrc">
+           <iconset resource="simplexbmcremote.qrc">
             <normaloff>:/images/btn_volume_up.png</normaloff>:/images/btn_volume_up.png</iconset>
           </property>
           <property name="iconSize">
@@ -130,7 +130,7 @@
            <string>...</string>
           </property>
           <property name="icon">
-           <iconset resource="xbmcnetmoviesremote.qrc">
+           <iconset resource="simplexbmcremote.qrc">
             <normaloff>:/images/btn_volume_down.png</normaloff>:/images/btn_volume_down.png</iconset>
           </property>
           <property name="iconSize">
@@ -153,7 +153,7 @@
            <string>...</string>
           </property>
           <property name="icon">
-           <iconset resource="xbmcnetmoviesremote.qrc">
+           <iconset resource="simplexbmcremote.qrc">
             <normaloff>:/images/btn_mute.png</normaloff>:/images/btn_mute.png</iconset>
           </property>
           <property name="iconSize">
@@ -212,7 +212,7 @@
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset resource="xbmcnetmoviesremote.qrc">
+             <iconset resource="simplexbmcremote.qrc">
               <normaloff>:/images/btn_up.png</normaloff>:/images/btn_up.png</iconset>
             </property>
             <property name="iconSize">
@@ -252,7 +252,7 @@
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset resource="xbmcnetmoviesremote.qrc">
+             <iconset resource="simplexbmcremote.qrc">
               <normaloff>:/images/btn_left.png</normaloff>:/images/btn_left.png</iconset>
             </property>
             <property name="iconSize">
@@ -275,7 +275,7 @@
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset resource="xbmcnetmoviesremote.qrc">
+             <iconset resource="simplexbmcremote.qrc">
               <normaloff>:/images/btn_play_pause.png</normaloff>:/images/btn_play_pause.png</iconset>
             </property>
             <property name="iconSize">
@@ -298,7 +298,7 @@
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset resource="xbmcnetmoviesremote.qrc">
+             <iconset resource="simplexbmcremote.qrc">
               <normaloff>:/images/btn_right.png</normaloff>:/images/btn_right.png</iconset>
             </property>
             <property name="iconSize">
@@ -338,7 +338,7 @@
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset resource="xbmcnetmoviesremote.qrc">
+             <iconset resource="simplexbmcremote.qrc">
               <normaloff>:/images/btn_down.png</normaloff>:/images/btn_down.png</iconset>
             </property>
             <property name="iconSize">
@@ -395,7 +395,7 @@
          <string>...</string>
         </property>
         <property name="icon">
-         <iconset resource="xbmcnetmoviesremote.qrc">
+         <iconset resource="simplexbmcremote.qrc">
           <normaloff>:/images/btn_stop.png</normaloff>:/images/btn_stop.png</iconset>
         </property>
         <property name="iconSize">
@@ -431,7 +431,7 @@
          <string>...</string>
         </property>
         <property name="icon">
-         <iconset resource="xbmcnetmoviesremote.qrc">
+         <iconset resource="simplexbmcremote.qrc">
           <normaloff>:/images/btn_enter.png</normaloff>:/images/btn_enter.png</iconset>
         </property>
         <property name="iconSize">
@@ -479,7 +479,7 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="xbmcnetmoviesremote.qrc"/>
+  <include location="simplexbmcremote.qrc"/>
  </resources>
  <connections/>
 </ui>

diff --git a/src/qtc_packaging/debian_fremantle/README b/src/qtc_packaging/debian_fremantle/README
index bec7e40..a7886a2 100644 (file)
--- a/src/qtc_packaging/debian_fremantle/README
+++ b/src/qtc_packaging/debian_fremantle/README
@@ -1,6 +1,9 @@
-The Debian Package xbmcnetmoviesremote
---------------------------------------
+The Debian Package simplexbmcremote
+-----------------------------------
 
-A XBMC movies remote control operating over the network.
+A simple application for controlling XBMC remotely while watching movies. Uses
+HTTP XBMC protocol to communicate with XBMC. Can navigate your video
+collection, start/pause/stop movies, skip forward and back, control the volume,
+cycle through the existing subtitles and languages.
 
  -- Ionutz Borcoman <iborco@gmail.com>  Mon, 31 Jan 2011 14:34:36 +0200

diff --git a/src/qtc_packaging/debian_fremantle/changelog b/src/qtc_packaging/debian_fremantle/changelog
index a755330..9f7bef8 100644 (file)
--- a/src/qtc_packaging/debian_fremantle/changelog
+++ b/src/qtc_packaging/debian_fremantle/changelog
@@ -1,4 +1,10 @@
-xbmcnetmoviesremote (0.0.1) unstable; urgency=low
+simplexbmcremote (0.8.0-1) unstable; urgency=low
+
+  * Preparing for garage upload.
+
+ -- Ionutz Borcoman <iborco@gmail.com>  Wed, 09 Mar 2011 09:16:53 +0200
+
+simplexbmcremote (0.8.0) unstable; urgency=low
 
   * Initial Release.
 

diff --git a/src/qtc_packaging/debian_fremantle/control b/src/qtc_packaging/debian_fremantle/control
index b5d9789..0458154 100644 (file)
--- a/src/qtc_packaging/debian_fremantle/control
+++ b/src/qtc_packaging/debian_fremantle/control
@@ -1,13 +1,15 @@
-Source: xbmcnetmoviesremote
-Section: user/hidden
+Source: simplexbmcremote
+Section: user/multimedia
 Priority: optional
-Maintainer: Ionutz <borco@unknown>
+Maintainer: Ionutz Borcoman <iborco@gmail.com>
 Build-Depends: debhelper (>= 5), libqt4-dev
 Standards-Version: 3.7.3
-Homepage: <insert the upstream URL, if relevant>
+Homepage: https://garage.maemo.org/projects/simple-xmbc-rem/
 
-Package: xbmcnetmoviesremote
+Package: simplexbmcremote
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
+Description: simple xbmc remote control
+ A simple application for controlling XBMC remotely (using HTTP) while watching movies.
+ .
+ Can navigate your video collection, start/pause/stop movies, skip forward and back, control the volume, switch the existing subtitles and languages.

diff --git a/src/qtc_packaging/debian_fremantle/copyright b/src/qtc_packaging/debian_fremantle/copyright
index 1e0f566..f68c623 100644 (file)
--- a/src/qtc_packaging/debian_fremantle/copyright
+++ b/src/qtc_packaging/debian_fremantle/copyright
@@ -1,40 +1,33 @@
 This package was debianized by Ionutz Borcoman <iborco@gmail.com> on
 Mon, 31 Jan 2011 14:34:36 +0200.
 
-It was downloaded from <url://example.com>
+It was downloaded from https://garage.maemo.org/projects/simple-xmbc-rem/
 
 Upstream Author(s):
 
-    <put author's name and email here>
-    <likewise for another author>
+    Ionutz Borcoman <iborco@gmail.com>
 
 Copyright:
 
-    <Copyright (C) YYYY Name OfAuthor>
-    <likewise for another author>
+    Copyright (C) 2011 Ionutz Borcoman
 
 License:
 
-    This package is free software; you can redistribute it and/or modify
+    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
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    This package is distributed in the hope that it will be useful,
+    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 package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
 The Debian packaging is (C) 2011, Ionutz Borcoman <iborco@gmail.com> and
 is licensed under the GPL, see above.
-
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.

diff --git a/src/qtc_packaging/debian_fremantle/rules b/src/qtc_packaging/debian_fremantle/rules
index f5b9893..834f6cb 100755 (executable)
--- a/src/qtc_packaging/debian_fremantle/rules
+++ b/src/qtc_packaging/debian_fremantle/rules
@@ -28,7 +28,7 @@ build-stamp: configure-stamp
 
        # Add here commands to compile the package.
        $(MAKE)
-       #docbook-to-man debian/xbmcnetmoviesremote.sgml > xbmcnetmoviesremote.1
+       #docbook-to-man debian/simplexbmcremote.sgml > simplexbmcremote.1
 
        touch $@
 
@@ -48,8 +48,8 @@ install: build
        dh_clean -k 
        dh_installdirs
 
-       # Add here commands to install the package into debian/xbmcnetmoviesremote.
-       $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/xbmcnetmoviesremote install
+       # Add here commands to install the package into debian/simplexbmcremote.
+       $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/simplexbmcremote install
 
 
 # Build architecture-independent files here.

diff --git a/src/simplexbmcremote.desktop b/src/simplexbmcremote.desktop
new file mode 100644 (file)
index 0000000..dfcfd18
--- /dev/null
+++ b/src/simplexbmcremote.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Name=simplexbmcremote
+Exec=/opt/usr/bin/simplexbmcremote
+Icon=simplexbmcremote
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable

diff --git a/src/simplexbmcremote.png b/src/simplexbmcremote.png
new file mode 100644 (file)
index 0000000..1a1f2e0
Binary files /dev/null and b/src/simplexbmcremote.png differ

diff --git a/src/simplexbmcremote.pro b/src/simplexbmcremote.pro
new file mode 100644 (file)
index 0000000..b35e480
--- /dev/null
+++ b/src/simplexbmcremote.pro
@@ -0,0 +1,50 @@
+# Add files and directories to ship with the application 
+# by adapting the examples below.
+# file1.source = myfile
+# dir1.source = mydir
+DEPLOYMENTFOLDERS = # file1 dir1
+
+# Avoid auto screen rotation
+#DEFINES += ORIENTATIONLOCK
+
+maemo5 {
+    message(Compiling for Maemo)
+    QT += maemo5
+    DEFINES += Q_WS_MAEMO_5
+} else {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += gtk+-2.0 libnotify
+}
+
+# Needs to be defined for Symbian
+DEFINES += NETWORKACCESS
+QT += network
+
+symbian:TARGET.UID3 = 0xED8FBFF1
+
+# If your application uses the Qt Mobility libraries, uncomment
+# the following lines and add the respective components to the 
+# MOBILITY variable. 
+# CONFIG += mobility
+# MOBILITY +=
+
+TARGET = simplexbmcremote
+
+SOURCES += main.cpp mainwindow.cpp \
+    setupdialog.cpp \
+    xbmc.cpp \
+    genericnotify.cpp
+HEADERS += mainwindow.h \
+    setupdialog.h \
+    constants.h \
+    xbmc.h \
+    genericnotify.h
+FORMS += mainwindow.ui \
+    setupdialog.ui
+
+# Please do not modify the following two lines. Required for deployment.
+include(deployment.pri)
+qtcAddDeployment()
+
+RESOURCES += \
+    simplexbmcremote.qrc

diff --git a/src/simplexbmcremote.qrc b/src/simplexbmcremote.qrc
new file mode 100644 (file)
index 0000000..9ffcd19
--- /dev/null
+++ b/src/simplexbmcremote.qrc
@@ -0,0 +1,16 @@
+<RCC>
+    <qresource prefix="/">
+        <file>images/btn_down.png</file>
+        <file>images/btn_enter.png</file>
+        <file>images/btn_left.png</file>
+        <file>images/btn_mute.png</file>
+        <file>images/btn_next_language.png</file>
+        <file>images/btn_next_subtitle.png</file>
+        <file>images/btn_play_pause.png</file>
+        <file>images/btn_right.png</file>
+        <file>images/btn_stop.png</file>
+        <file>images/btn_up.png</file>
+        <file>images/btn_volume_down.png</file>
+        <file>images/btn_volume_up.png</file>
+    </qresource>
+</RCC>

diff --git a/src/xbmcnetmoviesremote.desktop b/src/xbmcnetmoviesremote.desktop
deleted file mode 100644 (file)
index 853e250..0000000
--- a/src/xbmcnetmoviesremote.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=xbmcnetmoviesremote
-Exec=/opt/usr/bin/xbmcnetmoviesremote
-Icon=xbmcnetmoviesremote
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable

diff --git a/src/xbmcnetmoviesremote.png b/src/xbmcnetmoviesremote.png
deleted file mode 100644 (file)
index 1a1f2e0..0000000
Binary files a/src/xbmcnetmoviesremote.png and /dev/null differ

diff --git a/src/xbmcnetmoviesremote.pro b/src/xbmcnetmoviesremote.pro
deleted file mode 100644 (file)
index 0d867dc..0000000
--- a/src/xbmcnetmoviesremote.pro
+++ /dev/null
@@ -1,50 +0,0 @@
-# Add files and directories to ship with the application 
-# by adapting the examples below.
-# file1.source = myfile
-# dir1.source = mydir
-DEPLOYMENTFOLDERS = # file1 dir1
-
-# Avoid auto screen rotation
-#DEFINES += ORIENTATIONLOCK
-
-maemo5 {
-    message(Compiling for Maemo)
-    QT += maemo5
-    DEFINES += Q_WS_MAEMO_5
-} else {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += gtk+-2.0 libnotify
-}
-
-# Needs to be defined for Symbian
-DEFINES += NETWORKACCESS
-QT += network
-
-symbian:TARGET.UID3 = 0xED8FBFF1
-
-# If your application uses the Qt Mobility libraries, uncomment
-# the following lines and add the respective components to the 
-# MOBILITY variable. 
-# CONFIG += mobility
-# MOBILITY +=
-
-TARGET = xbmcnetmoviesremote
-
-SOURCES += main.cpp mainwindow.cpp \
-    setupdialog.cpp \
-    xbmc.cpp \
-    genericnotify.cpp
-HEADERS += mainwindow.h \
-    setupdialog.h \
-    constants.h \
-    xbmc.h \
-    genericnotify.h
-FORMS += mainwindow.ui \
-    setupdialog.ui
-
-# Please do not modify the following two lines. Required for deployment.
-include(deployment.pri)
-qtcAddDeployment()
-
-RESOURCES += \
-    xbmcnetmoviesremote.qrc

diff --git a/src/xbmcnetmoviesremote.qrc b/src/xbmcnetmoviesremote.qrc
deleted file mode 100644 (file)
index 9ffcd19..0000000
--- a/src/xbmcnetmoviesremote.qrc
+++ /dev/null
@@ -1,16 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>images/btn_down.png</file>
-        <file>images/btn_enter.png</file>
-        <file>images/btn_left.png</file>
-        <file>images/btn_mute.png</file>
-        <file>images/btn_next_language.png</file>
-        <file>images/btn_next_subtitle.png</file>
-        <file>images/btn_play_pause.png</file>
-        <file>images/btn_right.png</file>
-        <file>images/btn_stop.png</file>
-        <file>images/btn_up.png</file>
-        <file>images/btn_volume_down.png</file>
-        <file>images/btn_volume_up.png</file>
-    </qresource>
-</RCC>