summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorAndraž 'ruskie' Levstik2008-08-29 20:21:36 +0200
committerAndraž 'ruskie' Levstik2008-08-29 20:21:36 +0200
commit965ee38e98f3af7112736e38329722539964b562 (patch)
tree2093a1c99962a65e25ebd3d7e246530820e4dece /i18n
parent153a2159caca0f437e575ab5855a70edacdf8d1e (diff)
parent0b681af40bd832d8722e6d45b2f83aeda830ee3c (diff)
Merge branch 'master' into devel-xorg-modular
Conflicts: ChangeLog audio-soft/qjackctl/HISTORY display/qingy/DEPENDS editors/openoffice/HISTORY editors/vim/HISTORY gnome2-libs/libxklavier/DEPENDS gnome2-libs/libxklavier/HISTORY kde4-apps/dragonplayer/DEPENDS kde4-apps/dragonplayer/HISTORY kde4/KDE_DEPENDS kde4/kdebase4-runtime/DEPENDS php-pear/php/BUILD php-pear/php/DEPENDS php-pear/php4/HISTORY science/astrolog/DEPENDS science/astrolog/HISTORY shell-term-fm/mrxvt/HISTORY windowmanagers/blackbox/DEPENDS windowmanagers/blackbox/HISTORY wm-addons/bbkeys/HISTORY x11-libs/xfree86-devel/DEPENDS x11-libs/xfree86-devel/DETAILS x11-libs/xfree86-devel/HISTORY x11-libs/xfree86-devel/TRIGGERS x11-libs/xfree86/CONFLICTS x11-libs/xfree86/HISTORY x11-toolkits/fltk2/HISTORY x11/sunclock/DEPENDS x11/sunclock/HISTORY xfce/xfce4-profile/HISTORY xorg-lib/pixman/CONFLICTS
Diffstat (limited to 'i18n')
-rwxr-xr-xi18n/gjiten/DEPENDS4
-rw-r--r--i18n/gjiten/HISTORY4
2 files changed, 7 insertions, 1 deletions
diff --git a/i18n/gjiten/DEPENDS b/i18n/gjiten/DEPENDS
index 94c352b4cc..de8f39e7dc 100755
--- a/i18n/gjiten/DEPENDS
+++ b/i18n/gjiten/DEPENDS
@@ -1,2 +1,4 @@
+depends xmlto &&
depends libgnome &&
-depends libgnomeui
+depends libgnomeui &&
+suggest_depends kanjipad '' '' 'For Kanji input.'
diff --git a/i18n/gjiten/HISTORY b/i18n/gjiten/HISTORY
index 191b957c52..9baed6f019 100644
--- a/i18n/gjiten/HISTORY
+++ b/i18n/gjiten/HISTORY
@@ -1,3 +1,7 @@
+2008-08-21 Thomas Orgis <sobukus@sourcemage.org>
+ * DEPENDS: add xmlto
+ * DEPENDS: suggest kanjipad
+
2007-04-12 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* DETAILS: added fallback url