X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=debian%2Frules;h=2daa7f73caa408355335bc3002c2d04a9844805f;hp=73597e2dfb212aac0e5fbf4ec600181f58c34373;hb=d176ee93971b6b7c0cdee86482e2a3b693b93378;hpb=c0c21ca007878e397b8bb6a36f1d3bcb61fa6c64

diff --git a/debian/rules b/debian/rules
index 73597e2..2daa7f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,16 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-
-CFLAGS = -Wall -Wno-format -g
+CFLAGS = -Wall -g
+PACKAGENAME = modest
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -23,41 +20,47 @@ endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
+
 ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -mthumb
 endif
 
+ifeq (,$(findstring nolauncher,$(DEB_BUILD_OPTIONS)))
+	conf_opt = --enable-maemo-launcher
+endif
 
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-version=`ls libmodest-dbus-client/.libs/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls libmodest-dbus-client/.libs/lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-   
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	conf_opt += --enable-debug
+endif
 
-config.status:
-	if [ ! -x configure ]; then ./autogen.sh; fi
+config.status: configure
 	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	# commands to configure the package.
+	if [ ! -x configure ]; then ./autogen.sh; fi
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(conf_opt)
 
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	./autogen.sh
+	touch configure-stamp
 
 build: build-stamp
 
 build-stamp:  config.status
 	dh_testdir
 
-	# Add here commands to compile the package.
+        # commands to compile the package.
 	$(MAKE)
-
 	touch build-stamp
 
+
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
 
-	# Add here commands to clean up after the build process.
+# commands to clean up after the build process.
 	-$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -65,8 +68,6 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-
-
 	dh_clean 
 
 install: build
@@ -75,8 +76,14 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/modest
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/modest
+# install the package into debian/tmp/
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+# ACHTUNG: hack
+# we remove the modest.mo english localization, if the current control file contains a reference
+# to modest-l10n-mr0; thus, the modest package will not conflict with that one.
+# if modest-l10n-mr0 is not there, we'll install our own (en_GB) .mo file.
+	if grep -q modest-l10n-mr0 $(CURDIR)/debian/control ; then rm $(CURDIR)/debian/tmp/usr/share/locale/en_GB/LC_MESSAGES/modest.mo ; else echo "modest.mo not removed."; fi
 
 
 # Build architecture-independent files here.
@@ -85,12 +92,12 @@ binary-indep: build install
 
 # Build architecture-dependent files here.
 binary-arch: build install
-	dh_testdir 
-	dh_testroot  
+	dh_testdir
+	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
-#	dh_installexamples
-	dh_install --sourcedir=debian/modest 
+	dh_installexamples
+	dh_install --sourcedir=debian/tmp -v
 	dh_installmenu
 #	dh_installdebconf	
 #	dh_installlogrotate
@@ -101,18 +108,21 @@ binary-arch: build install
 #	dh_installcron
 #	dh_installinfo
 	dh_installman
-	dh_link 
-	dh_strip -a --dbg-package="modest" 
-	dh_compress 
-	dh_fixperms 
+	dh_link
+	dh_strip --keep-debug --dbg-package=modest --dbg-package=libmodest-dbus-client
+	dh_compress
+	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs  -V 
+	dh_makeshlibs
 	dh_installdeb
-	dh_shlibdeps -V
+	dh_shlibdeps
+	# 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
 	dh_md5sums
 	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