--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: id-utils/4.5+dfsg-0.1
- From: David Prévot <taffit@debian.org>
- Date: Fri, 24 Aug 2012 16:26:18 -0400
- Message-id: <20120824202618.25146.72370.reportbug@mikado.tilapin.org>
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package id-utils
It solves two RC-bugs:
* Repack to remove the non-free doc/ directory. (Closes: #684091)
- Makefile.in, Makefile.am, configure.ac, configure: remove doc.
I realise now, one week after uploading the package, that half of these
changes are probably useless, so sorry for the diff noise. If it really
annoys you, I'll prepare another upload one without touching the unused
files (just say the word).
- debian/rules: remove mention to the info pages from the manpages.
* Update debian/copyright. (Closes: #644131)
And it also updates and adds a bunch of translations, thus the
po/LINGUAS and po/idutils.pot update (the last one is a trick to make
sure the gmo files are rebuilt during the build process, actually
updating the translations in the binary package).
Sadly, the translations were actually unavailable from the user space,
so I fixed it too:
* debian/rules: Remove --datadir to make i18n work again, and fix
#45091 in upstream sources.
Forgot to mention it in the changelog, but the changed files are
idutils.spec, idutils.spec.in, libidu/Makefile.am, libidu/Makefile.in,
src/Makefile.am and src/Makefile.in. Like in the first fix, I guess half
of these (tiny) changes are useless, sorry again, I've just been
consistent with my initial mistake.
Attached debdiff with PO files (that comes from the Translation
Project [0] BTW, forgot to mention it in the changelog as well) and doc
directory filtered.
0: http://translationproject.org/domain/idutils.html
Thanks in advance
unblock id-utils/4.5+dfsg-0.1
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-3-amd64 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diffstat for id-utils-4.5 id-utils-4.5+dfsg
Makefile.am | 2 +-
Makefile.in | 2 +-
configure | 2 +-
configure.ac | 1 -
debian/changelog | 27 +++++++++++++++++++++++++++
debian/copyright | 17 +++++++++--------
debian/rules | 12 ++++++------
idutils.spec | 2 +-
idutils.spec.in | 2 +-
libidu/Makefile.am | 4 ++--
libidu/Makefile.in | 4 ++--
po/LINGUAS | 3 +++
po/idutils.pot | 10 +++++-----
src/Makefile.am | 2 +-
src/Makefile.in | 2 +-
15 files changed, 61 insertions(+), 31 deletions(-)
diff -Nru --exclude doc --exclude '*.po' id-utils-4.5/configure id-utils-4.5+dfsg/configure
--- id-utils-4.5/configure 2010-06-17 02:35:56.000000000 -0400
+++ id-utils-4.5+dfsg/configure 2012-08-24 16:08:17.000000000 -0400
@@ -33975,7 +33975,7 @@
-ac_config_files="$ac_config_files po/Makefile.in doc/Makefile man/Makefile lib/Makefile libidu/Makefile lisp/Makefile testsuite/Makefile gnulib-tests/Makefile src/Makefile Makefile"
+ac_config_files="$ac_config_files po/Makefile.in man/Makefile lib/Makefile libidu/Makefile lisp/Makefile testsuite/Makefile gnulib-tests/Makefile src/Makefile Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
diff -Nru --exclude doc --exclude '*.po' id-utils-4.5/configure.ac id-utils-4.5+dfsg/configure.ac
--- id-utils-4.5/configure.ac 2010-06-16 01:42:07.000000000 -0400
+++ id-utils-4.5+dfsg/configure.ac 2012-08-24 16:08:17.000000000 -0400
@@ -107,7 +107,6 @@
AC_CONFIG_FILES([
po/Makefile.in
- doc/Makefile
man/Makefile
lib/Makefile
libidu/Makefile
diff -Nru --exclude doc --exclude '*.po' id-utils-4.5/debian/changelog id-utils-4.5+dfsg/debian/changelog
--- id-utils-4.5/debian/changelog 2012-08-24 16:08:16.000000000 -0400
+++ id-utils-4.5+dfsg/debian/changelog 2012-08-24 16:08:17.000000000 -0400
@@ -1,3 +1,30 @@
+id-utils (4.5+dfsg-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Repack to remove the non-free doc/ directory. (Closes: #684091)
+ - Makefile.in, Makefile.am, configure.ac, configure: remove doc.
+ - debian/rules: remove mention to the info pages from the manpages.
+ * Update debian/copyright. (Closes: #644131)
+ * debian/rules: Remove --datadir to make i18n work again, and fix #45091 in
+ upstream sources.
+
+ [ Program Translation ]
+ * Danish updated, Keld Simonsen.
+ * Chinese (simplified) updated, Ji ZhengYu.
+ * Dutch updated, Benno Schulenberg.
+ * Esperanto new, Felipe Castro.
+ * Finnish updated, Jorma Karvonen.
+ * French updated, Frédéric Marchal.
+ * German updated, Michael Piefel.
+ * Indonesian updated, Andhika Padmawan.
+ * Polish updated, Jakub Bogusz.
+ * Russian updated, Yuri Kozlov. (Closes: #624746)
+ * Serbian new, Мирослав Николић.
+ * Ukrainian new, Yuri Chornoivan.
+ * Vietnamese updated, Clytie Siddall.
+
+ -- David Prévot <taffit@debian.org> Fri, 17 Aug 2012 14:28:12 -0400
+
id-utils (4.5-3) unstable; urgency=low
* Don't include info dir.gz file
diff -Nru --exclude doc --exclude '*.po' id-utils-4.5/debian/copyright id-utils-4.5+dfsg/debian/copyright
--- id-utils-4.5/debian/copyright 2012-08-24 16:08:16.000000000 -0400
+++ id-utils-4.5+dfsg/debian/copyright 2012-08-24 16:08:17.000000000 -0400
@@ -10,6 +10,8 @@
id-utils.texi was written by Tom Horsley, and explicitly not
copyrighted, but contributed to the public domain. An FSF copyright
has since been affixed.
+ It has been removed from the upstream tarball due to license issue, see
+ #684091.
Debian Authors:
@@ -21,26 +23,25 @@
Copyright:
- 1986-2006 Free Software Foundation, Inc.
+ 1986-2010 Free Software Foundation, Inc.
License:
- This package is free software; you can redistribute it and/or modify
+ This program 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; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
- This package is distributed in the hope that it will be useful,
+ This program 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
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-3'.
The Debian packaging is Copyright (C) 1992-2010, Bradley A. Bosch
<brad@debian.org> and is licensed under the GPL, see above.
diff -Nru --exclude doc --exclude '*.po' id-utils-4.5/debian/rules id-utils-4.5+dfsg/debian/rules
--- id-utils-4.5/debian/rules 2012-08-24 16:08:16.000000000 -0400
+++ id-utils-4.5+dfsg/debian/rules 2012-08-24 16:08:17.000000000 -0400
@@ -28,7 +28,7 @@
config.status: configure
dh_testdir
# Configure the package.
- EMACS=no ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --datadir=/usr/share/misc CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+ EMACS=no ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
build: build-stamp
@@ -89,11 +89,11 @@
dh_link usr/share/man/man1/lid.1.gz usr/share/man/man1/eid.1.gz
dh_link usr/share/man/man1/lid.1.gz usr/share/man/man1/aid.1.gz
dh_link usr/share/man/man1/lid.1.gz usr/share/man/man1/gid.1.gz
- help2man -i debian/seealso -N -n "Build an identifier database" $(debian-tmp)/usr/bin/mkid > $(debian-tmp)/usr/share/man/man1/mkid.1
- help2man -i debian/seealso -N -n "Query ID database and report results" $(debian-tmp)/usr/bin/lid > $(debian-tmp)/usr/share/man/man1/lid.1
- help2man -i debian/seealso -N -n "List identifiers that occur in FILENAME" $(debian-tmp)/usr/bin/fid > $(debian-tmp)/usr/share/man/man1/fid.1
- help2man -i debian/seealso -N -n "Print constituent file names that match PATTERN" $(debian-tmp)/usr/bin/fnid > $(debian-tmp)/usr/share/man/man1/fnid.1
- help2man -i debian/seealso -N -n "Print all tokens found in a source file" $(debian-tmp)/usr/bin/xtokid > $(debian-tmp)/usr/share/man/man1/xtokid.1
+ help2man -N -n "Build an identifier database" $(debian-tmp)/usr/bin/mkid > $(debian-tmp)/usr/share/man/man1/mkid.1
+ help2man -N -n "Query ID database and report results" $(debian-tmp)/usr/bin/lid > $(debian-tmp)/usr/share/man/man1/lid.1
+ help2man -N -n "List identifiers that occur in FILENAME" $(debian-tmp)/usr/bin/fid > $(debian-tmp)/usr/share/man/man1/fid.1
+ help2man -N -n "Print constituent file names that match PATTERN" $(debian-tmp)/usr/bin/fnid > $(debian-tmp)/usr/share/man/man1/fnid.1
+ help2man -N -n "Print all tokens found in a source file" $(debian-tmp)/usr/bin/xtokid > $(debian-tmp)/usr/share/man/man1/xtokid.1
dh_strip
dh_compress
diff -Nru --exclude doc --exclude '*.po' id-utils-4.5/idutils.spec id-utils-4.5+dfsg/idutils.spec
--- id-utils-4.5/idutils.spec 2010-06-17 02:37:34.000000000 -0400
+++ id-utils-4.5+dfsg/idutils.spec 2012-08-24 16:08:17.000000000 -0400
@@ -51,7 +51,7 @@
%doc %{_mandir}/man1/*.1.gz
%{_bindir}/*
%{_datadir}/emacs/site-lisp/
-%{_datadir}/id-lang.map
+%{_datadir}/misc/id-lang.map
%{_infodir}/idutils.info*
diff -Nru --exclude doc --exclude '*.po' id-utils-4.5/idutils.spec.in id-utils-4.5+dfsg/idutils.spec.in
--- id-utils-4.5/idutils.spec.in 2008-10-18 11:38:54.000000000 -0400
+++ id-utils-4.5+dfsg/idutils.spec.in 2012-08-24 16:08:17.000000000 -0400
@@ -51,7 +51,7 @@
%doc %{_mandir}/man1/*.1.gz
%{_bindir}/*
%{_datadir}/emacs/site-lisp/
-%{_datadir}/id-lang.map
+%{_datadir}/misc/id-lang.map
%{_infodir}/idutils.info*
diff -Nru --exclude doc --exclude '*.po' id-utils-4.5/libidu/Makefile.am id-utils-4.5+dfsg/libidu/Makefile.am
--- id-utils-4.5/libidu/Makefile.am 2009-08-15 12:15:17.000000000 -0400
+++ id-utils-4.5+dfsg/libidu/Makefile.am 2012-08-24 16:08:17.000000000 -0400
@@ -17,10 +17,10 @@
AM_CPPFLAGS = -I$(top_srcdir)/lib \
-DDATADIR=\"$(datadir)\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
- -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\"
+ -DLANGUAGE_MAP_FILE=\"$(datadir)/misc/id-lang.map\"
AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-idudir = $(datadir)
+idudir = $(datadir)/misc
idu_DATA = id-lang.map
EXTRA_DIST = $(idu_DATA)
diff -Nru --exclude doc --exclude '*.po' id-utils-4.5/libidu/Makefile.in id-utils-4.5+dfsg/libidu/Makefile.in
--- id-utils-4.5/libidu/Makefile.in 2010-06-17 01:50:44.000000000 -0400
+++ id-utils-4.5+dfsg/libidu/Makefile.in 2012-08-24 16:08:17.000000000 -0400
@@ -966,10 +966,10 @@
AM_CPPFLAGS = -I$(top_srcdir)/lib \
-DDATADIR=\"$(datadir)\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
- -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\"
+ -DLANGUAGE_MAP_FILE=\"$(datadir)/misc/id-lang.map\"
AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-idudir = $(datadir)
+idudir = $(datadir)/misc
idu_DATA = id-lang.map
EXTRA_DIST = $(idu_DATA)
all: all-am
diff -Nru --exclude doc --exclude '*.po' id-utils-4.5/Makefile.am id-utils-4.5+dfsg/Makefile.am
--- id-utils-4.5/Makefile.am 2009-05-17 10:38:42.000000000 -0400
+++ id-utils-4.5+dfsg/Makefile.am 2012-08-24 16:08:17.000000000 -0400
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = lib libidu src lisp doc man gnulib-tests testsuite po
+SUBDIRS = lib libidu src lisp man gnulib-tests testsuite po
EXTRA_DIST = \
.prev-version \
.version \
diff -Nru --exclude doc --exclude '*.po' id-utils-4.5/Makefile.in id-utils-4.5+dfsg/Makefile.in
--- id-utils-4.5/Makefile.in 2010-06-17 01:50:46.000000000 -0400
+++ id-utils-4.5+dfsg/Makefile.in 2012-08-24 16:08:17.000000000 -0400
@@ -959,7 +959,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = lib libidu src lisp doc man gnulib-tests testsuite po
+SUBDIRS = lib libidu src lisp man gnulib-tests testsuite po
EXTRA_DIST = \
.prev-version \
.version \
diff -Nru --exclude doc --exclude '*.po' id-utils-4.5/po/idutils.pot id-utils-4.5+dfsg/po/idutils.pot
--- id-utils-4.5/po/idutils.pot 2010-06-17 02:37:36.000000000 -0400
+++ id-utils-4.5+dfsg/po/idutils.pot 2012-08-24 16:08:17.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: GNU idutils 4.5\n"
"Report-Msgid-Bugs-To: bug-idutils@gnu.org\n"
-"POT-Creation-Date: 2010-06-17 08:37+0200\n"
+"POT-Creation-Date: 2012-08-17 01:58-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -416,22 +416,22 @@
msgid "can't get working directory"
msgstr ""
-#: libidu/walker.c:671
+#: libidu/walker.c:672
#, c-format
msgid "can't chdir to `%s'"
msgstr ""
-#: libidu/walker.c:676
+#: libidu/walker.c:677
#, c-format
msgid "can't chdir to `%s' from `%s'"
msgstr ""
-#: libidu/walker.c:737
+#: libidu/walker.c:738
#, c-format
msgid "can't lstat `%s' from `%s'"
msgstr ""
-#: libidu/walker.c:745
+#: libidu/walker.c:746
#, c-format
msgid "can't stat `%s' from `%s'"
msgstr ""
diff -Nru --exclude doc --exclude '*.po' id-utils-4.5/po/LINGUAS id-utils-4.5+dfsg/po/LINGUAS
--- id-utils-4.5/po/LINGUAS 2010-06-17 01:49:08.000000000 -0400
+++ id-utils-4.5+dfsg/po/LINGUAS 2012-08-24 16:08:17.000000000 -0400
@@ -1,5 +1,6 @@
da
de
+eo
fi
fr
ga
@@ -11,7 +12,9 @@
pt_BR
ro
ru
+sr
sv
+uk
tr
vi
zh_CN
diff -Nru --exclude doc --exclude '*.po' id-utils-4.5/src/Makefile.am id-utils-4.5+dfsg/src/Makefile.am
--- id-utils-4.5/src/Makefile.am 2009-06-21 12:31:57.000000000 -0400
+++ id-utils-4.5+dfsg/src/Makefile.am 2012-08-24 16:08:17.000000000 -0400
@@ -11,7 +11,7 @@
-I$(top_srcdir)/libidu \
-DDATADIR=\"$(datadir)\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
- -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\"
+ -DLANGUAGE_MAP_FILE=\"$(datadir)/misc/id-lang.map\"
AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
diff -Nru --exclude doc --exclude '*.po' id-utils-4.5/src/Makefile.in id-utils-4.5+dfsg/src/Makefile.in
--- id-utils-4.5/src/Makefile.in 2010-06-17 01:50:45.000000000 -0400
+++ id-utils-4.5+dfsg/src/Makefile.in 2012-08-24 16:08:17.000000000 -0400
@@ -997,7 +997,7 @@
-I$(top_srcdir)/libidu \
-DDATADIR=\"$(datadir)\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
- -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\"
+ -DLANGUAGE_MAP_FILE=\"$(datadir)/misc/id-lang.map\"
AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
LDADD = ../libidu/libidu.a ../lib/libgnu.a $(LIBINTL) ../lib/libgnu.a
--- End Message ---