r752 ./hildon-desktop/debian: * Cleanup whitespace.
Loïc Minier
lool at dooz.org
Fri Jun 27 00:19:43 UTC 2008
------------------------------------------------------------
revno: 752
committer: Loïc Minier <lool at dooz.org>
branch nick: debian
timestamp: Thu 2008-04-10 15:55:39 +0200
message:
* Cleanup whitespace.
* Cleanup rules.
modified:
debian/changelog
debian/control
debian/hildon-desktop.init
debian/rules
debian/start-hildon
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog 2008-04-10 13:52:58 +0000
+++ b/debian/changelog 2008-04-10 13:55:39 +0000
@@ -1,6 +1,8 @@
hildon-desktop (1:2.0.7.debian.1-2) UNRELEASED; urgency=low
* Drop now empty libhildon*dbg packages.
+ * Cleanup whitespace.
+ * Cleanup rules.
-- Loic Minier <lool at dooz.org> Thu, 10 Apr 2008 15:52:35 +0200
=== modified file 'debian/control'
--- a/debian/control 2008-04-10 13:52:58 +0000
+++ b/debian/control 2008-04-10 13:55:39 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Maemo Maintainers <pkg-maemo-maintainers at lists.alioth.debian.org>
XSBC-Original-Maintainer: Johan Bilien <johan.bilien at nokia.com>
-Uploaders: Loic Minier <lool at dooz.org>,
+Uploaders: Loic Minier <lool at dooz.org>,
Jonny Lamb <jonnylamb at jonnylamb.com>,
Riku Voipio <riku.voipio at iki.fi>
Build-Depends: debhelper (>= 5.0.0),
@@ -82,8 +82,8 @@
Depends: ${shlibs:Depends},
${misc:Depends},
libhildondesktop0 (>= ${source:Version}),
- libhildon-1-dev | hildon-libs-dev,
- libxml2-dev,
+ libhildon-1-dev | hildon-libs-dev,
+ libxml2-dev,
libdbus-glib-1-dev
Description: Hildon Desktop library development files
Hildon Desktop is a desktop environment for embedded devices. It
=== modified file 'debian/hildon-desktop.init'
--- a/debian/hildon-desktop.init 2007-09-19 10:01:43 +0000
+++ b/debian/hildon-desktop.init 2008-04-10 13:55:39 +0000
@@ -5,18 +5,18 @@
if [ -e /etc/osso-af-init/af-defines.sh ]
then
- source /etc/osso-af-init/af-defines.sh
+ source /etc/osso-af-init/af-defines.sh
fi
if [ "x${SU}" != "x" ]
then
- SUUSER="${SU} - user"
+ SUUSER="${SU} - user"
fi
case "$1" in
start)
$SUUSER $SCRIPT start
- sleep 8
+ sleep 8
;;
stop) $SUUSER $SCRIPT stop
=== modified file 'debian/rules'
--- a/debian/rules 2008-04-10 13:52:58 +0000
+++ b/debian/rules 2008-04-10 13:55:39 +0000
@@ -11,12 +11,12 @@
CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
ifneq (,$(findstring maemo-launcher,$(DEB_BUILD_OPTIONS)))
- LAUNCHER = yes
+ LAUNCHER = yes
endif
ifeq "$(strip $(LAUNCHER))" "yes"
- LAUNCHER_DEPENDS = -Vlauncher:Depends="maemo-launcher"
- LAUNCHER_LDFLAGS = -shared
+ LAUNCHER_DEPENDS = -Vlauncher:Depends="maemo-launcher"
+ LAUNCHER_LDFLAGS = -shared
endif
# Use soft-float and thumb mode if it enabled.
@@ -58,15 +58,14 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp
-# Add here commands to clean up after the build process.
+ rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
- dh_clean
+ dh_clean
install: build
dh_testdir
dh_testroot
-# dh_clean -k
+# dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
ifeq "$(strip $(LAUNCHER))" "yes"
@@ -78,25 +77,21 @@
dh_testdir
./autogen.sh
-# Build architecture-independent files here.
binary-indep: build install
dh_link -plibhildondesktop0-doc \
usr/share/gtk-doc/html/libhildondesktop \
usr/share/doc/libhildondesktop0-doc/libhildondesktop;
-
-# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
- dh_installchangelogs
+ dh_installchangelogs
dh_installdocs
dh_install --sourcedir=debian/tmp
install -m0755 debian/start-hildon debian/hildon-desktop/usr/bin/start-hildon
install -m644 $(CURDIR)/debian/config/*.conf $(CURDIR)/debian/hildon-desktop/etc/hildon-desktop
mkdir -p $(CURDIR)/debian/hildon-desktop/etc/xdg/menus
install -m644 $(CURDIR)/debian/config/*.menu $(CURDIR)/debian/hildon-desktop/etc/xdg/menus
-
dh_installmime
dh_installman
dh_link
@@ -111,4 +106,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install
=== modified file 'debian/start-hildon'
--- a/debian/start-hildon 2008-01-03 20:46:21 +0000
+++ b/debian/start-hildon 2008-04-10 13:55:39 +0000
@@ -5,7 +5,7 @@
export LANG=en_GB.UTF-8
# for testing set display to something sane
if [ "x$DISPLAY" = "x" ]; then
- export DISPLAY=:0
+ export DISPLAY=:0
fi
export MB_HUNG_APP_HANDLER='/usr/bin/hd-hung-app-handler'
export GTK2_RC_FILES=/usr/share/themes/plankton/gtk-2.0/gtkrc:/usr/share/themes/plankton/gtk-2.0/gtkrc.maemo_af_desktop
More information about the pkg-maemo-commits
mailing list