gsetroot (1.1-2.2) debian-dir only changes

Summary

 debian/changelog                   |   68 +++
 debian/compat                      |    1 
 debian/control                     |   16 
 debian/copyright                   |   24 +
 debian/dirs                        |    2 
 debian/gsetroot.1                  |   16 
 debian/manpages                    |    1 
 debian/menu                        |    2 
 debian/patches/00list              |    2 
 debian/patches/gsetroot_pot.dpatch |  729 +++++++++++++++++++++++++++++++++++++
 debian/patches/macro_dir.dpatch    |   32 +
 debian/rules                       |   87 ++++
 debian/watch                       |    2 
 13 files changed, 982 insertions(+)

    
download this patch

Patch contents

--- gsetroot-1.1.orig/debian/control
+++ gsetroot-1.1/debian/control
@@ -0,0 +1,16 @@
+Source: gsetroot
+Section: x11
+Priority: extra
+Maintainer: Anibal Avelar <aavelar@cofradia.org>
+Build-Depends: debhelper (>= 5), automake, autoconf, libtool, autotools-dev, pkg-config, libgtk2.0-dev, gettext (>= 0.15), dpatch, autopoint
+Homepage: http://gsetroot.sourceforge.net
+Standards-Version: 3.7.3
+
+Package: gsetroot
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, eterm
+Description: a C/Gtk-based front-end for Esetroot
+ It can be used to choose a wallpaper and configure root window. 
+ It works under Window Managers like FluxBox, Enlightenment, WindowMaker
+ NextStep, BlackBox, IceWM and others...
+ This software is under the GPL license.
--- gsetroot-1.1.orig/debian/changelog
+++ gsetroot-1.1/debian/changelog
@@ -0,0 +1,68 @@
+gsetroot (1.1-2.2) unstable; urgency=low
+
+  [Jari Aalto]
+  * Non-maintainer upload.
+  * debian/control
+    - (Build-Depends): Change automake1.9 to automake. Add
+      autopoint. Thanks to Ilya Barygin <barygin@gmail.com>.
+  * debian/patches
+    - (macro-dir): New file to fix libtool version mismatch.
+      Patch thanks to Ilya Barygin <barygin@gmail.com>.
+      (serious RC bug; Closes: #560568).
+  * debian/rules
+    - (config.status): Replace all automake calls with
+      'autoreconf -vfi'. Thanks to Ilya Barygin <barygin@gmail.com>.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Tue, 13 Apr 2010 19:08:12 +0300
+
+gsetroot (1.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update ltmain.sh, fix FTBFS. (Closes: #527754)
+
+ -- Stefano Zacchiroli <zack@debian.org>  Sun, 01 Nov 2009 18:01:48 +0100
+
+gsetroot (1.1-2) unstable; urgency=low
+
+  * Fixed when debian/watch fails to report upstream's version 
+    (Closes: #449834)
+  * Updated with Standards-Version 3.7.3
+  * Added the Homepage field inside the source stanza on debian/control
+  * Added patch to a swedish PO translation (Closes: #349738)
+  * Added the dependency with gettext package for locale translations works.
+  * Added the dependency with dpatch package to apply the locale patch.
+  * Fixed debian/rules file. Removed unnecessary code.
+  * The make install DESTDIR= is called instead to use gsetroot dh_install
+    script. For that also was deleted the debian/gsetroot.install file.
+  * Cleaned the debian/copyright file with minor details.
+  * Fixed the debian/menu file to point to the correct section.
+
+ -- Anibal Avelar <aavelar@cofradia.org>  Sun, 10 Feb 2008 18:17:49 +0100
+
+
+gsetroot (1.1-1) unstable; urgency=low
+
+  * New maintainer (Closes: #387474)
+  * New upstream version
+  * Fixed a FTBFS bug: aclocal: macro `AM_PROG_MKDIR_P' required but not defined
+  * Set debhelper compatibility to 5.
+  * Added watch file.
+
+ -- Anibal Avelar (Fixxxer) <aavelar@cofradia.org>  Sun, 05 Nov 2006 19:21:49 +0100
+
+gsetroot (1.0-2) unstable; urgency=low
+
+  * QA upload.
+  * Set maintainer to QA Group; Orphaned: #387474
+  * Fix Override disparity
+  * Remove config.log on clean
+  * Conforms with latest Standards Version 3.7.2
+
+ -- Michael Ablassmeier <abi@debian.org>  Thu, 28 Sep 2006 09:50:13 +0200
+
+gsetroot (1.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #311953).
+
+ -- William Vera <billy@billy.com.mx>  Tue,  5 Jul 2005 21:55:03 -0500
+
--- gsetroot-1.1.orig/debian/manpages
+++ gsetroot-1.1/debian/manpages
@@ -0,0 +1 @@
+debian/gsetroot.1
--- gsetroot-1.1.orig/debian/rules
+++ gsetroot-1.1/debian/rules
@@ -0,0 +1,87 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
+
+# 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
+
+config.status: 
+	autoreconf -vfi
+	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: patch-stamp build-stamp
+
+
+build-stamp: config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+	touch build-stamp
+
+clean: unpatch 
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean
+	-rm -f config.sub config.guess config.log configure aclocal.m4 libtool
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+	# Add here commands to install the package into debian/gsetroot.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/gsetroot
+
+
+# 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 ChangeLog
+	dh_installdocs
+	dh_installmenu
+	dh_installexamples
+	dh_installman -A
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- gsetroot-1.1.orig/debian/watch
+++ gsetroot-1.1/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/gsetroot/gsetroot-([\d\.]+).tar.gz
--- gsetroot-1.1.orig/debian/gsetroot.1
+++ gsetroot-1.1/debian/gsetroot.1
@@ -0,0 +1,16 @@
+.TH gsetroot 1 "July 5, 2005" ""
+
+.SH NAME
+gsetroot \-a C/Gtk-based front-end for Esetroot.
+
+.SH SYNOPSIS
+.B gsetroot
+.RI 
+.br
+
+.SH DESCRIPTION
+It can be used to choose a wallpaper and configure root window.
+It works under Window Managers like FluxBox, Enlightenment, WindowMaker, NextSte, BlackBox, IceWM and others.
+.SH AUTHOR
+gsetroot written by Lounis Bellabes <nolius@users.sourceforge.net>
+
--- gsetroot-1.1.orig/debian/copyright
+++ gsetroot-1.1/debian/copyright
@@ -0,0 +1,24 @@
+This package was debianized by William Vera <billy@billy.com.mx> on
+Tue,  5 Jul 2005 21:55:03 -0500. Since Sun, 05 Nov 2006 maintained by Anibal Avelar <aavelar@cofradia.org>.
+
+It was downloaded from: http://gsetroot.sourceforge.net
+
+Copyright: (C) 2005 Lounis Bellabes <nolius@users.sourceforge.net>.
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
--- gsetroot-1.1.orig/debian/dirs
+++ gsetroot-1.1/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/share
--- gsetroot-1.1.orig/debian/menu
+++ gsetroot-1.1/debian/menu
@@ -0,0 +1,2 @@
+?package(gsetroot):needs="X11" section="Applications/System/Administration"\
+  title="gsetroot" command="/usr/bin/gsetroot"
--- gsetroot-1.1.orig/debian/compat
+++ gsetroot-1.1/debian/compat
@@ -0,0 +1 @@
+5
--- gsetroot-1.1.orig/debian/patches/macro_dir.dpatch
+++ gsetroot-1.1/debian/patches/macro_dir.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## macro_dir.dpatch by Ilya Barygin <barygin@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add macros/options to configure.in and Makefile.am for smooth running
+## DP: of autoreconf.
+
+@DPATCH@
+diff -urNad gsetroot-1.1~/Makefile.am gsetroot-1.1/Makefile.am
+--- gsetroot-1.1~/Makefile.am	2010-03-08 10:46:11.000000000 +0300
++++ gsetroot-1.1/Makefile.am	2010-03-08 10:47:03.000000000 +0300
+@@ -4,6 +4,7 @@
+ ## 	Please disable it in the Anjuta project configuration
+ 
+ SUBDIRS = intl po src
++ACLOCAL_AMFLAGS = -I m4
+ 
+ gsetrootdocdir = ${prefix}/doc/gsetroot
+ gsetrootdoc_DATA = \
+diff -urNad gsetroot-1.1~/configure.in gsetroot-1.1/configure.in
+--- gsetroot-1.1~/configure.in	2010-03-08 10:46:11.000000000 +0300
++++ gsetroot-1.1/configure.in	2010-03-08 10:47:03.000000000 +0300
+@@ -8,6 +8,9 @@
+ AM_INIT_AUTOMAKE(gsetroot, 1.1)
+ AC_CONFIG_HEADERS([config.h])
+ 
++AC_USE_SYSTEM_EXTENSIONS
++AC_CONFIG_MACRO_DIR([m4])
++
+ AC_ISC_POSIX
+ CFLAGS=""
+ AC_SUBST(CFLAGS)
--- gsetroot-1.1.orig/debian/patches/00list
+++ gsetroot-1.1/debian/patches/00list
@@ -0,0 +1,2 @@
+gsetroot_pot
+macro_dir
--- gsetroot-1.1.orig/debian/patches/gsetroot_pot.dpatch
+++ gsetroot-1.1/debian/patches/gsetroot_pot.dpatch
@@ -0,0 +1,729 @@
+##
+## DP: Patch to enable locale.
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+	fi
+	case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+     -unpatch) patch $patch_opts -p1 -R < $0;;
+            *)
+	       echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+               exit 1;;
+        esac
+
+exit 0
+diff -bBdNrw -U5 gsetroot-1.1/configure.in gsetroot-1.1-modif/configure.in
+--- gsetroot-1.1/configure.in	2008-02-10 11:48:19.000000000 -0600
++++ gsetroot-1.1-modif/configure.in	2008-02-10 09:24:18.010544683 -0600
+@@ -1,14 +1,13 @@
+ dnl Process this file with autoconf to produce a configure script.
+ dnl Created by Anjuta - will be overwritten
+ dnl If you don't want it to overwrite it,
+ dnl 	Please disable it in the Anjuta project configuration
+ 
+-AC_INIT
+-AC_CONFIG_SRCDIR([configure.in])
++AC_INIT(configure.in)
+ AM_INIT_AUTOMAKE(gsetroot, 1.1)
+-AC_CONFIG_HEADERS([config.h])
++AM_CONFIG_HEADER(config.h)
+ 
+ AC_ISC_POSIX
+ CFLAGS=""
+ AC_SUBST(CFLAGS)
+ AC_PROG_CC
+@@ -28,11 +27,11 @@
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
+ 
+ 
+ dnl Languages which your application supports
+-ALL_LINGUAS=""
++ALL_LINGUAS="sv"
+ AM_GNU_GETTEXT
+ AM_GNU_GETTEXT_VERSION(0.10.40)
+ 
+ dnl Set PACKAGE_LOCALE_DIR in config.h.
+ if test "x${prefix}" = "xNONE"; then
+@@ -96,13 +95,12 @@
+ AC_DEFINE_UNQUOTED(PACKAGE_PIXMAPS_DIR, "${packageprefix}/${packagepixmapsdir}")
+ AC_DEFINE_UNQUOTED(PACKAGE_HELP_DIR, "${packageprefix}/${packagehelpdir}")
+ AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packageprefix}/${packagemenudir}")
+ AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
+ 
+-AC_CONFIG_FILES([
++AC_OUTPUT([
+ Makefile
+ intl/Makefile
+ po/Makefile.in
+ src/Makefile
+ ])
+-AC_OUTPUT
+ 
+diff -bBdNrw -U5 gsetroot-1.1/po/Makefile.in.in gsetroot-1.1-modif/po/Makefile.in.in
+--- gsetroot-1.1/po/Makefile.in.in	2005-02-19 09:44:26.000000000 -0600
++++ gsetroot-1.1-modif/po/Makefile.in.in	2008-02-10 09:35:03.427324890 -0600
+@@ -1,196 +1,403 @@
+-# Makefile for program source directory in GNU NLS utilities package.
+-# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
++# Makefile for PO directory in any package using GNU gettext.
++# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+ #
+-# 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
+-# but which still want to provide support for the GNU gettext functionality.
+-# Please note that the actual code is *not* freely available.
++# 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.
++#
++# Origin: gettext-0.16
+ 
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+-
+-# These two variables depend on the location of this directory.
+-subdir = po
+-top_builddir = ..
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ 
+ SHELL = /bin/sh
+ @SET_MAKE@
+ 
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++datarootdir = @datarootdir@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = @localedir@
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+-
+-CC = @CC@
+-GMSGFMT = @GMSGFMT@
+-MSGFMT = @MSGFMT@
+-XGETTEXT = @XGETTEXT@
+-MSGMERGE = msgmerge
+-
+-DEFS = @DEFS@
+-CFLAGS = @CFLAGS@
+-CPPFLAGS = @CPPFLAGS@
+ 
+-INCLUDES = -I.. -I$(top_srcdir)/intl
++# 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@
+ 
+-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
++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@
+-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
+-$(POFILES) $(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 = \
+ 
+ CATALOGS = @CATALOGS@
+ 
+-.SUFFIXES:
+-.SUFFIXES: .c .o .po .pox .gmo .mo
+-
+-.c.o:
+-	$(COMPILE) $<
++# Makevars gets inserted here. (Don't remove this line!)
+ 
+-.po.pox:
+-	$(MAKE) $(PACKAGE).pot
+-	$(MSGMERGE) $< $(srcdir)/$(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=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+-	  && rm -f $$file && $(GMSGFMT) --statistics -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
++
++.sin.sed:
++	sed -e '/^#/d' $< > t-$@
++	mv t-$@ $@
+ 
+ 
+ all: all-@USE_NLS@
+ 
+-all-yes: $(CATALOGS)
++all-yes: stamp-po
+ all-no:
+ 
+-# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot',
++# $(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.
+ 
+-$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
+-	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
+-	  --add-comments --keyword=_ --keyword=N_ \
++# 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 test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
++	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
++	else \
++	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
++	fi; \
++	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
++	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+ 	  --files-from=$(srcdir)/POTFILES.in \
+-	&& test ! -f $(PACKAGE).po \
+-	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
+-		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
++	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
++	  --msgid-bugs-address="$$msgid_bugs_address"
++	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-exec install-data
+ install-exec:
+ install-data: install-data-@USE_NLS@
+-	if test "$(PACKAGE)" = "gettext"; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+-	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
+-			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
++	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
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	$(mkdir_p) $(DESTDIR)$(datadir)
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+-	  if test -r $$cat; then \
+-	    $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
+-	    echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \
++	  $(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 \
+-	    $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
+-	    echo "installing $(srcdir)/$$cat as" \
+-		 "$(DESTDIR)$$dir/$(PACKAGE).mo"; \
++	        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; \
++	  done; \
+ 	done
+ 
+-# Define this as empty until I found a useful application.
+-installcheck:
++install-strip: install
+ 
+-uninstall:
+-	catalogs='$(CATALOGS)'; \
++installdirs: installdirs-exec installdirs-data
++installdirs-exec:
++installdirs-data: installdirs-data-@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 's/\.gmo$$//'`; \
+-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
++	  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
+-	if test "$(PACKAGE)" = "gettext"; then \
+-	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
++
++# Define this as empty until I found a useful application.
++installcheck:
++
++uninstall: uninstall-exec uninstall-data
++uninstall-exec:
++uninstall-data: uninstall-data-@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
+ 
+-dvi info tags TAGS ID:
++info dvi ps pdf html tags TAGS ctags CTAGS ID:
+ 
+ mostlyclean:
+-	rm -f core core.* *.pox $(PACKAGE).po *.new.po
++	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 *.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 $(GMOFILES)
++	rm -f stamp-po $(GMOFILES)
+ 
+ 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: $(DISTFILES)
++dist2: stamp-po $(DISTFILES)
+ 	dists="$(DISTFILES)"; \
++	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 \
+-	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+-	  cp -p $$dir/$$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) $(PACKAGE).pot
+-	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
+-	cd $(srcdir); \
+-	catalogs='$(GMOFILES)'; \
+-	for cat in $$catalogs; do \
+-	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	$(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`; \
+ 	  echo "$$lang:"; \
+-	  if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \
+-	    mv -f $$lang.new.po $$lang.po; \
++	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 \
+-	    echo "msgmerge for $$cat failed!"; \
+-	    rm -f $$lang.new.po; \
++	    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; \
+-	done
+-	$(MAKE) update-gmo
++	  fi; \
++	else \
++	  echo "msgmerge for $$lang.po failed!" 1>&2; \
++	  rm -f $$tmpdir/$$lang.new.po; \
++	fi
++
++$(DUMMYPOFILES):
+ 
+ update-gmo: Makefile $(GMOFILES)
+ 	@:
+ 
+-Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
++Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+ 	cd $(top_builddir) \
+-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
+-	       $(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.
+ .NOEXPORT:
+diff -bBdNrw -U5 gsetroot-1.1/po/Makevars gsetroot-1.1-modif/po/Makevars
+--- gsetroot-1.1/po/Makevars	1969-12-31 18:00:00.000000000 -0600
++++ gsetroot-1.1-modif/po/Makevars	2008-02-10 09:35:12.439838485 -0600
+@@ -0,0 +1,41 @@
++# Makefile variables for PO directory in any package using GNU gettext.
++
++# Usually the message domain is the same as the package name.
++DOMAIN = $(PACKAGE)
++
++# These two variables depend on the location of this directory.
++subdir = po
++top_builddir = ..
++
++# These options get passed to xgettext.
++XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
++
++# This is the copyright holder that gets inserted into the header of the
++# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
++# package.  (Note that the msgstr strings, extracted from the package's
++# sources, belong to the copyright holder of the package.)  Translators are
++# expected to transfer the copyright for their translations to this person
++# or entity, or to disclaim their copyright.  The empty string stands for
++# the public domain; in this case the translators are expected to disclaim
++# their copyright.
++COPYRIGHT_HOLDER = Anibal Avelar
++
++# This is the email address or URL to which the translators shall report
++# bugs in the untranslated strings:
++# - Strings which are not entire sentences, see the maintainer guidelines
++#   in the GNU gettext documentation, section 'Preparing Strings'.
++# - Strings which use unclear terms or require additional context to be
++#   understood.
++# - Strings which make invalid assumptions about notation of date, time or
++#   money.
++# - Pluralisation problems.
++# - Incorrect English spelling.
++# - Incorrect formatting.
++# It can be your email address, or a mailing list address where translators
++# can write to without being subscribed, or the URL of a web page through
++# which the translators can contact you.
++MSGID_BUGS_ADDRESS =
++
++# This is the list of locale categories, beyond LC_MESSAGES, for which the
++# message catalogs shall be used.  It is usually empty.
++EXTRA_LOCALE_CATEGORIES =
+diff -bBdNrw -U5 gsetroot-1.1/po/sv.po gsetroot-1.1-modif/po/sv.po
+--- gsetroot-1.1/po/sv.po	1969-12-31 18:00:00.000000000 -0600
++++ gsetroot-1.1-modif/po/sv.po	2008-02-08 18:38:53.075797057 -0600
+@@ -0,0 +1,91 @@
++# Swedish translation of gsetroot.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the gsetroot package.
++# Daniel Nylander <po@danielnylander.se>, 2006.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: gsetroot 1.0-1\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2005-03-07 21:21+0100\n"
++"PO-Revision-Date: 2006-01-24 20:18+0100\n"
++"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
++"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=utf-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: src/support.c:90
++#: src/support.c:114
++#, c-format
++msgid "Couldn't find pixmap file: %s"
++msgstr "Kunde inte hitta bildfil: %s"
++
++#: src/interface.c:67
++msgid "gsetroot"
++msgstr "gsetroot"
++
++#: src/interface.c:112
++msgid "Open"
++msgstr "Öppna"
++
++#: src/interface.c:133
++msgid "Preview"
++msgstr "Granska"
++
++#: src/interface.c:137
++msgid "File :"
++msgstr "Fil :"
++
++#: src/interface.c:159
++msgid "Apply"
++msgstr "Verkställ"
++
++#: src/interface.c:180
++msgid "Infos"
++msgstr "Info"
++
++#: src/interface.c:184
++msgid "Center"
++msgstr "Centrera"
++
++#: src/interface.c:191
++msgid "Mosaic"
++msgstr "Mosaik"
++
++#: src/interface.c:198
++msgid "Current screen size"
++msgstr "Aktuell skärmstorlek"
++
++#: src/interface.c:222
++msgid "window1"
++msgstr "fönster1"
++
++#: src/callbacks.c:141
++msgid "infos"
++msgstr "info"
++
++#: src/callbacks.c:150
++msgid "gsetroot is a gtk-based front-end for Esetroot "
++msgstr "gsetroot är ett gtk-baserat gränssnitt för Esetroot "
++
++#: src/callbacks.c:155
++msgid "Use it under FluxBox, Enlightenment, WindowMaker,"
++msgstr "Använd det under Fluxbox, Enlightenment, WindowMaker,"
++
++#: src/callbacks.c:160
++msgid "NextStep, BlackBox, and others WM"
++msgstr "NextStep, BlackBox och andra skrivbordsmiljöer"
++
++#: src/callbacks.c:165
++msgid "------------------------------------"
++msgstr "------------------------------------"
++
++#: src/callbacks.c:170
++msgid "nolius@users.sourceforge.net"
++msgstr "nolius@users.sourceforge.net"
++
++#: src/callbacks.c:175
++msgid "By Lounis Bellabes"
++msgstr "Av Lounis Bellabes"
++
+diff -bBdNrw -U5 gsetroot-1.1/Makefile.am gsetroot-1.1-modif/Makefile.am
+--- gsetroot-1.1/Makefile.am	2005-02-19 09:44:05.000000000 -0600
++++ gsetroot-1.1-modif/Makefile.am	2008-02-10 15:08:49.672555567 -0600
+@@ -3,20 +3,14 @@
+ ## If you don't want it to overwrite it,
+ ## 	Please disable it in the Anjuta project configuration
+ 
+ SUBDIRS = intl po src
+ 
+-gsetrootdocdir = ${prefix}/doc/gsetroot
++gsetrootdocdir = ${prefix}/share/doc/gsetroot
+ gsetrootdoc_DATA = \
+ 	README\
+-	COPYING\
+-	AUTHORS\
+-	ChangeLog\
+-	INSTALL\
+-	NEWS\
+-	TODO\
+-	ABOUT-NLS
++	AUTHORS
+ 
+ EXTRA_DIST = $(gsetrootdoc_DATA)
+ 
+ # Copy all the spec files. Of cource, only one is actually used.
+ dist-hook: