From: Kate Alhola Date: Wed, 22 Dec 2010 11:41:13 +0000 (+0200) Subject: www picture fix X-Git-Url: http://git.maemo.org/git/?p=mardrone;a=commitdiff_plain;h=424509600aa7bc6cf6ca2c0212b7759fd62071c8 www picture fix --- diff --git a/mardrone/Makefile b/mardrone/Makefile index 59b0564..a31cd76 100644 --- a/mardrone/Makefile +++ b/mardrone/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: mardrone -# Generated by qmake (2.01a) (Qt 4.7.0) on: Wed Dec 22 12:35:26 2010 +# Generated by qmake (2.01a) (Qt 4.7.0) on: Wed Dec 22 12:56:25 2010 # Project: mardrone.pro # Template: app # Command: /usr/bin/qmake -o Makefile mardrone.pro @@ -277,7 +277,9 @@ dronecontrol.o: dronecontrol.cpp dronecontrol.h \ navdata.o: navdata.cpp navdata.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o navdata.o navdata.cpp -video.o: video.cpp +video.o: video.cpp video.h \ + dronecontrol.h \ + navdata.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o video.o video.cpp gauge.o: gauge.cpp gauge.h @@ -324,9 +326,19 @@ uninstall_target: FORCE -$(DEL_DIR) $(INSTALL_ROOT)/opt/usr/bin/ -install: install_target FORCE +install_desktopfile: first FORCE + @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/share/applications/hildon/ || $(MKDIR) $(INSTALL_ROOT)/usr/share/applications/hildon/ + -$(INSTALL_FILE) /home/kathy/sb/harmattan/mardrone/mardrone/mardrone.desktop $(INSTALL_ROOT)/usr/share/applications/hildon/ + + +uninstall_desktopfile: FORCE + -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/share/applications/hildon/mardrone.desktop + -$(DEL_DIR) $(INSTALL_ROOT)/usr/share/applications/hildon/ + + +install: install_target install_desktopfile FORCE -uninstall: uninstall_target FORCE +uninstall: uninstall_target uninstall_desktopfile FORCE FORCE: diff --git a/mardrone/ardrone1.pro.user b/mardrone/ardrone1.pro.user deleted file mode 100644 index 844065e..0000000 --- a/mardrone/ardrone1.pro.user +++ /dev/null @@ -1,572 +0,0 @@ - - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - System - - - - ProjectExplorer.Project.Target.0 - - Desktop - Desktop - Qt4ProjectManager.Target.DesktopTarget - 3 - 0 - 0 - - - - qmake - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Make - Qt4ProjectManager.MakeStep - false - - sbox-make - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - Make - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Qt in PATH Release - Qt in PATH Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - /mnt/hgfs/scratchbox/harmattan/qtdemo/ardrone1-build-desktop - 11 - 0 - true - - - - - qmake - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Make - Qt4ProjectManager.MakeStep - false - - - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - Make - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - 4.5.0 Debug - 4.5.0 Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - /mnt/hgfs/scratchbox/harmattan/qtdemo/ardrone1-build-desktop - 6 - 0 - true - - - - - qmake - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Make - Qt4ProjectManager.MakeStep - false - - sbox-make - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - Make - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - 4.5.0 Release - 4.5.0 Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - /mnt/hgfs/scratchbox/harmattan/qtdemo/ardrone1-build-desktop - 11 - 0 - false - - - - - qmake - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Make - Qt4ProjectManager.MakeStep - false - - make - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - Make - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - 4.7.0 Debug - 4.7.0 Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - /mnt/hgfs/scratchbox/harmattan/qtdemo/ardrone1-build-desktop - 15 - 0 - true - - - - - qmake - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Make - Qt4ProjectManager.MakeStep - false - - sbox-make - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - Make - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - 4.7.0 Release - 4.7.0 Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - /mnt/hgfs/scratchbox/harmattan/qtdemo/ardrone1-build-desktop - 15 - 0 - false - - - - - qmake - - QtProjectManager.QMakeBuildStep - - - - Make - - Qt4ProjectManager.MakeStep - false - - sbox-qmake - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - Make - - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Sbox-qt Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - /mnt/hgfs/scratchbox/harmattan/qtdemo/ardrone1-build-desktop - 11 - 0 - false - - - - - qmake - - QtProjectManager.QMakeBuildStep - - - - Make - - Qt4ProjectManager.MakeStep - false - - sbox-make - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - Make - - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Sbox-qt Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - /mnt/hgfs/scratchbox/harmattan/qtdemo/ardrone1-build-desktop - 11 - 0 - false - - 7 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - No deployment - No deployment - ProjectExplorer.DefaultDeployConfiguration - - 1 - - ardrone1 - ardrone1 - Qt4ProjectManager.Qt4RunConfiguration - 2 - - ardrone1.pro - false - false - - false - - 3768 - true - false - - 1 - - - - ProjectExplorer.Project.Target.1 - - Maemo - Maemo - Qt4ProjectManager.Target.MaemoDeviceTarget - 0 - 0 - 0 - - - - - -d - sb/harmattan/qtdemo/ardrone1 - qmake - - /usr/bin/scratchbox - true - $BUILDDIR - Scratchbox qmake - Scratchbox qmake - ProjectExplorer.ProcessStep - - - - -d - sb/harmattan/qtdemo/ardrone1 - make - - /usr/bin/scratchbox - true - $BUILDDIR - Custom Process Step - Custom Process Step - ProjectExplorer.ProcessStep - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - Make - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - /mnt/hgfs/scratchbox/harmattan/qtdemo/ardrone1-build-maemo - 5 - 9 - true - - - - - qmake - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Make - Qt4ProjectManager.MakeStep - false - - - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - Make - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - /mnt/hgfs/scratchbox/harmattan/qtdemo/ardrone1-build-maemo - 5 - 9 - true - - 2 - - - - - - Qt4ProjectManager.MaemoDeployStep - true - 0 - - - - - - 1 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy to Maemo device - Deploy to Maemo device - ProjectExplorer.DefaultDeployConfiguration - - 1 - - ardrone1 - ardrone1 on Maemo device - Qt4ProjectManager.MaemoRunConfiguration - - 1 - - ardrone1.pro - - false - - 3768 - true - false - - 1 - - - - ProjectExplorer.Project.TargetCount - 2 - - - ProjectExplorer.Project.Updater.EnvironmentId - {900e65ba-cc00-43b1-ab21-347709bd318b} - - - ProjectExplorer.Project.Updater.FileVersion - 8 - - diff --git a/mardrone/debian/README b/mardrone/debian/README index bc73835..01a5ebb 100644 --- a/mardrone/debian/README +++ b/mardrone/debian/README @@ -1,6 +1,6 @@ -The Debian Package ardrone1 +The Debian Package mardrone ---------------------------- Comments regarding the Package - -- Kate Alhola Wed, 03 Nov 2010 15:06:48 +0200 + -- Kate Alhola Wed, 22 Dec 2010 15:06:48 +0200 diff --git a/mardrone/debian/ardrone1.debhelper.log b/mardrone/debian/ardrone1.debhelper.log deleted file mode 100644 index 30f3c4d..0000000 --- a/mardrone/debian/ardrone1.debhelper.log +++ /dev/null @@ -1,12 +0,0 @@ -dh_installdirs -dh_installchangelogs -dh_installdocs -dh_installexamples -dh_installman -dh_link -dh_compress -dh_fixperms -dh_installdeb -dh_gencontrol -dh_md5sums -dh_builddeb diff --git a/mardrone/debian/ardrone1.substvars b/mardrone/debian/ardrone1.substvars deleted file mode 100644 index abd3ebe..0000000 --- a/mardrone/debian/ardrone1.substvars +++ /dev/null @@ -1 +0,0 @@ -misc:Depends= diff --git a/mardrone/debian/ardrone1/DEBIAN/control b/mardrone/debian/ardrone1/DEBIAN/control deleted file mode 100644 index 8f52536..0000000 --- a/mardrone/debian/ardrone1/DEBIAN/control +++ /dev/null @@ -1,10 +0,0 @@ -Package: ardrone1 -Version: 0.0.1 -Architecture: armel -Maintainer: Kate Alhola -Installed-Size: 1093 -Section: user/hidden -Priority: optional -Homepage: -Description: AR-Drone flict controll app - diff --git a/mardrone/debian/ardrone1/DEBIAN/digsigsums b/mardrone/debian/ardrone1/DEBIAN/digsigsums deleted file mode 100644 index adbdb57..0000000 --- a/mardrone/debian/ardrone1/DEBIAN/digsigsums +++ /dev/null @@ -1 +0,0 @@ -S 15 com.nokia.maemo H 40 26de4fef16a037dbf6d77595bdd55a06f6644083 R 22 usr/local/bin/ardrone1 diff --git a/mardrone/debian/ardrone1/DEBIAN/md5sums b/mardrone/debian/ardrone1/DEBIAN/md5sums deleted file mode 100644 index ee74206..0000000 --- a/mardrone/debian/ardrone1/DEBIAN/md5sums +++ /dev/null @@ -1,4 +0,0 @@ -541c6f9bc17da48d2ad74b4aa25bd12d usr/local/bin/ardrone1 -9a5fabdfbec19c1bd2142756a4fe660a usr/share/applications/ardrone1.desktop -95488b5d54a11537a308d46dad867df8 usr/share/doc/ardrone1/changelog.gz -c008ad65eba6a7e0bc314031b96c0edb usr/share/doc/ardrone1/copyright diff --git a/mardrone/debian/ardrone1/usr/local/bin/ardrone1 b/mardrone/debian/ardrone1/usr/local/bin/ardrone1 deleted file mode 100755 index 9b1e370..0000000 Binary files a/mardrone/debian/ardrone1/usr/local/bin/ardrone1 and /dev/null differ diff --git a/mardrone/debian/ardrone1/usr/share/applications/ardrone1.desktop b/mardrone/debian/ardrone1/usr/share/applications/ardrone1.desktop deleted file mode 100644 index 087b45c..0000000 --- a/mardrone/debian/ardrone1/usr/share/applications/ardrone1.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=ardrone1 -Exec=/usr/local/bin/ardrone1 -Icon=ardrone1 -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/mardrone/debian/ardrone1/usr/share/doc/ardrone1/changelog.gz b/mardrone/debian/ardrone1/usr/share/doc/ardrone1/changelog.gz deleted file mode 100644 index 67ebc40..0000000 Binary files a/mardrone/debian/ardrone1/usr/share/doc/ardrone1/changelog.gz and /dev/null differ diff --git a/mardrone/debian/ardrone1/usr/share/doc/ardrone1/copyright b/mardrone/debian/ardrone1/usr/share/doc/ardrone1/copyright deleted file mode 100644 index b653c18..0000000 --- a/mardrone/debian/ardrone1/usr/share/doc/ardrone1/copyright +++ /dev/null @@ -1,40 +0,0 @@ -This package was debianized by Kate Alhola on -Wed, 03 Nov 2010 15:06:48 +0200. - -It was downloaded from - -Upstream Author(s): - - - - -Copyright: - - - - -License: - - This package 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 package 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 - -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) 2010, Kate Alhola 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/mardrone/debian/changelog b/mardrone/debian/changelog index 8b3d996..edb5de3 100644 --- a/mardrone/debian/changelog +++ b/mardrone/debian/changelog @@ -1,5 +1,5 @@ -ardrone1 (0.0.1) unstable; urgency=low +mardrone (0.0.1) unstable; urgency=low * Initial Release. - -- Kate Alhola Wed, 03 Nov 2010 15:06:48 +0200 + -- Kate Alhola Wed, 22 Dec 2010 15:06:48 +0200 diff --git a/mardrone/debian/control b/mardrone/debian/control index d8e892c..43096cb 100644 --- a/mardrone/debian/control +++ b/mardrone/debian/control @@ -1,12 +1,12 @@ -Source: ardrone1 +Source: mardrone Section: user/hidden Priority: optional Maintainer: Kate Alhola Build-Depends: debhelper (>= 5), libqt4-dev Standards-Version: 3.7.3 -Homepage: +Homepage: http://mardrone.garage.maemo.org -Package: ardrone1 +Package: mardrone Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: AR-Drone flict controll app diff --git a/mardrone/debian/files b/mardrone/debian/files index e1d7fc1..e4b77f3 100644 --- a/mardrone/debian/files +++ b/mardrone/debian/files @@ -1 +1 @@ -ardrone1_0.0.1_armel.deb user/hidden optional +mardrone_0.0.1_armel.deb user/hidden optional diff --git a/mardrone/debian/rules b/mardrone/debian/rules index 1260ad0..87fe5b0 100755 --- a/mardrone/debian/rules +++ b/mardrone/debian/rules @@ -28,7 +28,7 @@ build-stamp: configure-stamp # Add here commands to compile the package. $(MAKE) - #docbook-to-man debian/ardrone1.sgml > ardrone1.1 + #docbook-to-man debian/mardrone.sgml > mardrone.1 touch $@ @@ -48,8 +48,8 @@ install: build dh_clean -k dh_installdirs - # Add here commands to install the package into debian/ardrone1. - $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/ardrone1 install + # Add here commands to install the package into debian/mardrone. + $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/mardrone install # Build architecture-independent files here. diff --git a/mardrone/mardrone.desktop.maemo5 b/mardrone/mardrone.desktop.maemo5 index ab43682..d5518d4 100644 --- a/mardrone/mardrone.desktop.maemo5 +++ b/mardrone/mardrone.desktop.maemo5 @@ -4,7 +4,7 @@ Version=1.0 Type=Application Terminal=false Name=ardrone1 -Exec=/opt/usr/bin/ardrone1 -graphicssystem native +Exec=/opt/usr/bin/mardrone -graphicssystem native Icon=ardrone1 X-Window-Icon= X-HildonDesk-ShowInToolbar=true diff --git a/mardrone_0.0.1_armel.changes b/mardrone_0.0.1_armel.changes index 31d546d..9c8ecc0 100644 --- a/mardrone_0.0.1_armel.changes +++ b/mardrone_0.0.1_armel.changes @@ -2,7 +2,7 @@ Format: 1.7 Date: Wed, 22 Dec 2010 15:06:48 +0200 Source: mardrone Binary: mardrone -Architecture: armel +Architecture: source armel Version: 0.0.1 Distribution: unstable Urgency: low @@ -15,4 +15,6 @@ Changes: . * Initial Release. Files: - 53affe162f070951f74dbc4da93072ba 101084 user/hidden optional mardrone_0.0.1_armel.deb + b0206e6ed8d849166f2a4f76b44db354 269 user/hidden optional mardrone_0.0.1.dsc + bc27f970b6cb9e2dc8043d6518f53e7f 1131126 user/hidden optional mardrone_0.0.1.tar.gz + 92a66da819c197a0b6f87e8e8985f7e4 100940 user/hidden optional mardrone_0.0.1_armel.deb diff --git a/mardrone_0.0.1_armel.deb b/mardrone_0.0.1_armel.deb index 116befc..8756bc5 100644 Binary files a/mardrone_0.0.1_armel.deb and b/mardrone_0.0.1_armel.deb differ diff --git a/www/index.html b/www/index.html index c0ab66b..05e9e66 100644 --- a/www/index.html +++ b/www/index.html @@ -30,7 +30,7 @@