please unblock deborphan 1.7.26
Hi,
please unblock deborphan 1.7.26. It fixes an RC bug, contains l10n
updates and corrects the licenses in the file COPYRIGHT.
Thanks,
Carsten
$ difftar deborphan_1.7.25.tar.gz deborphan_1.7.26.tar.gz | filterdiff -x 'deborphan*/po/*.po'
diff -Nurp deborphan-1.7.25/COPYING deborphan-1.7.26/COPYING
--- deborphan-1.7.25/COPYING 2008-07-25 23:45:33.000000000 +0200
+++ deborphan-1.7.26/COPYING 2008-07-30 17:48:14.000000000 +0200
@@ -1,7 +1,8 @@
deborphan is distributed under the terms of the "Artistic License",
as stated below. orphaner, found in the util/ subdirectory may be
-distributed under the terms of either the GPL, or, at your option,
-the Artistic License. See util/orphaner for details.
+distributed under the terms of either the GNU GPL, version 2, or,
+at your option, any later version, or, at your option, the Artistic
+License. See util/orphaner for details.
----------------------------------------------------------------------
The "Artistic License"
diff -Nurp deborphan-1.7.25/configure deborphan-1.7.26/configure
--- deborphan-1.7.25/configure 2008-07-25 23:48:01.000000000 +0200
+++ deborphan-1.7.26/configure 2008-08-15 20:39:44.000000000 +0200
@@ -2112,7 +2112,7 @@ fi
# Define the identity of the package.
PACKAGE=deborphan
- VERSION=1.7.25
+ VERSION=1.7.26
cat >>confdefs.h <<_ACEOF
@@ -3390,7 +3390,7 @@ else
fi
-ALL_LINGUAS="ca cs da de es eu fr ja nl pl"
+ALL_LINGUAS="ca cs da de es eu fr ja nl pl ru pt"
{ echo "$as_me:$LINENO: checking whether NLS is requested" >&5
diff -Nurp deborphan-1.7.25/configure.in deborphan-1.7.26/configure.in
--- deborphan-1.7.25/configure.in 2008-07-25 23:45:33.000000000 +0200
+++ deborphan-1.7.26/configure.in 2008-08-04 23:58:08.000000000 +0200
@@ -1,11 +1,11 @@
# Copyright (C) 2000, 2001, 2002, 2003 Cris van Pelt
# Copyright (C) 2003, 2004, 2005, 2006 Peter Palfrader
#
-# $Id: configure.in 692 2008-07-25 17:33:24Z carsten-guest $
+# $Id: configure.in 707 2008-08-04 21:57:58Z carsten-guest $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/deborphan.c)
-AM_INIT_AUTOMAKE(deborphan, 1.7.25)
+AM_INIT_AUTOMAKE(deborphan, 1.7.26)
AM_CONFIG_HEADER(include/config.h)
AM_MAINTAINER_MODE
@@ -14,7 +14,7 @@ AC_DEFINE(STATUS_FILE, "/var/lib/dpkg/st
AC_DEFINE(REG_FLAGS, REG_ICASE, [Bitwise or'd list of flags for regcomp()])
AC_PROG_CC
-ALL_LINGUAS="ca cs da de es eu fr ja nl pl"
+ALL_LINGUAS="ca cs da de es eu fr ja nl pl ru pt"
AM_GNU_GETTEXT
AM_GNU_GETTEXT_VERSION(0.14.1)
diff -Nurp deborphan-1.7.25/debian/changelog deborphan-1.7.26/debian/changelog
--- deborphan-1.7.25/debian/changelog 2008-07-25 23:45:31.000000000 +0200
+++ deborphan-1.7.26/debian/changelog 2008-08-15 20:44:17.000000000 +0200
@@ -1,3 +1,20 @@
+deborphan (1.7.26) unstable; urgency=high
+
+ * Urgency set to high as is solves an RC bug.
+ * Check whether get_pkg_info() correctly detected a line as status line
+ before abortion. (Closes: #493896)
+ * Translation updates. Many thanks to:
+ - Miroslav Kure for the updated Czech translation. (Closes: #492487)
+ - Javier Fernandez-Sanguino Peña for the updated Spanish translation.
+ (Closes: #492803)
+ - Thijs Kinkhorst for the updated Dutch translation. (Closes: #493091)
+ - Helge Kreutzmann for the updated German translation. (Closes: #493906)
+ - Yuri Kozlov for the new Russian translation. (Closes: #493564)
+ - Pedro Ribeiro for the new Portuguese translation. (Closes: #493785)
+ * Mention correct licenses of orphaner in the file COPYRIGHT.
+
+ -- Carsten Hey <c.hey@web.de> Fri, 15 Aug 2008 19:37:18 +0200
+
deborphan (1.7.25) unstable; urgency=low
* Abort when status file is in an improper state. (Closes: #391317)
diff -Nurp deborphan-1.7.25/include/config.h deborphan-1.7.26/include/config.h
--- deborphan-1.7.25/include/config.h 2008-07-25 23:48:20.000000000 +0200
+++ deborphan-1.7.26/include/config.h 2008-08-15 20:40:29.000000000 +0200
@@ -339,7 +339,7 @@
#define USE_XALLOC 1
/* Version number of package */
-#define VERSION "1.7.25"
+#define VERSION "1.7.26"
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
Binary files deborphan-1.7.25/po/ca.gmo and deborphan-1.7.26/po/ca.gmo differ
diff -Nurp deborphan-1.7.25/po/ca.po deborphan-1.7.26/po/ca.po
Binary files deborphan-1.7.25/po/cs.gmo and deborphan-1.7.26/po/cs.gmo differ
diff -Nurp deborphan-1.7.25/po/cs.po deborphan-1.7.26/po/cs.po
Binary files deborphan-1.7.25/po/da.gmo and deborphan-1.7.26/po/da.gmo differ
diff -Nurp deborphan-1.7.25/po/da.po deborphan-1.7.26/po/da.po
Binary files deborphan-1.7.25/po/de.gmo and deborphan-1.7.26/po/de.gmo differ
diff -Nurp deborphan-1.7.25/po/de.po deborphan-1.7.26/po/de.po
Binary files deborphan-1.7.25/po/es.gmo and deborphan-1.7.26/po/es.gmo differ
diff -Nurp deborphan-1.7.25/po/es.po deborphan-1.7.26/po/es.po
Binary files deborphan-1.7.25/po/eu.gmo and deborphan-1.7.26/po/eu.gmo differ
diff -Nurp deborphan-1.7.25/po/eu.po deborphan-1.7.26/po/eu.po
Binary files deborphan-1.7.25/po/fr.gmo and deborphan-1.7.26/po/fr.gmo differ
diff -Nurp deborphan-1.7.25/po/fr.po deborphan-1.7.26/po/fr.po
Binary files deborphan-1.7.25/po/ja.gmo and deborphan-1.7.26/po/ja.gmo differ
diff -Nurp deborphan-1.7.25/po/ja.po deborphan-1.7.26/po/ja.po
Binary files deborphan-1.7.25/po/nl.gmo and deborphan-1.7.26/po/nl.gmo differ
diff -Nurp deborphan-1.7.25/po/nl.po deborphan-1.7.26/po/nl.po
Binary files deborphan-1.7.25/po/pl.gmo and deborphan-1.7.26/po/pl.gmo differ
diff -Nurp deborphan-1.7.25/po/pl.po deborphan-1.7.26/po/pl.po
Binary files deborphan-1.7.25/po/pt.gmo and deborphan-1.7.26/po/pt.gmo differ
diff -Nurp deborphan-1.7.25/po/pt.po deborphan-1.7.26/po/pt.po
Binary files deborphan-1.7.25/po/ru.gmo and deborphan-1.7.26/po/ru.gmo differ
diff -Nurp deborphan-1.7.25/po/ru.po deborphan-1.7.26/po/ru.po
diff -Nurp deborphan-1.7.25/src/pkginfo.c deborphan-1.7.26/src/pkginfo.c
--- deborphan-1.7.25/src/pkginfo.c 2008-07-25 23:45:32.000000000 +0200
+++ deborphan-1.7.26/src/pkginfo.c 2008-08-07 10:36:01.000000000 +0200
@@ -3,7 +3,7 @@
Copyright (C) 2003, 2004, 2006 Peter Palfrader
Copyright (C) 2008 Carsten Hey
- $Id: pkginfo.c 691 2008-07-25 17:30:01Z carsten-guest $
+ $Id: pkginfo.c 710 2008-08-07 08:35:52Z carsten-guest $
Distributed under the terms of the Artistic License.
*/
@@ -30,7 +30,8 @@
extern int options[];
static regex_t re_statusinst, re_statusnotinst, re_statushold, re_namedev,
- re_gnugrepv, re_descdummy, re_desctransit, re_statusconfig;
+ re_gnugrepv, re_descdummy, re_desctransit, re_statusconfig,
+ re_status;
void
init_pkg_regex()
@@ -43,6 +44,8 @@ init_pkg_regex()
"^Status:hold.*[^-]installed$", REG_EXTENDED | REG_FLAGS);
regcomp(&re_statusconfig,
"^Status:.*config\\-files$", REG_EXTENDED | REG_FLAGS);
+ regcomp(&re_status,
+ "^Status:", REG_EXTENDED | REG_FLAGS);
if (options[GUESS]) {
char guess[128];
@@ -98,6 +101,7 @@ free_pkg_regex()
regfree(&re_statusnotinst);
regfree(&re_statushold);
regfree(&re_statusconfig);
+ regfree(&re_status);
regfree(&re_namedev);
regfree(&re_gnugrepv);
}
@@ -287,7 +291,15 @@ get_pkg_status(const char *line, pkg_inf
} else if (!regexec(&re_statusconfig, line, 0, NULL, 0)) {
if (options[FIND_CONFIG]) set_config(package);
} else if (regexec(&re_statusnotinst, line, 0, NULL, 0)) {
- exit_improperstate();
+ /* The package state is neither installed, config-files nor
+ * not-installed. It is also possible that get_pkg_info()
+ * wrongly detected the current line as a status line.
+ *
+ * Abort with error message "improper state" if we
+ * really parsed a status line.
+ */
+ if (!regexec(&re_status, line, 0, NULL, 0))
+ exit_improperstate();
}
}
Reply to: