[pkg-horde] Bug#514007: Again

[Mathieu Parent]

Hi,


On Mon, Mar 9, 2009 at 5:49 AM, Ola Lundqvist <opal at debian.org> wrote:
> Hi Mathieu
>
> Some questions before I apply. Comments are right below each diff section.
>
> diff -urN horde3-3.2.2+debian0-old/debian/pear.horde.org.reg horde3-3.2.2+debian0/debian/pear.horde.org.reg
> --- horde3-3.2.2+debian0-old/debian/pear.horde.org.reg  1970-01-01 01:00:00.000000000 +0100
> +++ horde3-3.2.2+debian0/debian/pear.horde.org.reg      2009-03-08 15:22:33.000000000 +0100
> @@ -0,0 +1 @@
> +a:6:{s:7:"attribs";a:4:{s:7:"version";s:3:"1.0";s:5:"xmlns";s:31:"http://pear.php.net/channel-1.0";s:9:"xmln
> s:xsi";s:41:"http://www.w3.org/2001/XMLSchema-instance";s:18:"xsi:schemaLocation";s:75:"http://pear.php.net/d
> td/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd";}s:4:"name";s:14:"pear.horde.org";s:7:"summary";s:18:
> "Horde PEAR Channel";s:14:"suggestedalias";s:5:"horde";s:7:"servers";a:1:{s:7:"primary";a:1:{s:4:"rest";a:1:{
> s:7:"baseurl";a:2:{i:0;a:2:{s:7:"attribs";a:1:{s:4:"type";s:7:"REST1.0";}s:8:"_content";s:46:"http://pear.hor
> de.org/Chiara_PEAR_Server_REST/";}i:1;a:2:{s:7:"attribs";a:1:{s:4:"type";s:7:"REST1.1";}s:8:"_content";s:46:"
> http://pear.horde.org/Chiara_PEAR_Server_REST/";}}}}}s:13:"_lastmodified";a:2:{s:4:"ETag";s:21:""8fcacc-26d-4
> 6679327"";s:13:"Last-Modified";s:29:"Thu, 07 Jun 2007 05:09:59 GMT";}}
> \ Pas de fin de ligne à la fin du fichier.
>
> This last text: "Pas de fin de ligne à la fin du fichier.". Should it be there?

No, and wouldn't be there if you use "patch". It only says "not end of
line". So the debian/pear.horde.org.reg should not contains a linefeed
(it is a one-line file)


> diff -urN horde3-3.2.2+debian0-old/debian/rules horde3-3.2.2+debian0/debian/rules
> --- horde3-3.2.2+debian0-old/debian/rules       2009-03-08 15:22:08.000000000 +0100
> +++ horde3-3.2.2+debian0/debian/rules   2009-03-08 15:44:30.000000000 +0100
> @@ -144,6 +144,8 @@
>        #### Remove javascript source files
>        rm -rf  debian/horde3/usr/share/horde3/js/src/
>
> +       dh_install -i -ppear-horde-channel
> +
>  # Build architecture-dependent files here.
>  binary-arch: build install
>  # We have nothing to do by default.
>
> Is the option -ppear-horde-channel needed? Isn't it installing it anyway based
> on the file existance?

Yes, It is not needed.

> @@ -158,7 +160,6 @@
>                debian/horde3/usr/share/doc/horde3/changelog
>        dh_installexamples
>        -find debian/horde3 -depth -name ".arch-ids" -exec rm -Rf {} \;
> -#      dh_install
>  #      dh_installmenu
>  #      dh_installdebconf
>        dh_installlogrotate
>
>
> Best regards,
>
> // Ola


Mathieu Parent