From: Ivan Gorinov <igorinov@gmail.com>
Date: Fri, 4 Nov 2011 03:48:53 +0000 (-0700)
Subject: Remove faulty "make clean" step from debian/rules
X-Git-Url: http://git.maemo.org/git/?p=ameter;a=commitdiff_plain;h=a7482589d762b99d4117f2fb4035ef57c85dfc31

Remove faulty "make clean" step from debian/rules
---

diff --git a/ameter.pro b/ameter.pro
index 1ec0114..44d959c 100644
--- a/ameter.pro
+++ b/ameter.pro
@@ -1,5 +1,6 @@
 CONFIG += mobility qdbus
 MOBILITY += sensors
+QT += dbus
 
 SOURCES += main.cpp \
     mainwindow.cpp \
diff --git a/debian/control b/debian/control
index 8eb7b6d..8e5bef8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: ameter
 Section: user/utilities
 Priority: optional
 Maintainer: Ivan Gorinov <igorinov@gmail.com>
-Build-Depends: debhelper (>= 5), libqt4-dev, libqt4-dbus, mce-dev, libqtm-dev, libqtm-sensors
+Build-Depends: debhelper (>= 5), libqt4-dev, libqt4-dbus, libqtm-dev, libqtm-sensors, mce-dev
 Standards-Version: 3.7.3
 Homepage: http://catori.ru/igorinov/software/ameter/
-Bugtracker: https://garage.maemo.org/tracker/?group_id=2260
+XSBC-Bugtracker: https://garage.maemo.org/tracker/?group_id=2260
 
 Package: ameter
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 7989954..618739a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,35 +1,22 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
 
 APPNAME := ameter
 
-
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
 
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	qmake PREFIX=/usr $(APPNAME).pro
-
-	touch configure-stamp
-
+	touch $@
 
 build: build-stamp
 
 build-stamp: configure-stamp  
 	dh_testdir
-
 	# Add here commands to compile the package.
 	$(MAKE) $(APPNAME)
-	#docbook-to-man debian/ameter.sgml > ameter.1
-
 	touch $@
 
 clean: 
@@ -39,6 +26,9 @@ clean:
 
 	# Add here commands to clean up after the build process.
 	# $(MAKE) clean
+	rm -f $(APPNAME)
+	rm -f *.o
+	rm -f moc_*.cpp
 
 	dh_clean 
 
@@ -49,7 +39,7 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/ameter.
-	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/$(APPNAME) install
+	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install
 
 
 # Build architecture-independent files here.
@@ -63,24 +53,10 @@ binary-arch: build install
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps # Uncomment this line for use without Qt Creator
 	dh_gencontrol
diff --git a/mainwindow.cpp b/mainwindow.cpp
index e3bac8c..ab61fb2 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -142,9 +142,11 @@ void MainWindow::screenChange(const QDBusMessage &message)
     QString state = message.arguments().at(0).toString();
     if (!state.isEmpty()) {
         if (state == MCE_DISPLAY_OFF_STRING)
+        {
             accelerometer->stop();
-        if (state == MCE_DISPLAY_ON_STRING)
+        } else {
             accelerometer->start();
+        }
     }
 }
 #endif