From: Tommi Komulainen Date: Wed, 17 Aug 2005 14:40:19 +0000 (+0000) Subject: 2005-08-17 Tommi Komulainen X-Git-Tag: 2.1.66-1~1460 X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=ff7e28e6f1113a61d3cd6622c17d9ec3f247a904;p=hildon 2005-08-17 Tommi Komulainen Update to new l10n packaging style. po-files (inside this package) are not used for now, the message catalogs come from separate packages and including them here would conflict. * Makefile.am (SUBDIRS): stop including po-files * Makefile.am (EXTRA_DIST): * debian/hildon-libs-l10n-engb.install: * debian/hildon-libs-l10n-src.install: * po/debian/*: Removed --- diff --git a/ChangeLog b/ChangeLog index 785860e..21c3b08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2005-08-17 Tommi Komulainen + + Update to new l10n packaging style. po-files (inside this package) + are not used for now, the message catalogs come from separate packages + and including them here would conflict. + + * Makefile.am (SUBDIRS): stop including po-files + * Makefile.am (EXTRA_DIST): + * debian/hildon-libs-l10n-engb.install: + * debian/hildon-libs-l10n-src.install: + * po/debian/*: Removed + 2005-08-09 Luc Pionchon * hildon-widgets/hildon-file-details-dialog.c: Added read only diff --git a/Makefile.am b/Makefile.am index 34655d2..49ccd06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = hildon-widgets ut po doc +SUBDIRS = hildon-widgets ut doc EXTRA_DIST = \ debian/changelog \ debian/control \ @@ -7,8 +7,6 @@ EXTRA_DIST = \ debian/hildon-libs-dev.install \ debian/hildon-libs0.install \ debian/hildon-libs0-dbg.install \ - debian/hildon-libs-l10n-engb.install \ - debian/hildon-libs-l10n-src.install \ debian/rules pkgconfigdir = $(libdir)/pkgconfig diff --git a/Makefile.in b/Makefile.in index 683174f..38139e1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -167,7 +167,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = hildon-widgets ut po doc +SUBDIRS = hildon-widgets ut doc EXTRA_DIST = \ debian/changelog \ debian/control \ @@ -176,8 +176,6 @@ EXTRA_DIST = \ debian/hildon-libs-dev.install \ debian/hildon-libs0.install \ debian/hildon-libs0-dbg.install \ - debian/hildon-libs-l10n-engb.install \ - debian/hildon-libs-l10n-src.install \ debian/rules @@ -197,10 +195,10 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/configure Makefile.am \ - aclocal.m4 config.guess config.h.in config.sub configure \ - configure.ac depcomp hildon-libs.pc.in install-sh ltmain.sh \ - missing mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/configure COPYING \ + ChangeLog Makefile.am aclocal.m4 config.guess config.h.in \ + config.sub configure configure.ac depcomp hildon-libs.pc.in \ + install-sh ltmain.sh missing mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/debian/hildon-libs-l10n-engb.install b/debian/hildon-libs-l10n-engb.install deleted file mode 100644 index 059d74a..0000000 --- a/debian/hildon-libs-l10n-engb.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/locale/en_GB/LC_MESSAGES/hildon-libs.mo diff --git a/debian/hildon-libs-l10n-src.install b/debian/hildon-libs-l10n-src.install deleted file mode 100644 index 3335178..0000000 --- a/debian/hildon-libs-l10n-src.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/osso/l10n/hildon-libs/* diff --git a/po/debian/compat b/po/debian/compat deleted file mode 100644 index b8626c4..0000000 --- a/po/debian/compat +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/po/debian/control b/po/debian/control deleted file mode 100644 index 8876493..0000000 --- a/po/debian/control +++ /dev/null @@ -1,11 +0,0 @@ -Source: hildon-libs-l10n-src -Section: x11 -Priority: optional -Maintainer: Luc Pionchon -Build-Depends: debhelper (>= 4.0.0), gettext -Standards-Version: 3.6.0 - -Package: hildon-libs-l10n-engb -Architecture: all -Description: Locale for package hildon-libs - en_GB locale for hildon-libs. diff --git a/po/debian/hildon-libs-l10n-engb.install b/po/debian/hildon-libs-l10n-engb.install deleted file mode 100644 index 059d74a..0000000 --- a/po/debian/hildon-libs-l10n-engb.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/locale/en_GB/LC_MESSAGES/hildon-libs.mo diff --git a/po/debian/rules b/po/debian/rules deleted file mode 100755 index d02d2e0..0000000 --- a/po/debian/rules +++ /dev/null @@ -1,106 +0,0 @@ -#!/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 -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -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 --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info - - -build: build-stamp - -build-stamp: - dh_testdir - - # Add here commands to compile the package. - $(MAKE) -f porules.mk - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) -f porules.mk distclean -#ifneq "$(wildcard /usr/share/misc/config.sub)" "" -# cp -f /usr/share/misc/config.sub config.sub -#endif -#ifneq "$(wildcard /usr/share/misc/config.guess)" "" -# cp -f /usr/share/misc/config.guess config.guess -#endif - - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/pkgname/ - $(MAKE) -f porules.mk install DESTDIR=$(CURDIR)/debian/tmp - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs -# dh_installexamples - dh_install --sourcedir=debian/tmp -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo -# dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_python -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install