From 299ea7a07fe4aa1eb084e82d84e95c38eebfae07 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Thu, 21 Oct 2010 19:40:19 +0200 Subject: [PATCH] * move around pots so launchpad likes us --- citadel/Makefile.in | 2 +- citadel/configure.ac | 4 ++-- citadel/po/{ => citadel-setup}/Makefile.in | 12 ++++++------ citadel/po/{ => citadel-setup}/ar.po | 0 citadel/po/{ => citadel-setup}/citadel-setup.pot | 0 citadel/po/{ => citadel-setup}/create-pot.sh | 2 +- citadel/po/{ => citadel-setup}/cs.po | 0 citadel/po/{ => citadel-setup}/de.po | 0 citadel/po/{ => citadel-setup}/es.po | 0 citadel/po/{ => citadel-setup}/fi.po | 0 citadel/po/{ => citadel-setup}/fr.po | 0 citadel/po/{ => citadel-setup}/ja.po | 0 citadel/po/{ => citadel-setup}/pt.po | 0 citadel/po/{ => citadel-setup}/ru.po | 0 citadel/po/{ => citadel-setup}/sv.po | 0 citadel/po/{ => citadel-setup}/vi.po | 0 16 files changed, 10 insertions(+), 10 deletions(-) rename citadel/po/{ => citadel-setup}/Makefile.in (59%) rename citadel/po/{ => citadel-setup}/ar.po (100%) rename citadel/po/{ => citadel-setup}/citadel-setup.pot (100%) rename citadel/po/{ => citadel-setup}/create-pot.sh (96%) rename citadel/po/{ => citadel-setup}/cs.po (100%) rename citadel/po/{ => citadel-setup}/de.po (100%) rename citadel/po/{ => citadel-setup}/es.po (100%) rename citadel/po/{ => citadel-setup}/fi.po (100%) rename citadel/po/{ => citadel-setup}/fr.po (100%) rename citadel/po/{ => citadel-setup}/ja.po (100%) rename citadel/po/{ => citadel-setup}/pt.po (100%) rename citadel/po/{ => citadel-setup}/ru.po (100%) rename citadel/po/{ => citadel-setup}/sv.po (100%) rename citadel/po/{ => citadel-setup}/vi.po (100%) diff --git a/citadel/Makefile.in b/citadel/Makefile.in index f1c873674..d51191ae3 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -227,7 +227,7 @@ msgform$(EXEEXT): utils/msgform.o .PHONY: install-data install-doc install-exec clean cleaner distclean install-locale: - cd po; $(MAKE) + cd po/citadel-setup; $(MAKE) for i in `find locale -type d | grep -v .svn` \ ; do \ test -d $(DESTDIR)$(LOCALEDIR)/$$i || mkdir -p $(DESTDIR)$(LOCALEDIR)/$$i; \ diff --git a/citadel/configure.ac b/citadel/configure.ac index f59fe78e6..f205fa445 100644 --- a/citadel/configure.ac +++ b/citadel/configure.ac @@ -439,7 +439,7 @@ fi if test "$ok_nls" != "no"; then AC_MSG_RESULT(citadel will be built with national language support.) AC_DEFINE(ENABLE_NLS, [], [whether we have NLS support]) - PROG_SUBDIRS="$PROG_SUBDIRS po" + PROG_SUBDIRS="$PROG_SUBDIRS po/citadel-setup" else AC_MSG_RESULT(citadel will be built without national language support.) fi @@ -1027,7 +1027,7 @@ AC_SUBST(SERVER_LDFLAGS) AC_SUBST(SERVER_LIBS) AC_SUBST(SETUP_LIBS) AC_CONFIG_FILES([Makefile]) -AC_OUTPUT(database_cleanup.sh po/Makefile) +AC_OUTPUT(database_cleanup.sh po/citadel-setup/Makefile) if test -z "$DATABASE"; then AC_MSG_WARN([No database driver was found. Please install Berkeley DB.]) diff --git a/citadel/po/Makefile.in b/citadel/po/citadel-setup/Makefile.in similarity index 59% rename from citadel/po/Makefile.in rename to citadel/po/citadel-setup/Makefile.in index e52afae95..50fb1b21a 100644 --- a/citadel/po/Makefile.in +++ b/citadel/po/citadel-setup/Makefile.in @@ -3,10 +3,10 @@ include ../Make_sources SRCS:= $(wildcard *.po) OBJS:= $(patsubst %.po, \ - ../locale/%/LC_MESSAGES/citadel-setup.mo, \ + ../../locale/%/LC_MESSAGES/citadel-setup.mo, \ $(SRCS)) -# ../locale/%/LC_MESSAGES/citadel_client.mo, \ -# ../locale/%/LC_MESSAGES/citadel_server.mo, \ +# ../../locale/%/LC_MESSAGES/citadel_client.mo, \ +# ../../locale/%/LC_MESSAGES/citadel_server.mo, \ .SUFFIXES: .po .mo @@ -15,10 +15,10 @@ OBJS:= $(patsubst %.po, \ all: $(OBJS) clean: - rm -r ../locale/* + rm -r ../../locale/* -../locale/%/LC_MESSAGES/citadel-setup.mo: %.po - mkdir -p $(patsubst %.po, ../locale/%/LC_MESSAGES, $<) +../../locale/%/LC_MESSAGES/citadel-setup.mo: %.po + mkdir -p $(patsubst %.po, ../../locale/%/LC_MESSAGES, $<) msgfmt -o $@ $< #../locale/%/LC_MESSAGES/citadel_client.mo: %.po diff --git a/citadel/po/ar.po b/citadel/po/citadel-setup/ar.po similarity index 100% rename from citadel/po/ar.po rename to citadel/po/citadel-setup/ar.po diff --git a/citadel/po/citadel-setup.pot b/citadel/po/citadel-setup/citadel-setup.pot similarity index 100% rename from citadel/po/citadel-setup.pot rename to citadel/po/citadel-setup/citadel-setup.pot diff --git a/citadel/po/create-pot.sh b/citadel/po/citadel-setup/create-pot.sh similarity index 96% rename from citadel/po/create-pot.sh rename to citadel/po/citadel-setup/create-pot.sh index eb2888c02..74f69cedf 100755 --- a/citadel/po/create-pot.sh +++ b/citadel/po/citadel-setup/create-pot.sh @@ -7,7 +7,7 @@ xgettext \ -k_ \ -o citadel-setup.pot \ --add-comments \ - ../utils/setup.c + ../../utils/setup.c #xgettext \ # --copyright-holder='The Citadel Project - http://www.citadel.org' \ diff --git a/citadel/po/cs.po b/citadel/po/citadel-setup/cs.po similarity index 100% rename from citadel/po/cs.po rename to citadel/po/citadel-setup/cs.po diff --git a/citadel/po/de.po b/citadel/po/citadel-setup/de.po similarity index 100% rename from citadel/po/de.po rename to citadel/po/citadel-setup/de.po diff --git a/citadel/po/es.po b/citadel/po/citadel-setup/es.po similarity index 100% rename from citadel/po/es.po rename to citadel/po/citadel-setup/es.po diff --git a/citadel/po/fi.po b/citadel/po/citadel-setup/fi.po similarity index 100% rename from citadel/po/fi.po rename to citadel/po/citadel-setup/fi.po diff --git a/citadel/po/fr.po b/citadel/po/citadel-setup/fr.po similarity index 100% rename from citadel/po/fr.po rename to citadel/po/citadel-setup/fr.po diff --git a/citadel/po/ja.po b/citadel/po/citadel-setup/ja.po similarity index 100% rename from citadel/po/ja.po rename to citadel/po/citadel-setup/ja.po diff --git a/citadel/po/pt.po b/citadel/po/citadel-setup/pt.po similarity index 100% rename from citadel/po/pt.po rename to citadel/po/citadel-setup/pt.po diff --git a/citadel/po/ru.po b/citadel/po/citadel-setup/ru.po similarity index 100% rename from citadel/po/ru.po rename to citadel/po/citadel-setup/ru.po diff --git a/citadel/po/sv.po b/citadel/po/citadel-setup/sv.po similarity index 100% rename from citadel/po/sv.po rename to citadel/po/citadel-setup/sv.po diff --git a/citadel/po/vi.po b/citadel/po/citadel-setup/vi.po similarity index 100% rename from citadel/po/vi.po rename to citadel/po/citadel-setup/vi.po -- 2.30.2