r25402 - in /packages/unstable/libgksu/debian: changelog control control.in patches/99_intltool.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Oct 19 21:21:01 UTC 2010
Author: joss
Date: Tue Oct 19 21:20:55 2010
New Revision: 25402
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25402
Log:
* 99_intltool.patch: update po/Makefile.in.in with a working intltool
version. Closes: #599420.
* Build-depend on intltool since it’s how it works nowadays.
Added:
packages/unstable/libgksu/debian/patches/99_intltool.patch
Modified:
packages/unstable/libgksu/debian/changelog
packages/unstable/libgksu/debian/control
packages/unstable/libgksu/debian/control.in
Modified: packages/unstable/libgksu/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgksu/debian/changelog?rev=25402&op=diff
==============================================================================
--- packages/unstable/libgksu/debian/changelog [utf-8] (original)
+++ packages/unstable/libgksu/debian/changelog [utf-8] Tue Oct 19 21:20:55 2010
@@ -1,3 +1,11 @@
+libgksu (2.0.13~pre1-2) unstable; urgency=low
+
+ * 99_intltool.patch: update po/Makefile.in.in with a working intltool
+ version. Closes: #599420.
+ * Build-depend on intltool since it’s how it works nowadays.
+
+ -- Josselin Mouette <joss at debian.org> Tue, 19 Oct 2010 23:15:55 +0200
+
libgksu (2.0.13~pre1-1) unstable; urgency=low
* Upstream snapshot
Modified: packages/unstable/libgksu/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgksu/debian/control?rev=25402&op=diff
==============================================================================
--- packages/unstable/libgksu/debian/control [utf-8] (original)
+++ packages/unstable/libgksu/debian/control [utf-8] Tue Oct 19 21:20:55 2010
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
Source: libgksu
Section: admin
Priority: optional
@@ -15,7 +20,8 @@
gnome-pkg-tools (>= 0.10),
libgtop2-dev,
dpkg-dev (>= 1.13.19),
- libglib2.0-doc
+ libglib2.0-doc,
+ intltool
Standards-Version: 3.7.3
Homepage: http://www.nongnu.org/gksu
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgksu/
Modified: packages/unstable/libgksu/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgksu/debian/control.in?rev=25402&op=diff
==============================================================================
--- packages/unstable/libgksu/debian/control.in [utf-8] (original)
+++ packages/unstable/libgksu/debian/control.in [utf-8] Tue Oct 19 21:20:55 2010
@@ -15,7 +15,8 @@
gnome-pkg-tools (>= 0.10),
libgtop2-dev,
dpkg-dev (>= 1.13.19),
- libglib2.0-doc
+ libglib2.0-doc,
+ intltool
Standards-Version: 3.7.3
Homepage: http://www.nongnu.org/gksu
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgksu/
Added: packages/unstable/libgksu/debian/patches/99_intltool.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgksu/debian/patches/99_intltool.patch?rev=25402&op=file
==============================================================================
--- packages/unstable/libgksu/debian/patches/99_intltool.patch (added)
+++ packages/unstable/libgksu/debian/patches/99_intltool.patch [utf-8] Tue Oct 19 21:20:55 2010
@@ -1,0 +1,323 @@
+--- libgksu-2.0.13~pre1.orig/po/Makefile.in.in 2008-05-09 19:39:57.000000000 +0200
++++ libgksu-2.0.13~pre1/po/Makefile.in.in 2010-10-19 23:10:01.455442244 +0200
+@@ -1,10 +1,10 @@
+ # 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 file be copied and used freely without restrictions. It can
+-# be used in projects which are not available under the GNU Public License
++# 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.
+-# Please note that the actual code is *not* freely available.
+ #
+ # - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
+ # instead of PACKAGE and to look for po2tbl in ./ not in intl/
+@@ -12,7 +12,7 @@
+ # - 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 at novell.com> for use with intltool
++# - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
+ #
+ # We have the following line for use by intltoolize:
+ # INTLTOOL_MAKEFILE
+@@ -21,12 +21,11 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+
+-SHELL = /bin/sh
+- at SET_MAKE@
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+-top_builddir = ..
++top_builddir = @top_builddir@
+ VPATH = @srcdir@
+
+ prefix = @prefix@
+@@ -34,18 +33,17 @@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+-localedir = $(libdir)/locale
+-gnulocaledir = $(datadir)/locale
+-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
++DATADIRNAME = @DATADIRNAME@
++itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+ subdir = po
+ install_sh = @install_sh@
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++# 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@
+
+-CC = @CC@
+-GENCAT = @GENCAT@
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
+ XGETTEXT = @XGETTEXT@
+@@ -54,32 +52,26 @@
+ 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
+
+-DEFS = @DEFS@
+-CFLAGS = @CFLAGS@
+-CPPFLAGS = @CPPFLAGS@
+-
+-INCLUDES = -I.. -I$(top_srcdir)/intl
+-
+-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+-
+-SOURCES =
+-POFILES = @POFILES@
+-GMOFILES = @GMOFILES@
+-DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
+-$(POFILES) $(SOURCES)
+-EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
++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 = @CATALOGS@
+-CATOBJEXT = @CATOBJEXT@
+-INSTOBJEXT = @INSTOBJEXT@
++CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+
+ .SUFFIXES:
+-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+-
+-.c.o:
+- $(COMPILE) $<
++.SUFFIXES: .po .pox .gmo .mo .msg .cat
+
+ .po.pox:
+ $(MAKE) $(GETTEXT_PACKAGE).pot
+@@ -94,7 +86,7 @@
+
+ .po.cat:
+ sed -f ../intl/po2msg.sed < $< > $*.msg \
+- && rm -f $@ && $(GENCAT) $@ $*.msg
++ && rm -f $@ && gencat $@ $*.msg
+
+
+ all: all- at USE_NLS@
+@@ -105,120 +97,90 @@
+ $(GETTEXT_PACKAGE).pot: $(POTFILES)
+ $(GENPOT)
+
+-install: install-exec install-data
+-install-exec:
++install: install-data
+ install-data: install-data- at USE_NLS@
+ install-data-no: all
+ install-data-yes: all
+- if test -n "$(MKINSTALLDIRS)"; then \
+- $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+- else \
+- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+- fi
+- @catalogs='$(CATALOGS)'; \
+- for cat in $$catalogs; do \
+- cat=`basename $$cat`; \
+- case "$$cat" in \
+- *.gmo) destdir=$(gnulocaledir);; \
+- *) destdir=$(localedir);; \
+- esac; \
+- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+- dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
+- if test -n "$(MKINSTALLDIRS)"; then \
+- $(MKINSTALLDIRS) $$dir; \
+- else \
+- $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
+- fi; \
+- if test -r $$cat; then \
+- $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+- echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
++ 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)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+- echo "installing $(srcdir)/$$cat as" \
+- "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
++ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
++ echo "installing $(srcdir)/$$lang.gmo as" \
++ "$$dir/$(GETTEXT_PACKAGE).mo"; \
+ fi; \
+- if test -r $$cat.m; then \
+- $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+- echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
++ 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)/$$cat.m ; then \
+- $(INSTALL_DATA) $(srcdir)/$$cat.m \
+- $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+- echo "installing $(srcdir)/$$cat as" \
+- "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
++ 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
+- if test "$(PACKAGE)" = "glib"; then \
+- if test -n "$(MKINSTALLDIRS)"; then \
+- $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
+- else \
+- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
+- fi; \
+- $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
+- $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+- else \
+- : ; \
+- fi
++
++# Empty stubs to satisfy archaic automake needs
++dvi info ctags tags CTAGS TAGS ID:
+
+ # Define this as empty until I found a useful application.
+-installcheck:
++install-exec installcheck:
+
+ uninstall:
+- catalogs='$(CATALOGS)'; \
+- for cat in $$catalogs; do \
+- cat=`basename $$cat`; \
+- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+- rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+- rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
++ 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
+- if test "$(PACKAGE)" = "glib"; then \
+- rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+- fi
+
+ check: all $(GETTEXT_PACKAGE).pot
+-
+-dvi info tags TAGS ID:
++ rm -f missing notexist
++ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
++ if [ -r missing -o -r notexist ]; then \
++ exit 1; \
++ fi
+
+ mostlyclean:
+- rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+- rm -fr *.o
++ 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
+- rm -f *.mo *.msg *.cat *.cat.m $(GMOFILES)
++ 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 = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
++distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+ dist distdir: $(DISTFILES)
+ dists="$(DISTFILES)"; \
+ extra_dists="$(EXTRA_DISTFILES)"; \
+ for file in $$extra_dists; do \
+- test -f $$file && dists="$$dists $$file"; \
++ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+ done; \
+ for file in $$dists; do \
+- ln $(srcdir)/$$file $(distdir) 2> /dev/null \
+- || cp -p $(srcdir)/$$file $(distdir); \
++ 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`; \
+- catalogs='$(CATALOGS)'; \
+- for cat in $$catalogs; do \
+- cat=`basename $$cat`; \
+- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
++ linguas="$(USE_LINGUAS)"; \
++ for lang in $$linguas; do \
+ echo "$$lang:"; \
+ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+ if $$result; then \
+@@ -234,28 +196,20 @@
+ fi; \
+ fi; \
+ else \
+- echo "msgmerge for $$cat failed!"; \
++ echo "msgmerge for $$lang.gmo failed!"; \
+ rm -f $$tmpdir/$$lang.new.po; \
+ fi; \
+ done
+
+-# POTFILES is created from POTFILES.in by stripping comments, empty lines
+-# and Intltool tags (enclosed in square brackets), and appending a full
+-# relative path to them
+-POTFILES: POTFILES.in
+- ( posrcprefix='$(top_srcdir)/'; \
+- rm -f $@-t $@ \
+- && (sed -e '/^#/d' \
+- -e 's/^[[].*] *//' \
+- -e '/^[ ]*$$/d' \
+- -e "s@^@ $$posrcprefix@" $(srcdir)/$@.in \
+- | sed -e '$$!s/$$/ \\/') > $@-t \
+- && chmod a-w $@-t \
+- && mv $@-t $@ )
+-
+-Makefile: Makefile.in.in ../config.status POTFILES
+- cd .. \
+- && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
++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.
More information about the pkg-gnome-commits
mailing list