Bug#599105: unblock: xdg-user-dirs/0.13-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
Please unblock package xdg-user-dirs
xdg-user-dirs handles the creation of the common user directories like
~/Documents, ~/Desktop, etc., or their localized variants.
Version 0.13 adds a big number of new translations and translation
updates, all of which are very visible on the desktop, and also includes a
one-line fix for a memleak.
No other code changes are included. A de-crufted diff is attached.
unblock xdg-user-dirs/0.13-2
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=ca_ES.UTF-8@valencia, LC_CTYPE=ca_ES.UTF-8@valencia (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nuar '--exclude=.pc' '--exclude=config.sub' '--exclude=config.guess' '--exclude=po' '--exclude=Makefile.in' '--exclude=aclocal.m4' '--exclude=configure' '--exclude=ChangeLog' xdg-user-dirs-0.12/config.h.in xdg-user-dirs-0.13/config.h.in
--- xdg-user-dirs-0.12/config.h.in 2009-11-06 11:12:22.000000000 +0100
+++ xdg-user-dirs-0.13/config.h.in 2010-09-13 09:21:37.000000000 +0200
@@ -43,6 +43,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -Nuar '--exclude=.pc' '--exclude=config.sub' '--exclude=config.guess' '--exclude=po' '--exclude=Makefile.in' '--exclude=aclocal.m4' '--exclude=configure' '--exclude=ChangeLog' xdg-user-dirs-0.12/configure.ac xdg-user-dirs-0.13/configure.ac
--- xdg-user-dirs-0.12/configure.ac 2009-11-06 11:11:20.000000000 +0100
+++ xdg-user-dirs-0.13/configure.ac 2010-09-13 09:21:13.000000000 +0200
@@ -1,6 +1,6 @@
AC_INIT(xdg-user-dirs-update.c)
-AM_INIT_AUTOMAKE(xdg-user-dirs, 0.12)
+AM_INIT_AUTOMAKE(xdg-user-dirs, 0.13)
AM_CONFIG_HEADER(config.h)
AM_SANITY_CHECK
@@ -26,7 +26,7 @@
dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
AC_ARG_ENABLE(more-warnings,
-[ --enable-more-warnings Maximum compiler warnings],
+ AS_HELP_STRING([--enable-more-warnings],[Maximum compiler warnings]),
set_more_warnings="$enableval",[
if test -f $srcdir/CVSVERSION; then
is_cvs_version=true
diff -Nuar '--exclude=.pc' '--exclude=config.sub' '--exclude=config.guess' '--exclude=po' '--exclude=Makefile.in' '--exclude=aclocal.m4' '--exclude=configure' '--exclude=ChangeLog' xdg-user-dirs-0.12/debian/changelog xdg-user-dirs-0.13/debian/changelog
--- xdg-user-dirs-0.12/debian/changelog 2010-03-24 17:11:38.000000000 +0100
+++ xdg-user-dirs-0.13/debian/changelog 2010-10-04 19:11:16.000000000 +0200
@@ -1,3 +1,19 @@
+xdg-user-dirs (0.13-2) unstable; urgency=low
+
+ * Add l10n-ca.patch, with Catalan updates.
+ * Delete ca.gmo on clean to ensure it gets rebuilt.
+ * Add Vcs-* headers.
+ * Bump Standards-Version to 3.9.1, no changes required.
+
+ -- Jordi Mallach <jordi@debian.org> Mon, 04 Oct 2010 19:05:27 +0200
+
+xdg-user-dirs (0.13-1) unstable; urgency=low
+
+ * New upstream bugfix release:
+ + New translations and a fix for a memory leak.
+
+ -- Sebastian Dröge <slomo@debian.org> Wed, 15 Sep 2010 10:38:12 +0200
+
xdg-user-dirs (0.12-1) unstable; urgency=low
* New upstream bugfix release:
diff -Nuar '--exclude=.pc' '--exclude=config.sub' '--exclude=config.guess' '--exclude=po' '--exclude=Makefile.in' '--exclude=aclocal.m4' '--exclude=configure' '--exclude=ChangeLog' xdg-user-dirs-0.12/debian/control xdg-user-dirs-0.13/debian/control
--- xdg-user-dirs-0.12/debian/control 2010-03-24 17:12:36.000000000 +0100
+++ xdg-user-dirs-0.13/debian/control 2010-10-04 20:05:05.752008210 +0200
@@ -7,12 +7,14 @@
Section: utils
Priority: optional
Maintainer: Sebastian Dröge <slomo@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Jordi Mallach <jordi@debian.org>
Build-Depends: cdbs,
debhelper (>= 7),
gnome-pkg-tools
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://www.freedesktop.org/wiki/Software/xdg-user-dirs
+Vcs-Svn: svn://svn.debian.org/pkg-gnome/packages/unstable/xdg-user-dirs/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xdg-user-dirs/
Package: xdg-user-dirs
Architecture: any
diff -Nuar '--exclude=.pc' '--exclude=config.sub' '--exclude=config.guess' '--exclude=po' '--exclude=Makefile.in' '--exclude=aclocal.m4' '--exclude=configure' '--exclude=ChangeLog' xdg-user-dirs-0.12/debian/control.in xdg-user-dirs-0.13/debian/control.in
--- xdg-user-dirs-0.12/debian/control.in 2010-03-24 17:11:38.000000000 +0100
+++ xdg-user-dirs-0.13/debian/control.in 2010-10-04 19:11:45.000000000 +0200
@@ -6,8 +6,10 @@
Build-Depends: cdbs,
debhelper (>= 7),
gnome-pkg-tools
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://www.freedesktop.org/wiki/Software/xdg-user-dirs
+Vcs-Svn: svn://svn.debian.org/pkg-gnome/packages/unstable/xdg-user-dirs/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xdg-user-dirs/
Package: xdg-user-dirs
Architecture: any
diff -Nuar '--exclude=.pc' '--exclude=config.sub' '--exclude=config.guess' '--exclude=po' '--exclude=Makefile.in' '--exclude=aclocal.m4' '--exclude=configure' '--exclude=ChangeLog' xdg-user-dirs-0.12/debian/patches/l10n-ca.patch xdg-user-dirs-0.13/debian/patches/l10n-ca.patch
--- xdg-user-dirs-0.12/debian/patches/l10n-ca.patch 1970-01-01 01:00:00.000000000 +0100
+++ xdg-user-dirs-0.13/debian/patches/l10n-ca.patch 2010-10-04 18:46:30.000000000 +0200
@@ -0,0 +1,52 @@
+Author: Jordi Mallach <jordi@debian.org>
+Description: Update Catalan translation.
+Forwarded: non-needed
+
+--- xdg-user-dirs-0.13/po/ca.po 2010-09-13 09:17:11.000000000 +0200
++++ xdg-user-dirs-0.13/po/ca.po 2010-10-01 10:32:02.000000000 +0200
+@@ -1,18 +1,17 @@
+ # Catalan translations for xdg-user-dirs package
+ # Traduccions al català del paquet «xdg-user-dirs».
+-# Copyright (C) 2007 Red Hat, Inc
++# Copyright (C) 2007-2010 Red Hat, Inc
+ # This file is distributed under the same license as the xdg-user-dirs package.
+-# Josep Puigdemont <josep.puigdemont@gmail.com>, 2007.
++# Josep Puigdemont <josep.puigdemont@gmail.com>, 2007, 2010.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: xdg-user-dirs 0.0.4\n"
++"Project-Id-Version: xdg-user-dirs 0.12\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2010-09-13 09:17+0200\n"
+-"PO-Revision-Date: 2007-03-05 03:37+0100\n"
++"POT-Creation-Date: 2009-11-05 16:02+0100\n"
++"PO-Revision-Date: 2010-10-01 10:25+0200\n"
+ "Last-Translator: Josep Puigdemont <josep.puigdemont@gmail.com>\n"
+ "Language-Team: Catalan <ca@dodds.net>\n"
+-"Language: ca\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+@@ -43,19 +42,17 @@
+
+ #: translate.c:5
+ msgid "Download"
+-msgstr "Baixades"
++msgstr "Baixada"
+
+ #: translate.c:5
+ msgid "download"
+-msgstr "baixades"
++msgstr "baixada"
+
+ #: translate.c:6
+-#, fuzzy
+ msgid "Downloads"
+ msgstr "Baixades"
+
+ #: translate.c:6
+-#, fuzzy
+ msgid "downloads"
+ msgstr "baixades"
+
diff -Nuar '--exclude=.pc' '--exclude=config.sub' '--exclude=config.guess' '--exclude=po' '--exclude=Makefile.in' '--exclude=aclocal.m4' '--exclude=configure' '--exclude=ChangeLog' xdg-user-dirs-0.12/debian/patches/series xdg-user-dirs-0.13/debian/patches/series
--- xdg-user-dirs-0.12/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ xdg-user-dirs-0.13/debian/patches/series 2010-10-04 18:46:30.000000000 +0200
@@ -0,0 +1 @@
+l10n-ca.patch
diff -Nuar '--exclude=.pc' '--exclude=config.sub' '--exclude=config.guess' '--exclude=po' '--exclude=Makefile.in' '--exclude=aclocal.m4' '--exclude=configure' '--exclude=ChangeLog' xdg-user-dirs-0.12/debian/rules xdg-user-dirs-0.13/debian/rules
--- xdg-user-dirs-0.12/debian/rules 2010-03-24 17:11:38.000000000 +0100
+++ xdg-user-dirs-0.13/debian/rules 2010-10-04 19:22:48.025316688 +0200
@@ -13,3 +13,9 @@
mkdir -p debian/xdg-user-dirs/etc/X11/Xsession.d
cp debian/xdg-user-dirs-Xsession \
debian/xdg-user-dirs/etc/X11/Xsession.d/60xdg-user-dirs-update
+
+build/xdg-user-dirs::
+ msgfmt -c -o po/ca.gmo po/ca.po
+
+clean::
+ rm -f po/ca.gmo
diff -Nuar '--exclude=.pc' '--exclude=config.sub' '--exclude=config.guess' '--exclude=po' '--exclude=Makefile.in' '--exclude=aclocal.m4' '--exclude=configure' '--exclude=ChangeLog' xdg-user-dirs-0.12/Makefile.am xdg-user-dirs-0.13/Makefile.am
--- xdg-user-dirs-0.12/Makefile.am 2009-10-07 11:42:29.000000000 +0200
+++ xdg-user-dirs-0.13/Makefile.am 2010-09-13 09:14:48.000000000 +0200
@@ -35,3 +35,26 @@
xdg_user_dir_lookup_SOURCES = \
xdg-user-dir-lookup.c
+
+dist-hook: check-translations
+ @if test -d "$(srcdir)/.git"; \
+ then \
+ echo Creating ChangeLog && \
+ ( cd "$(top_srcdir)" && \
+ echo '# Generated by Makefile. Do not edit.'; echo; \
+ $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \
+ && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+ || ( rm -f ChangeLog.tmp ; \
+ echo Failed to generate ChangeLog >&2 ); \
+ else \
+ echo A git clone is required to generate a ChangeLog >&2; \
+ fi
+
+check-translations:
+ @for i in $(top_srcdir)/po/*.po ; do \
+ if ! grep -q `basename $$i | sed 's,.po,,'` $(top_srcdir)/po/LINGUAS ; then \
+ echo '***' `basename $$i | sed 's,.po,,'` missing from po/LINGUAS '***' ; \
+ exit 1; \
+ fi; \
+ done;
+
diff -Nuar '--exclude=.pc' '--exclude=config.sub' '--exclude=config.guess' '--exclude=po' '--exclude=Makefile.in' '--exclude=aclocal.m4' '--exclude=configure' '--exclude=ChangeLog' xdg-user-dirs-0.12/NEWS xdg-user-dirs-0.13/NEWS
--- xdg-user-dirs-0.12/NEWS 2009-10-07 11:42:29.000000000 +0200
+++ xdg-user-dirs-0.13/NEWS 2010-09-13 09:14:48.000000000 +0200
@@ -1,3 +1,11 @@
+Major changes in 0.13 are:
+* Fix a memleak
+* Updated translations
+* ChangeLog is now autogenerated by git
+
+Major changes in 0.12 are:
+* Updated translations
+
Major changes in 0.11 are:
* Switch DOWNLOAD default to "Downloads" instead of "Download" to
to match the other names
diff -Nuar '--exclude=.pc' '--exclude=config.sub' '--exclude=config.guess' '--exclude=po' '--exclude=Makefile.in' '--exclude=aclocal.m4' '--exclude=configure' '--exclude=ChangeLog' xdg-user-dirs-0.12/README xdg-user-dirs-0.13/README
--- xdg-user-dirs-0.12/README 2009-11-06 11:11:41.000000000 +0100
+++ xdg-user-dirs-0.13/README 2010-09-13 09:16:55.000000000 +0200
@@ -1,2 +1,2 @@
See info at:
-http://freedesktop.org/wiki/Software_2fxdg_2duser_2ddirs
+http://freedesktop.org/wiki/Software/xdg-user-dirs
diff -Nuar '--exclude=.pc' '--exclude=config.sub' '--exclude=config.guess' '--exclude=po' '--exclude=Makefile.in' '--exclude=aclocal.m4' '--exclude=configure' '--exclude=ChangeLog' xdg-user-dirs-0.12/xdg-user-dirs-update.c xdg-user-dirs-0.13/xdg-user-dirs-update.c
--- xdg-user-dirs-0.12/xdg-user-dirs-update.c 2009-10-07 11:42:29.000000000 +0200
+++ xdg-user-dirs-0.13/xdg-user-dirs-update.c 2010-01-11 13:17:01.000000000 +0100
@@ -936,8 +936,8 @@
path_name = concat_strings (get_home_dir (), "/", compat_dir->path, NULL);
if (!is_directory (path_name))
{
- path_name = NULL;
free (path_name);
+ path_name = NULL;
}
else
relative_path_name = strdup (compat_dir->path);
Reply to: