Bug#328362: Patch for the the upcoming 0.9.3s2-2.1 NMU of pmk

2007-02-10 Thread Alexandre Ahmim-Richard

This bug does not seem fixed on the unstable:

The following NEW packages will be installed:
  pmk
0 packages upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Need to get 0B/180kB of archives. After unpacking 578kB will be used.
Writing extended state information... Done
Preconfiguring packages ...
Selecting previously deselected package pmk.
(Reading database ... 144053 files and directories currently installed.)
Unpacking pmk (from .../pmk_0.9.3s2-2.1_i386.deb) ...
Setting up pmk (0.9.3s2-2.1) ...
dpkg: error processing pmk (--configure):
 subprocess post-installation script returned error exit status 1
Errors were encountered while processing:
 pmk
E: Sub-process /usr/bin/dpkg returned an error code (1)
A package failed to install.  Trying to recover:
Setting up pmk (0.9.3s2-2.1) ...
dpkg: error processing pmk (--configure):
 subprocess post-installation script returned error exit status 1
Errors were encountered while processing:
 pmk


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#328362: Patch for the the upcoming 0.9.3s2-2.1 NMU of pmk

2006-12-05 Thread Christian Perrier

The NMU patch is attached to this mail.

The NMU changelog is:


Source: pmk
Version: 0.9.3s2-2.1
Distribution: unstable
Urgency: low
Maintainer: Christian Perrier <[EMAIL PROTECTED]>
Date: Tue,  5 Dec 2006 20:35:28 +0100
Closes: 316871 328362 395736
Changes: 
 pmk (0.9.3s2-2.1) unstable; urgency=low
 .
   * Non-maintainer upload to fix an RC bug (and l10n...:-))
   * Fix control and makefile to avoid failure in the postinst script
 Thanks to Alex de Oliveira Silva for the patch
 Closes: #328362
   * Add a binary-indep build target. Closes: #395736
   * Debconf translation updates:
 - Vietnamese. Closes: #316871

-- 


diff -Nru pmk-0.9.3s2.old/debian/changelog pmk-0.9.3s2/debian/changelog
--- pmk-0.9.3s2.old/debian/changelog2006-12-05 06:08:59.735840881 +0100
+++ pmk-0.9.3s2/debian/changelog2006-12-05 20:35:35.604185812 +0100
@@ -1,3 +1,15 @@
+pmk (0.9.3s2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload to fix an RC bug (and l10n...:-))
+  * Fix control and makefile to avoid failure in the postinst script
+Thanks to Alex de Oliveira Silva for the patch
+Closes: #328362
+  * Add a binary-indep build target. Closes: #395736
+  * Debconf translation updates:
+- Vietnamese. Closes: #316871
+
+ -- Christian Perrier <[EMAIL PROTECTED]>  Tue,  5 Dec 2006 20:35:28 +0100
+
 pmk (0.9.3s2-2) unstable; urgency=low
 
   * pmk depends on debconf without | debconf-2.0 alternate; blocks
diff -Nru pmk-0.9.3s2.old/debian/control pmk-0.9.3s2/debian/control
--- pmk-0.9.3s2.old/debian/control  2006-12-05 06:08:59.735840881 +0100
+++ pmk-0.9.3s2/debian/control  2006-12-05 19:28:27.762020306 +0100
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Marek Habersack <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), debconf-utils, debconf (>=0.2.26), 
po-debconf
+Build-Depends: debhelper (>> 4.0.0), debconf-utils, debconf (>=0.2.26), 
po-debconf, gcc
 Standards-Version: 3.6.2.1
 
 Package: pmk
diff -Nru pmk-0.9.3s2.old/debian/po/vi.po pmk-0.9.3s2/debian/po/vi.po
--- pmk-0.9.3s2.old/debian/po/vi.po 1970-01-01 01:00:00.0 +0100
+++ pmk-0.9.3s2/debian/po/vi.po 2005-07-04 14:48:23.0 +0200
@@ -0,0 +1,35 @@
+# Vietnamese translation for pmk.
+# Copyright © 2005 Free Software Foundation, Inc.
+# Clytie Siddall <[EMAIL PROTECTED]>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pmk 0.9.3-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-08-27 19:05+0200\n"
+"PO-Revision-Date: 2005-07-04 22:18+0930\n"
+"Last-Translator: Clytie Siddall <[EMAIL PROTECTED]>\n"
+"Language-Team: Vietnamese <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: LocFactoryEditor 1.2.2\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Move the old /etc/pmk.conf file out of the way?"
+msgstr "Di chuyển tập tin cấu hình cũ «/etc/pmk.conf» ra không?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"The currently recommended way of configuring pmk for the host platform is to "
+"generate the /etc/pmk.conf file dynamically when installing the package. It "
+"is strongly recommended that you agree to move the old config file. If you "
+"do not agree, the new config file will be generated in /etc/pmk.conf.new. "
+"Please be aware that the old config file may cause the PMK configuration "
+"parser to fail, thus rendering your PMK setup unusable."
+msgstr "Hiện thời khuyên bạn cấu hình trình pmk cho hệ thống chạy bằng cách 
tạo ra tập tin cấu hình «/etc/pmk.conf» một cách động trong khi cài đặt gói tin 
ấy. • Khuyến khích nặng bạn di chuyển tập tin cấu hình cũ. • Nếu bạn không di 
chuyển nó, tập tin cấu hình mới sẽ được tạo ra trong «/etc/pmk.conf.new». Hãy 
ghi chú rằng tập tin cấu hình cũ có thể làm cho trình phân tách PMK bị lỗi: như 
thế thì bạn sẽ không thể sử dụng thiết lập PMK này."
diff -Nru pmk-0.9.3s2.old/debian/rules pmk-0.9.3s2/debian/rules
--- pmk-0.9.3s2.old/debian/rules2006-12-05 06:08:59.735840881 +0100
+++ pmk-0.9.3s2/debian/rules2006-12-05 20:20:44.506698504 +0100
@@ -55,6 +55,8 @@
$(MAKE) install PREFIX=/usr DESTDIR=$(CURDIR)/debian/pmk 
MANDIR=/usr/share/man SYSCONFDIR=/etc PREMAKE=pmk
install -m 755 -d $(CURDIR)/debian/pmk/etc/
 
+binary-indep: build install
+
 # Build architecture-dependent files here.
 binary-arch: build install
dh_testdir
diff -Nru pmk-0.9.3s2.old/pmkcfg.sh pmk-0.9.3s2/pmkcfg.sh
--- pmk-0.9.3s2.old/pmkcfg.sh   2006-12-05 06:08:59.719840745 +0100
+++ pmk-0.9.3s2/pmkcfg.sh   2006-12-05 19:43:20.666411996 +0100
@@ -406,7 +406,7 @@
fi
mkf_sed 'CONFDIR' '$(SYSCONFDIR)/pmk'
mkf_sed 'SBINDIR' '$(PREFIX)/sbin'
-   mkf_sed 'DATADIR' '$(PREFIX)/share/$(PREMAKE)'
+   mkf_sed 'DATADIR' '$(PREFIX)/share/pmk'
mkf_sed 'MAN1DIR' '$(MANDIR)/man1'
mkf_sed 'MAN5DIR' '$(MANDIR)/man5'
mkf_sed 'MAN8D