Hi, Attached is the _real_ diff for my php4-kadm5 0.2.4-4.1 NMU. I forgot to change phpize in debian/rules
-- Julien Danjou // Λ̊ <[EMAIL PROTECTED]> http://julien.danjou.info // 9A0D 5FD9 EB42 22F6 8974 C95C A462 B51E C2FE E5CD // Life is life. Lalalalala.
diff -u php4-kadm5-0.2.4/debian/rules php4-kadm5-0.2.4/debian/rules
--- php4-kadm5-0.2.4/debian/rules
+++ php4-kadm5-0.2.4/debian/rules
@@ -20,10 +20,10 @@
TAR=tar
PECL_NAME=kadm5
PACKAGE_NAME=php4-kadm5
-PHPIZE=/usr/bin/phpize
-PHPCONFIG=/usr/bin/php-config
+PHPIZE=/usr/bin/phpize4
+PHPCONFIG=/usr/bin/php-config4
-phpapiver=$(shell grep '\#define PHP_API_VERSION '
/usr/include/php4/main/php.h |sed 's/\#define PHP_API_VERSION //')-zts
+phpapiver=$(shell php-config4 --phpapi)
configure: configure-stamp
configure-stamp:
diff -u php4-kadm5-0.2.4/debian/control php4-kadm5-0.2.4/debian/control
--- php4-kadm5-0.2.4/debian/control
+++ php4-kadm5-0.2.4/debian/control
@@ -3,11 +3,11 @@
Priority: optional
Maintainer: Cajus Pollmeier <[EMAIL PROTECTED]>
Build-Depends: debhelper (>> 4.0.0), comerr-dev, libkrb5-dev, po-debconf,
php4-dev (>= 4:4.3.10-3)
-Standards-Version: 3.6.1
+Standards-Version: 3.7.2
Package: php4-kadm5
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, phpapi-20020918
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}
Description: An extension to manage kerberos admin information
Kerberos is a system for authenticating users and services on a network.
Kerberos is a trusted third-party service. That means that there is a
diff -u php4-kadm5-0.2.4/debian/changelog php4-kadm5-0.2.4/debian/changelog
--- php4-kadm5-0.2.4/debian/changelog
+++ php4-kadm5-0.2.4/debian/changelog
@@ -1,3 +1,13 @@
+php4-kadm5 (0.2.4-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Rebuild against new php API (Closes: #336312)
+ * Bump standards version
+ * Add vi translation (Closes: #316825)
+ * Add sv translation (Closes: #330761)
+
+ -- Julien Danjou <[EMAIL PROTECTED]> Tue, 11 Jul 2006 14:50:27 +0200
+
php4-kadm5 (0.2.4-4) unstable; urgency=low
* Corrected depends on virtual package (Closes: #304940)
reverted:
--- php4-kadm5-0.2.4/debian/php4-krb5.substvars
+++ php4-kadm5-0.2.4.orig/debian/php4-krb5.substvars
@@ -1,2 +0,0 @@
-php:Depends=phpapi-20020918-zts
-php:Depends=phpapi-20020918-zts
only in patch2:
unchanged:
--- php4-kadm5-0.2.4.orig/debian/po/vi.po
+++ php4-kadm5-0.2.4/debian/po/vi.po
@@ -0,0 +1,47 @@
+# Vietnamese translation for php4-kadm5 .
+# Copyright © 2005 Free Software Foundation, Inc.
+# Clytie Siddall <[EMAIL PROTECTED]>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: php4-kadm5 0.2.4-4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-15 10:13+0100\n"
+"PO-Revision-Date: 2005-07-04 14:34+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 "Should ${extname} be added to /etc/php4/${sapiconfig}/php.ini?"
+msgstr "Có nên thêm «${extname}» vào «/etc/php4/${sapiconfig}/php.ini» không?"
+
+#.Type: boolean
+#.Description
+#:../templates:4
+msgid ""
+"You are installing ${extname} support for php4, and it is not yet enabled in "
+"the configuration for the ${sapiconfig} SAPI. Do you want this extension to "
+"be enabled now?"
+msgstr "Lúc này bạn đang cài đặt cách hỗ trợ «${extname}» cho PHP4, nhưng mà
nó chưa bật trong cấu hình cho SAPI «${sapiconfig}». Bạn có muốn hiệu lực phần
mở rộng này ngay bây giờ không?"
+
+#.Type: boolean
+#.Description
+#:../templates:12
+msgid "Should ${extname} be removed from /etc/php4/${sapiconfig}/php.ini?"
+msgstr "Có nên loại bỏ «${extname}» ra «/etc/php4/${sapiconfig}/php.ini»
không?"
+
+#.Type: boolean
+#.Description
+#:../templates:12
+msgid ""
+"You are removing ${extname} support for php4, but it is still enabled in the "
+"configuration for the ${sapiconfig} SAPI. Leaving this in place will "
+"probably cause problems when trying to use PHP."
+msgstr "Lúc này bạn đang loại bỏ cách hỗ trợ «${extname}» ra PHP4, nhưng mà nó
vẫn còn bật trong cấu hình cho SAPI «${sapiconfig}». Nếu bạn không vô hiệu hóa
nó, rất có thể gây ra lỗi trong khi cố sử dụng PHP."
only in patch2:
unchanged:
--- php4-kadm5-0.2.4.orig/debian/po/sv.po
+++ php4-kadm5-0.2.4/debian/po/sv.po
@@ -0,0 +1,56 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: php4-kadm5 0.2.4-4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-15 10:13+0100\n"
+"PO-Revision-Date: 2005-09-29 18:58-0700\n"
+"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
+"Language-Team: Swedish <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Should ${extname} be added to /etc/php4/${sapiconfig}/php.ini?"
+msgstr "Ska ${extname} l�ggas till i /etc/php4/${sapiconfig}/php.ini?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"You are installing ${extname} support for php4, and it is not yet enabled in "
+"the configuration for the ${sapiconfig} SAPI. Do you want this extension to "
+"be enabled now?"
+msgstr ""
+"Du installerar ${extname} st�d f�r php4 och den �r �nnu inte aktiverad i
konfigurationen f�r ${sapiconfig} SAPI. Vill du aktivera den nu?"
+
+#. Type: boolean
+#. Description
+#: ../templates:12
+msgid "Should ${extname} be removed from /etc/php4/${sapiconfig}/php.ini?"
+msgstr "Ska ${extname} raderas fr�n /etc/php4/${sapiconfig}/php.ini?"
+
+#. Type: boolean
+#. Description
+#: ../templates:12
+msgid ""
+"You are removing ${extname} support for php4, but it is still enabled in the "
+"configuration for the ${sapiconfig} SAPI. Leaving this in place will "
+"probably cause problems when trying to use PHP."
+msgstr ""
+"Du tar bort ${extname} st�det f�r php4 och den �r fortfarande aktiverad i
konfigurationen f�r ${sapiconfig} SAPI. L�mna den aktiverad kan skapa problem
n�r du anv�nder PHP."
+
signature.asc
Description: Digital signature
