fixed build of ukeyboard for fremantle

diff --git a/Makefile b/Makefile
index 076b871..42e60ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ install:      all
        mv $(LOCALES_DIR)/build/* $(DESTDIR)/usr/lib/locale/
 
        $(MAKE) -C po DESTDIR=$(DESTDIR) install
-       $(MAKE) -C $(UKEYBOARD_DIR) DESTDIR=$(DESTDIR) install
+       CFLAGS="$(CFLAGS) -DHAVE_MAEMO5" $(MAKE) -C $(UKEYBOARD_DIR) DESTDIR=$(DESTDIR) install
 
 clean:
        rm -rf $(LOCALES_DIR)/build

diff --git a/debian/changelog b/debian/changelog
index c3ca6fe..429f786 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+slovak-l10n (0.3) unstable; urgency=low
+
+  * ukeyboard ported to Fremantle.
+
+ -- Roman Moravcik <roman.moravcik@gmail.com>  Wed, 14 Oct 2009 14:48:23 +0200
+
 slovak-l10n (0.2) unstable; urgency=low
 
   * Added posix-locales-2.6.0-9maemo1+0m5.

diff --git a/debian/patches/02_ukeyboard_installonly_sk.dpatch b/debian/patches/02_ukeyboard_installonly_sk.dpatch
index dc80b13..5a301f3 100755 (executable)
--- a/debian/patches/02_ukeyboard_installonly_sk.dpatch
+++ b/debian/patches/02_ukeyboard_installonly_sk.dpatch
@@ -37,5 +37,5 @@ diff -Naur slovak-l10n/ukeyboard/Makefile slovak-l10n/ukeyboard/Makefile
 -      install -d $(DESTDIR)/usr/share/icons/hicolor/26x26/apps
 -      install -m 0644 ukeyboard.png $(DESTDIR)/usr/share/icons/hicolor/26x26/apps/
        install -d $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr
- 
-       ifeq (,$(findstring HAVE_MAEMO5,$(CFLAGS)))
+ ifeq (,$(findstring HAVE_MAEMO5,$(CFLAGS)))
+       install -m 0644 xkb/rx44/ukeyboard $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/

diff --git a/ukeyboard/Makefile b/ukeyboard/Makefile
index 0276a79..80b7693 100644 (file)
--- a/ukeyboard/Makefile
+++ b/ukeyboard/Makefile
@@ -28,12 +28,11 @@ install:    ukeyboard-prefs keyboards-scv
        install -d $(DESTDIR)/usr/share/icons/hicolor/26x26/apps
        install -m 0644 ukeyboard.png $(DESTDIR)/usr/share/icons/hicolor/26x26/apps/
        install -d $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr
-
-       ifeq (,$(findstring HAVE_MAEMO5,$(CFLAGS)))
-               install -m 0644 xkb/rx44/ukeyboard $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/
-       else
-               install -m 0644 xkb/rx51/ukeyboard $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/
-       endif
+ifeq (,$(findstring HAVE_MAEMO5,$(CFLAGS)))
+       install -m 0644 xkb/rx44/ukeyboard $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/
+else
+       install -m 0644 xkb/rx51/ukeyboard $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/
+endif
 
 clean:
        $(MAKE) -C cpanel clean