projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version and bug fix info update for week 06, 2010 - second release
[modest]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index
fd0a3ae
..
742754d
100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-25,8
+25,6
@@
ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
CFLAGS += -mthumb
endif
CFLAGS += -mthumb
endif
-# maemo-launcher support is not working properly yet, so leave it disabled
-#DEB_BUILD_OPTIONS := $(DEB_BUILD_OPTIONS),nolauncher
ifeq (,$(findstring nolauncher,$(DEB_BUILD_OPTIONS)))
conf_opt = --enable-maemo-launcher
endif
ifeq (,$(findstring nolauncher,$(DEB_BUILD_OPTIONS)))
conf_opt = --enable-maemo-launcher
endif
@@
-63,7
+61,9
@@
clean:
rm -f build-stamp
# commands to clean up after the build process.
rm -f build-stamp
# commands to clean up after the build process.
- -$(MAKE) distclean
+# -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
+
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
@@
-111,7
+111,7
@@
binary-arch: build install
# dh_installinfo
dh_installman
dh_link
# dh_installinfo
dh_installman
dh_link
- dh_strip --keep-debug --dbg-package=modest --dbg-package=libmodest-dbus-client
+ dh_strip --keep-debug --dbg-package=modest
dh_compress
dh_fixperms
# dh_perl
dh_compress
dh_fixperms
# dh_perl
@@
-122,7
+122,7
@@
binary-arch: build install
# Not a requirement by now, so don't fail if it's not installed
which dh_maemolauncher && dh_maemolauncher usr/bin/modest || true
dh_gencontrol
# Not a requirement by now, so don't fail if it's not installed
which dh_maemolauncher && dh_maemolauncher usr/bin/modest || true
dh_gencontrol
- sh debian/scripts/renew_control_file.sh
+# sh debian/scripts/renew_control_file.sh
dh_md5sums
dh_builddeb
dh_md5sums
dh_builddeb