X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=debian%2Frules;h=2aa12e7734bc7b4e97f86efb17fc10ccc1de3093;hb=be0f892aad2b16990ef0dc6b66e970b3954db94f;hp=35e7f9a26c439afbac1672e74afe832fa4d275ab;hpb=341b97e027ed47e72bc681c23be98ec900d9cbea;p=modest

diff --git a/debian/rules b/debian/rules
index 35e7f9a..2aa12e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,9 +26,9 @@ ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
 endif
 
 LAUNCHER = no
-ifneq (,$(findstring maemo-launcher,$(DEB_BUILD_OPTIONS)))
-	LAUNCHER = yes
-endif
+#ifneq (,$(findstring maemo-launcher,$(DEB_BUILD_OPTIONS)))
+#	LAUNCHER = yes
+#endif
 
 ifeq "$(strip $(LAUNCHER))" "yes"
 	LAUNCHER_DEPENDS = -Vlauncher:Depends="maemo-launcher"
@@ -61,6 +61,7 @@ build-stamp:  config.status
          MAEMO_LAUNCHER_LDFLAGS="$(LAUNCHER_LDFLAGS)"
 	touch build-stamp
 
+
 clean:
 	dh_testdir
 	dh_testroot
@@ -92,6 +93,13 @@ ifeq "$(strip $(LAUNCHER))" "yes"
 	$(CURDIR)/debian/modest/usr/bin/modest
 endif
 
+# 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.
 binary-indep: build install
 # We have nothing to do by default.