r23593 - in /desktop/unstable/gedit/debian: changelog patches/90_autoreconf.patch rules
lethalman-guest at users.alioth.debian.org
lethalman-guest at users.alioth.debian.org
Thu Apr 8 09:12:56 UTC 2010
Author: lethalman-guest
Date: Thu Apr 8 09:12:50 2010
New Revision: 23593
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23593
Log:
* debian/patches/90_autoreconf.patch:
- Refreshed.
* debian/rules:
- Remove old lines referring ElementTree.py.
Modified:
desktop/unstable/gedit/debian/changelog
desktop/unstable/gedit/debian/patches/90_autoreconf.patch
desktop/unstable/gedit/debian/rules
Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=23593&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog [utf-8] (original)
+++ desktop/unstable/gedit/debian/changelog [utf-8] Thu Apr 8 09:12:50 2010
@@ -20,6 +20,8 @@
* debian/patches/03_python_path.patch,
debian/patches/90_autoreconf.patch:
- Refreshed.
+ * debian/rules:
+ - Remove old lines referring ElementTree.py.
-- Luca Bruno <lethalman88 at gmail.com> Wed, 07 Apr 2010 08:22:36 +0200
Modified: desktop/unstable/gedit/debian/patches/90_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/90_autoreconf.patch?rev=23593&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/90_autoreconf.patch [utf-8] (original)
+++ desktop/unstable/gedit/debian/patches/90_autoreconf.patch [utf-8] Thu Apr 8 09:12:50 2010
@@ -1,5 +1,6 @@
-autoreconf -f -i -Im4
-rm -rf autom4te.cache config.h.in\~
+autoreconf -vfi -Im4
+intltoolize -f -c --automake
+rm -rf autom4te.cache config.h.in\~ po/Makefile.in.in~
--- a/INSTALL
+++ b/INSTALL
@@ -2,18 +2,24 @@
@@ -30662,802 +30663,6 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- a/po/Makefile.in.in
-+++ b/po/Makefile.in.in
-@@ -1,216 +1,428 @@
--# Makefile for program source directory in GNU NLS utilities package.
--# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
--# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns at gmail.com>
-+# Makefile for PO directory in any package using GNU gettext.
-+# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
- #
--# This file may be copied and used freely without restrictions. It may
--# be used in projects which are not available under a GNU Public License,
--# but which still want to provide support for the GNU gettext functionality.
-+# This file can be copied and used freely without restrictions. It can
-+# be used in projects which are not available under the GNU General Public
-+# License but which still want to provide support for the GNU gettext
-+# functionality.
-+# Please note that the actual code of GNU gettext is covered by the GNU
-+# General Public License and is *not* in the public domain.
- #
--# - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
--# instead of PACKAGE and to look for po2tbl in ./ not in intl/
--#
--# - Modified by jacob berkman <jacob at ximian.com> to install
--# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
--#
--# - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
--#
--# We have the following line for use by intltoolize:
--# INTLTOOL_MAKEFILE
-+# Origin: gettext-0.17
-+GETTEXT_MACRO_VERSION = 0.17
-
--GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-
--SHELL = @SHELL@
-+SHELL = /bin/sh
-+ at SET_MAKE@
-
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
--top_builddir = @top_builddir@
- VPATH = @srcdir@
-
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = @datadir@
- datarootdir = @datarootdir@
--libdir = @libdir@
--DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
--subdir = po
--install_sh = @install_sh@
--# Automake >= 1.8 provides @mkdir_p at .
--# Until it can be supposed, use the safe fallback:
--mkdir_p = $(install_sh) -d
-+datadir = @datadir@
-+localedir = @localedir@
-+gettextsrcdir = $(datadir)/gettext/po
-
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-
--GMSGFMT = @GMSGFMT@
--MSGFMT = @MSGFMT@
--XGETTEXT = @XGETTEXT@
--INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
--INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
--GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
--
--ALL_LINGUAS = @ALL_LINGUAS@
--
--PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
--
--USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
--
--USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
--
--POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
--
--DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
--EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
-+# We use $(mkdir_p).
-+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
-+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-+# @install_sh@ does not start with $(SHELL), so we add it.
-+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
-+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
-+# versions, $(mkinstalldirs) and $(install_sh) are unused.
-+mkinstalldirs = $(SHELL) @install_sh@ -d
-+install_sh = $(SHELL) @install_sh@
-+MKDIR_P = @MKDIR_P@
-+mkdir_p = @mkdir_p@
-+
-+GMSGFMT_ = @GMSGFMT@
-+GMSGFMT_no = @GMSGFMT@
-+GMSGFMT_yes = @GMSGFMT_015@
-+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
-+MSGFMT_ = @MSGFMT@
-+MSGFMT_no = @MSGFMT@
-+MSGFMT_yes = @MSGFMT_015@
-+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
-+XGETTEXT_ = @XGETTEXT@
-+XGETTEXT_no = @XGETTEXT@
-+XGETTEXT_yes = @XGETTEXT_015@
-+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-+MSGMERGE = msgmerge
-+MSGMERGE_UPDATE = @MSGMERGE@ --update
-+MSGINIT = msginit
-+MSGCONV = msgconv
-+MSGFILTER = msgfilter
-+
-+POFILES = @POFILES@
-+GMOFILES = @GMOFILES@
-+UPDATEPOFILES = @UPDATEPOFILES@
-+DUMMYPOFILES = @DUMMYPOFILES@
-+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
-+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
-+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
-+$(POFILES) $(GMOFILES) \
-+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
-
- POTFILES = \
--# This comment gets stripped out
-
--CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-+CATALOGS = @CATALOGS@
-
--.SUFFIXES:
--.SUFFIXES: .po .pox .gmo .mo .msg .cat
-+# Makevars gets inserted here. (Don't remove this line!)
-
--.po.pox:
-- $(MAKE) $(GETTEXT_PACKAGE).pot
-- $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-+.SUFFIXES:
-+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
-
- .po.mo:
-- $(MSGFMT) -o $@ $<
-+ @echo "$(MSGFMT) -c -o $@ $<"; \
-+ $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
-
- .po.gmo:
-- file=`echo $* | sed 's,.*/,,'`.gmo \
-- && rm -f $$file && $(GMSGFMT) -o $$file $<
-+ @lang=`echo $* | sed -e 's,.*/,,'`; \
-+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-+ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
-+ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
-
--.po.cat:
-- sed -f ../intl/po2msg.sed < $< > $*.msg \
-- && rm -f $@ && gencat $@ $*.msg
-+.sin.sed:
-+ sed -e '/^#/d' $< > t-$@
-+ mv t-$@ $@
-
-
--all: all- at USE_NLS@
-+all: check-macro-version all- at USE_NLS@
-
--all-yes: $(CATALOGS)
-+all-yes: stamp-po
- all-no:
-
--$(GETTEXT_PACKAGE).pot: $(POTFILES)
-- $(GENPOT)
-+# Ensure that the gettext macros and this Makefile.in.in are in sync.
-+check-macro-version:
-+ @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
-+ || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
-+ exit 1; \
-+ }
-+
-+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
-+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
-+# we don't want to bother translators with empty POT files). We assume that
-+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
-+# In this case, stamp-po is a nop (i.e. a phony target).
-+
-+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
-+# been loosely updated. Its purpose is that when a developer or translator
-+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
-+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
-+# invocations of "make" will do nothing. This timestamp would not be necessary
-+# if updating the $(CATALOGS) would always touch them; however, the rule for
-+# $(POFILES) has been designed to not touch files that don't need to be
-+# changed.
-+stamp-po: $(srcdir)/$(DOMAIN).pot
-+ test ! -f $(srcdir)/$(DOMAIN).pot || \
-+ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
-+ @test ! -f $(srcdir)/$(DOMAIN).pot || { \
-+ echo "touch stamp-po" && \
-+ echo timestamp > stamp-poT && \
-+ mv stamp-poT stamp-po; \
-+ }
-+
-+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
-+# otherwise packages like GCC can not be built if only parts of the source
-+# have been downloaded.
-+
-+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
-+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
-+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-+ if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
-+ package_gnu='GNU '; \
-+ else \
-+ package_gnu=''; \
-+ fi; \
-+ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
-+ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
-+ else \
-+ msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
-+ fi; \
-+ case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
-+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
-+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-+ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
-+ --files-from=$(srcdir)/POTFILES.in \
-+ --copyright-holder='$(COPYRIGHT_HOLDER)' \
-+ --msgid-bugs-address="$$msgid_bugs_address" \
-+ ;; \
-+ *) \
-+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-+ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
-+ --files-from=$(srcdir)/POTFILES.in \
-+ --copyright-holder='$(COPYRIGHT_HOLDER)' \
-+ --package-name="$${package_gnu}@PACKAGE@" \
-+ --package-version='@VERSION@' \
-+ --msgid-bugs-address="$$msgid_bugs_address" \
-+ ;; \
-+ esac
-+ test ! -f $(DOMAIN).po || { \
-+ if test -f $(srcdir)/$(DOMAIN).pot; then \
-+ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
-+ sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
-+ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
-+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
-+ else \
-+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
-+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-+ fi; \
-+ else \
-+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-+ fi; \
-+ }
-+
-+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
-+# every "make" invocation, only create it when it is missing.
-+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
-+$(srcdir)/$(DOMAIN).pot:
-+ $(MAKE) $(DOMAIN).pot-update
-+
-+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
-+# Note that a PO file is not touched if it doesn't need to be changed.
-+$(POFILES): $(srcdir)/$(DOMAIN).pot
-+ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
-+ if test -f "$(srcdir)/$${lang}.po"; then \
-+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-+ cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
-+ else \
-+ $(MAKE) $${lang}.po-create; \
-+ fi
-+
-
--install: install-data
-+install: install-exec install-data
-+install-exec:
- install-data: install-data- at USE_NLS@
-+ if test "$(PACKAGE)" = "gettext-tools"; then \
-+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-+ for file in $(DISTFILES.common) Makevars.template; do \
-+ $(INSTALL_DATA) $(srcdir)/$$file \
-+ $(DESTDIR)$(gettextsrcdir)/$$file; \
-+ done; \
-+ for file in Makevars; do \
-+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-+ done; \
-+ else \
-+ : ; \
-+ fi
- install-data-no: all
- install-data-yes: all
-- linguas="$(USE_LINGUAS)"; \
-- for lang in $$linguas; do \
-- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-- $(mkdir_p) $$dir; \
-- if test -r $$lang.gmo; then \
-- $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-- echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-- else \
-- $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-- echo "installing $(srcdir)/$$lang.gmo as" \
-- "$$dir/$(GETTEXT_PACKAGE).mo"; \
-- fi; \
-- if test -r $$lang.gmo.m; then \
-- $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-- echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-- else \
-- if test -r $(srcdir)/$$lang.gmo.m ; then \
-- $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-- $$dir/$(GETTEXT_PACKAGE).mo.m; \
-- echo "installing $(srcdir)/$$lang.gmo.m as" \
-- "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-- else \
-- true; \
-+ $(mkdir_p) $(DESTDIR)$(datadir)
-+ @catalogs='$(CATALOGS)'; \
-+ for cat in $$catalogs; do \
-+ cat=`basename $$cat`; \
-+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-+ dir=$(localedir)/$$lang/LC_MESSAGES; \
-+ $(mkdir_p) $(DESTDIR)$$dir; \
-+ if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
-+ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
-+ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-+ if test -n "$$lc"; then \
-+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-+ for file in *; do \
-+ if test -f $$file; then \
-+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-+ fi; \
-+ done); \
-+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-+ else \
-+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-+ :; \
-+ else \
-+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-+ fi; \
-+ fi; \
-+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-+ ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-+ ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-+ cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-+ echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
- fi; \
-- fi; \
-+ done; \
- done
-
--# Empty stubs to satisfy archaic automake needs
--dvi info ctags tags CTAGS TAGS ID:
-+install-strip: install
-+
-+installdirs: installdirs-exec installdirs-data
-+installdirs-exec:
-+installdirs-data: installdirs-data- at USE_NLS@
-+ if test "$(PACKAGE)" = "gettext-tools"; then \
-+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-+ else \
-+ : ; \
-+ fi
-+installdirs-data-no:
-+installdirs-data-yes:
-+ $(mkdir_p) $(DESTDIR)$(datadir)
-+ @catalogs='$(CATALOGS)'; \
-+ for cat in $$catalogs; do \
-+ cat=`basename $$cat`; \
-+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-+ dir=$(localedir)/$$lang/LC_MESSAGES; \
-+ $(mkdir_p) $(DESTDIR)$$dir; \
-+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-+ if test -n "$$lc"; then \
-+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-+ for file in *; do \
-+ if test -f $$file; then \
-+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-+ fi; \
-+ done); \
-+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-+ else \
-+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-+ :; \
-+ else \
-+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-+ fi; \
-+ fi; \
-+ fi; \
-+ done; \
-+ done
-
- # Define this as empty until I found a useful application.
--install-exec installcheck:
-+installcheck:
-
--uninstall:
-- linguas="$(USE_LINGUAS)"; \
-- for lang in $$linguas; do \
-- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-+uninstall: uninstall-exec uninstall-data
-+uninstall-exec:
-+uninstall-data: uninstall-data- at USE_NLS@
-+ if test "$(PACKAGE)" = "gettext-tools"; then \
-+ for file in $(DISTFILES.common) Makevars.template; do \
-+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-+ done; \
-+ else \
-+ : ; \
-+ fi
-+uninstall-data-no:
-+uninstall-data-yes:
-+ catalogs='$(CATALOGS)'; \
-+ for cat in $$catalogs; do \
-+ cat=`basename $$cat`; \
-+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-+ for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
-+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-+ done; \
- done
-
--check: all $(GETTEXT_PACKAGE).pot
-- rm -f missing notexist
-- srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-- if [ -r missing -o -r notexist ]; then \
-- exit 1; \
-- fi
-+check: all
-+
-+info dvi ps pdf html tags TAGS ctags CTAGS ID:
-
- mostlyclean:
-- rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-- rm -f .intltool-merge-cache
-+ rm -f remove-potcdate.sed
-+ rm -f stamp-poT
-+ rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
-+ rm -fr *.o
-
- clean: mostlyclean
-
- distclean: clean
-- rm -f Makefile Makefile.in POTFILES stamp-it
-- rm -f *.mo *.msg *.cat *.cat.m *.gmo
-+ rm -f Makefile Makefile.in POTFILES *.mo
-
- maintainer-clean: distclean
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-- rm -f Makefile.in.in
-+ rm -f stamp-po $(GMOFILES)
-
--distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
--dist distdir: $(DISTFILES)
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+dist distdir:
-+ $(MAKE) update-po
-+ @$(MAKE) dist2
-+# This is a separate target because 'update-po' must be executed before.
-+dist2: stamp-po $(DISTFILES)
- dists="$(DISTFILES)"; \
-- extra_dists="$(EXTRA_DISTFILES)"; \
-- for file in $$extra_dists; do \
-- test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-+ if test "$(PACKAGE)" = "gettext-tools"; then \
-+ dists="$$dists Makevars.template"; \
-+ fi; \
-+ if test -f $(srcdir)/$(DOMAIN).pot; then \
-+ dists="$$dists $(DOMAIN).pot stamp-po"; \
-+ fi; \
-+ if test -f $(srcdir)/ChangeLog; then \
-+ dists="$$dists ChangeLog"; \
-+ fi; \
-+ for i in 0 1 2 3 4 5 6 7 8 9; do \
-+ if test -f $(srcdir)/ChangeLog.$$i; then \
-+ dists="$$dists ChangeLog.$$i"; \
-+ fi; \
- done; \
-+ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
- for file in $$dists; do \
-- test -f $$file || file="$(srcdir)/$$file"; \
-- ln $$file $(distdir) 2> /dev/null \
-- || cp -p $$file $(distdir); \
-+ if test -f $$file; then \
-+ cp -p $$file $(distdir) || exit 1; \
-+ else \
-+ cp -p $(srcdir)/$$file $(distdir) || exit 1; \
-+ fi; \
- done
-
- update-po: Makefile
-- $(MAKE) $(GETTEXT_PACKAGE).pot
-+ $(MAKE) $(DOMAIN).pot-update
-+ test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
-+ $(MAKE) update-gmo
-+
-+# General rule for creating PO files.
-+
-+.nop.po-create:
-+ @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
-+ echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
-+ exit 1
-+
-+# General rule for updating PO files.
-+
-+.nop.po-update:
-+ @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
-+ if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
- tmpdir=`pwd`; \
-- linguas="$(USE_LINGUAS)"; \
-- for lang in $$linguas; do \
-- echo "$$lang:"; \
-- result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-- if $$result; then \
-- if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-- rm -f $$tmpdir/$$lang.new.po; \
-- else \
-- if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-- :; \
-- else \
-- echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-- rm -f $$tmpdir/$$lang.new.po; \
-- exit 1; \
-- fi; \
-- fi; \
-- else \
-- echo "msgmerge for $$lang.gmo failed!"; \
-+ echo "$$lang:"; \
-+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-+ echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
-+ cd $(srcdir); \
-+ if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
-+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
- rm -f $$tmpdir/$$lang.new.po; \
-+ else \
-+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-+ :; \
-+ else \
-+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-+ exit 1; \
-+ fi; \
- fi; \
-- done
--
--Makefile POTFILES: stamp-it
-- @if test ! -f $@; then \
-- rm -f stamp-it; \
-- $(MAKE) stamp-it; \
-+ else \
-+ echo "msgmerge for $$lang.po failed!" 1>&2; \
-+ rm -f $$tmpdir/$$lang.new.po; \
- fi
-
--stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-+$(DUMMYPOFILES):
-+
-+update-gmo: Makefile $(GMOFILES)
-+ @:
-+
-+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
- cd $(top_builddir) \
-- && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-- $(SHELL) ./config.status
-+ && $(SHELL) ./config.status $(subdir)/$@.in po-directories
-+
-+force:
-
- # Tell versions [3.59,3.63) of GNU make not to export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- /dev/null
-+++ b/po/Makefile.in.in~
-@@ -0,0 +1,217 @@
-+# Makefile for program source directory in GNU NLS utilities package.
-+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
-+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns at gmail.com>
-+#
-+# This file may be copied and used freely without restrictions. It may
-+# be used in projects which are not available under a GNU Public License,
-+# but which still want to provide support for the GNU gettext functionality.
-+#
-+# - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
-+# instead of PACKAGE and to look for po2tbl in ./ not in intl/
-+#
-+# - Modified by jacob berkman <jacob at ximian.com> to install
-+# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-+#
-+# - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
-+#
-+# We have the following line for use by intltoolize:
-+# INTLTOOL_MAKEFILE
-+
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-+PACKAGE = @PACKAGE@
-+VERSION = @VERSION@
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = @top_builddir@
-+VPATH = @srcdir@
-+
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+libdir = @libdir@
-+DATADIRNAME = @DATADIRNAME@
-+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+subdir = po
-+install_sh = @install_sh@
-+# Automake >= 1.8 provides @mkdir_p at .
-+# Until it can be supposed, use the safe fallback:
-+mkdir_p = $(install_sh) -d
-+
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+
-+GMSGFMT = @GMSGFMT@
-+MSGFMT = @MSGFMT@
-+XGETTEXT = @XGETTEXT@
-+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-+GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-+
-+ALL_LINGUAS = @ALL_LINGUAS@
-+
-+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-+
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-+
-+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-+
-+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-+
-+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
-+
-+POTFILES = \
-+# This comment gets stripped out
-+
-+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-+
-+.SUFFIXES:
-+.SUFFIXES: .po .pox .gmo .mo .msg .cat
-+
-+.po.pox:
-+ $(MAKE) $(GETTEXT_PACKAGE).pot
-+ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-+
-+.po.mo:
-+ $(MSGFMT) -o $@ $<
-+
-+.po.gmo:
-+ file=`echo $* | sed 's,.*/,,'`.gmo \
-+ && rm -f $$file && $(GMSGFMT) -o $$file $<
-+
-+.po.cat:
-+ sed -f ../intl/po2msg.sed < $< > $*.msg \
-+ && rm -f $@ && gencat $@ $*.msg
-+
-+
-+all: all- at USE_NLS@
-+
-+all-yes: $(CATALOGS)
-+all-no:
-+
-+$(GETTEXT_PACKAGE).pot: $(POTFILES)
-+ $(GENPOT)
-+
-+install: install-data
-+install-data: install-data- at USE_NLS@
-+install-data-no: all
-+install-data-yes: all
-+ linguas="$(USE_LINGUAS)"; \
-+ for lang in $$linguas; do \
-+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-+ $(mkdir_p) $$dir; \
-+ if test -r $$lang.gmo; then \
-+ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-+ else \
-+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+ echo "installing $(srcdir)/$$lang.gmo as" \
-+ "$$dir/$(GETTEXT_PACKAGE).mo"; \
-+ fi; \
-+ if test -r $$lang.gmo.m; then \
-+ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-+ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+ else \
-+ if test -r $(srcdir)/$$lang.gmo.m ; then \
-+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-+ $$dir/$(GETTEXT_PACKAGE).mo.m; \
-+ echo "installing $(srcdir)/$$lang.gmo.m as" \
-+ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+ else \
-+ true; \
-+ fi; \
-+ fi; \
-+ done
-+
-+# Empty stubs to satisfy archaic automake needs
-+dvi info ctags tags CTAGS TAGS ID:
-+
-+# Define this as empty until I found a useful application.
-+install-exec installcheck:
-+
-+uninstall:
-+ linguas="$(USE_LINGUAS)"; \
-+ for lang in $$linguas; do \
-+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-+ done
-+
-+check: all $(GETTEXT_PACKAGE).pot
-+ rm -f missing notexist
-+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-+ if [ -r missing -o -r notexist ]; then \
-+ exit 1; \
-+ fi
-+
-+mostlyclean:
-+ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-+ rm -f .intltool-merge-cache
-+
-+clean: mostlyclean
-+
-+distclean: clean
-+ rm -f Makefile Makefile.in POTFILES stamp-it
-+ rm -f *.mo *.msg *.cat *.cat.m *.gmo
-+
-+maintainer-clean: distclean
-+ @echo "This command is intended for maintainers to use;"
-+ @echo "it deletes files that may require special tools to rebuild."
-+ rm -f Makefile.in.in
-+
-+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-+dist distdir: $(DISTFILES)
-+ dists="$(DISTFILES)"; \
-+ extra_dists="$(EXTRA_DISTFILES)"; \
-+ for file in $$extra_dists; do \
-+ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-+ done; \
-+ for file in $$dists; do \
-+ test -f $$file || file="$(srcdir)/$$file"; \
-+ ln $$file $(distdir) 2> /dev/null \
-+ || cp -p $$file $(distdir); \
-+ done
-+
-+update-po: Makefile
-+ $(MAKE) $(GETTEXT_PACKAGE).pot
-+ tmpdir=`pwd`; \
-+ linguas="$(USE_LINGUAS)"; \
-+ for lang in $$linguas; do \
-+ echo "$$lang:"; \
-+ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-+ if $$result; then \
-+ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-+ rm -f $$tmpdir/$$lang.new.po; \
-+ else \
-+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-+ :; \
-+ else \
-+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-+ rm -f $$tmpdir/$$lang.new.po; \
-+ exit 1; \
-+ fi; \
-+ fi; \
-+ else \
-+ echo "msgmerge for $$lang.gmo failed!"; \
-+ rm -f $$tmpdir/$$lang.new.po; \
-+ fi; \
-+ done
-+
-+Makefile POTFILES: stamp-it
-+ @if test ! -f $@; then \
-+ rm -f stamp-it; \
-+ $(MAKE) stamp-it; \
-+ fi
-+
-+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-+ cd $(top_builddir) \
-+ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-+ $(SHELL) ./config.status
-+
-+# Tell versions [3.59,3.63) of GNU make not to export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
--- /dev/null
+++ b/po/Makevars.template
@@ -0,0 +1,41 @@
@@ -31695,3 +30900,14 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+--- a/m4/intltool.m4
++++ b/m4/intltool.m4
+@@ -172,7 +172,7 @@
+ AC_DEFUN([IT_PO_SUBDIR],
+ [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+ dnl
+-dnl The following CONFIG_COMMANDS should be exetuted at the very end
++dnl The following CONFIG_COMMANDS should be executed at the very end
+ dnl of config.status.
+ AC_CONFIG_COMMANDS_PRE([
+ AC_CONFIG_COMMANDS([$1/stamp-it], [
Modified: desktop/unstable/gedit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/rules?rev=23593&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/rules [utf-8] (original)
+++ desktop/unstable/gedit/debian/rules [utf-8] Thu Apr 8 09:12:50 2010
@@ -8,10 +8,6 @@
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
binary-install/gedit::
- # Remove code copies of ElementTree.py
- rm debian/gedit/usr/lib/gedit-2/plugins/snippets/ElementTree.py
- rm debian/gedit/usr/lib/gedit-2/plugins/externaltools/ElementTree.py
-
cd debian/gedit/usr/share/gedit-2 && mv gedit-bugreport.sh gedit-bugreport
chmod 755 debian/gedit/usr/share/bug/gedit/script
dh_pysupport -pgedit /usr/lib/gedit-2/plugins
More information about the pkg-gnome-commits
mailing list