Package: php5-idn Version: 1.2b-5 Severity: grave Tags: patch hi, I found many references to the php4 that make the package does not work.
please find attached patch. thanks, -- Marcelo Jorge Vieira (metal) metaldot - http://metaldot.alucinados.com jabber - [EMAIL PROTECTED]
diff -buNr debian/control debian_new/control --- debian/control 2007-08-28 21:21:44.000000000 -0300 +++ debian_new/control 2007-12-23 13:56:34.000000000 -0200 @@ -5,14 +5,6 @@ Build-Depends: debhelper (>> 4.0.0), binutils, php5-dev, libidn11-dev | libidn9-dev (>= 0.2.1), po-debconf Standards-Version: 3.5.8 -Package: php4-idn -Architecture: any -Depends: ${shlibs:Depends}, ${php:Depends} -Description: PHP API for the IDNA library - This is the PHP(4) API for the GNU LibIDN software. It's intention is - to have international characters in the DNS system. - See php-idn.bayour.com for more information. - Package: php5-idn Architecture: any Depends: ${shlibs:Depends}, ${php:Depends} diff -buNr debian/postinst debian_new/postinst --- debian/postinst 2007-08-28 21:21:44.000000000 -0300 +++ debian_new/postinst 2007-12-23 13:56:34.000000000 -0200 @@ -15,14 +15,14 @@ exit 0 fi -for SAPI in apache apache2 cgi cli +for SAPI in apache2 cgi cli do - if [ -f /etc/php4/$SAPI/php.ini ]; then - db_get php4/extension_${PECL_NAME}_$SAPI + if [ -f /etc/php5/$SAPI/php.ini ]; then + db_get php5/add_extension if [ "$RET" = "true" ] \ - && ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*${PECL_NAME}.so" /etc/php4/$SAPI/php.ini + && ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*${PECL_NAME}.so" /etc/php5/$SAPI/php.ini then - echo "extension=${PECL_NAME}.so" >> /etc/php4/$SAPI/php.ini + echo "extension=${PECL_NAME}.so" >> /etc/php5/$SAPI/php.ini fi fi done diff -buNr debian/prerm debian_new/prerm --- debian/prerm 2007-08-28 21:21:44.000000000 -0300 +++ debian_new/prerm 2007-12-23 13:56:34.000000000 -0200 @@ -16,30 +16,30 @@ set -x fi -for SAPI in `find /etc/php4/ -type d -maxdepth 1 -mindepth 1 | sed -e's#.*/##'` +for SAPI in `find /etc/php5/ -type d -maxdepth 1 -mindepth 1 | sed -e's#.*/##'` do # Use the same question for all extensions, because it's only # used once per package: right here. - if [ -f "/etc/php4/$SAPI/php.ini" ] \ - && grep -q "$EXTENSIONRE" /etc/php4/$SAPI/php.ini + if [ -f "/etc/php5/$SAPI/php.ini" ] \ + && grep -q "$EXTENSIONRE" /etc/php5/$SAPI/php.ini then - db_set php4/remove_extension true + db_set php5/remove_extension true db_title "PHP" - db_subst php4/remove_extension extname ${PECL_NAME} - db_subst php4/remove_extension sapiconfig $SAPI - db_input low php4/remove_extension || true + db_subst php5/remove_extension extname ${PECL_NAME} + db_subst php5/remove_extension sapiconfig $SAPI + db_input low php5/remove_extension || true db_go - db_get php4/remove_extension + db_get php5/remove_extension if [ "$RET" = "true" ]; then - grep -v "$EXTENSIONRE" < /etc/php4/$SAPI/php.ini \ - > /etc/php4/$SAPI/php.ini.${PECL_NAME}remove - chmod --reference=/etc/php4/$SAPI/php.ini \ - /etc/php4/$SAPI/php.ini.${PECL_NAME}remove - mv /etc/php4/$SAPI/php.ini.${PECL_NAME}remove \ - /etc/php4/$SAPI/php.ini + grep -v "$EXTENSIONRE" < /etc/php5/$SAPI/php.ini \ + > /etc/php5/$SAPI/php.ini.${PECL_NAME}remove + chmod --reference=/etc/php5/$SAPI/php.ini \ + /etc/php5/$SAPI/php.ini.${PECL_NAME}remove + mv /etc/php5/$SAPI/php.ini.${PECL_NAME}remove \ + /etc/php5/$SAPI/php.ini fi - db_fset php4/remove_extension seen false + db_fset php5/remove_extension seen false fi done diff -buNr debian/rules debian_new/rules --- debian/rules 2007-08-28 21:21:44.000000000 -0300 +++ debian_new/rules 2007-12-23 13:56:34.000000000 -0200 @@ -5,9 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -BUILD4=$(CURDIR)/debian/php4-idn BUILD5=$(CURDIR)/debian/php5-idn -PHP_EX4=$(shell /usr/bin/php-config4 --extension-dir) PHP_EX5=$(shell /usr/bin/php-config5 --extension-dir) CFLAGS = -Wall -g @@ -28,15 +26,6 @@ dh_testdir touch build-stamp -build-stamp-php4: build-stamp - -$(MAKE) clean - phpize --clean - phpize4 - chmod a+x ./configure - ./configure --prefix=$(BUILD4)/usr --with-php-config=/usr/bin/php-config4 - -$(MAKE) DESTDIR=$(BUILD4) - touch build-stamp-php4 - build-stamp-php5: build-stamp -$(MAKE) clean phpize --clean @@ -49,7 +38,7 @@ clean: dh_testdir dh_testroot - rm -rf build-stamp build-stamp-php5 build-stamp-php4 + rm -rf build-stamp build-stamp-php5 -$(MAKE) clean phpize --clean debconf-updatepo @@ -57,15 +46,6 @@ install: build-php5 -build-php4: -build-php4: build-stamp-php4 - dh_testdir - dh_testroot - dh_installdirs - mkdir -p debian/php4-idn$(PHP_EX4) - install -m 644 -o root -g root modules/idn.so debian/php4-idn$(PHP_EX4)/idn.so - mkdir -p debian/php4-idn/usr/share/lintian/overrides - echo "php-idn: no-shlibs-control-file $(PHP_EX4)/idn.so" > debian/php4-idn/usr/share/lintian/overrides/php4-idn build-php5: build-php5: build-stamp-php5 @@ -79,27 +59,7 @@ binary-indep: -binary-arch-php4: DH_OPTIONS='--package=php4-idn --no-package=php5-idn' -binary-arch-php4: build-php4 - dh_testdir - dh_testroot - dh_installdirs - dh_installchangelogs CHANGES - dh_installdebconf - dh_installdocs - dh_install - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb --package=php4-idn --no-package=php5-idn - dh_shlibdeps - echo "php:Depends=phpapi-`php-config4 --phpapi`" >> debian/php4-idn.substvars - dh_gencontrol --package=php4-idn --no-package=php5-idn - dh_md5sums - dh_builddeb --package=php4-idn --no-package=php5-idn - -binary-arch-php5: DH_OPTIONS='--package=php5-idn --no-package=php4-idn' +binary-arch-php5: DH_OPTIONS='--package=php5-idn' binary-arch-php5: build-php5 dh_testdir dh_testroot @@ -112,13 +72,13 @@ dh_strip dh_compress dh_fixperms - dh_installdeb --package=php5-idn --no-package=php4-idn + dh_installdeb --package=php5-idn dh_shlibdeps echo "php:Depends=phpapi-`php-config5 --phpapi`" >> debian/php5-idn.substvars - dh_gencontrol --package=php5-idn --no-package=php4-idn + dh_gencontrol --package=php5-idn dh_md5sums - dh_builddeb --package=php5-idn --no-package=php4-idn + dh_builddeb --package=php5-idn binary-arch: binary-arch-php5 binary: binary-indep binary-arch -.PHONY: build-php4 build-php5 clean binary-indep binary-arch binary install +.PHONY: build-php5 clean binary-indep binary-arch binary install diff -buNr debian/templates debian_new/templates --- debian/templates 2007-08-28 21:21:44.000000000 -0300 +++ debian_new/templates 2007-12-23 13:56:34.000000000 -0200 @@ -1,15 +1,15 @@ -Template: php4/add_extension +Template: php5/add_extension Type: boolean Default: true -_Description: Should ${extname} be added to /etc/php4/${sapiconfig}/php.ini? - You are installing ${extname} support for php4, and it is not yet enabled +_Description: Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini? + You are installing ${extname} support for php5, and it is not yet enabled in the configuration for the ${sapiconfig} SAPI. Do you want this extension to be enabled now? -Template: php4/remove_extension +Template: php5/remove_extension Type: boolean Default: true -_Description: Should ${extname} be removed from /etc/php4/${sapiconfig}/php.ini? - You are removing ${extname} support for php4, but it is still enabled in +_Description: Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini? + You are removing ${extname} support for php5, 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.
signature.asc
Description: This is a digitally signed message part