[pkg-horde] Uncommitted change in Gollem

[Gregory Colpart]

Hi,

There is no bug related in BTS but this patch was previously in
gollem packages and is not present now. I commit it in our
repository. Not exactly your patch, but this one:

8<-----------------------------------------------------------------------------------------
* comparing to pkg-horde-hackers at lists.alioth.debian.org--2006/gollem--sid--1--patch-9
A  {arch}/gollem/gollem--sid/gollem--sid--1/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-10
M  config/prefs.php.dist

* modified files

--- orig/config/prefs.php.dist
+++ mod/config/prefs.php.dist
@@ -6,7 +6,10 @@
  */
 
 // Make sure that constants are defined.
-require_once dirname(__FILE__) . '/../lib/Gollem.php';
+// To respect Debian FHS policy, config/ is in /etc/ directory
+// Then we need use hardcoded parameter in Debian
+ at define('GOLLEM_BASE', '/usr/share/horde3/gollem');
+require_once GOLLEM_BASE . '/lib/Gollem.php';
 
 $prefGroups['display'] = array(
     'column' => _("User Interface"),
8<-----------------------------------------------------------------------------------------

Regards,

On Fri, Jul 20, 2007 at 01:21:10PM +0200, Lionel Elie Mamane wrote:
> I still had this uncommitted change in gollem, I'm not sure
> why. Please take a look and see whether it matches a known bug or
> something like that.
> 
> -- 
> Lionel

> * looking for pkg-horde-hackers at lists.alioth.debian.org--2006/gollem--sid--1--patch-8 to compare with
> * comparing to pkg-horde-hackers at lists.alioth.debian.org--2006/gollem--sid--1--patch-8
> M  config/prefs.php.dist
> 
> * modified files
> 
> --- orig/config/prefs.php.dist
> +++ mod/config/prefs.php.dist
> @@ -6,7 +6,8 @@
>   */
>  
>  // Make sure that constants are defined.
> -require_once dirname(__FILE__) . '/../lib/Gollem.php';
> + at define('GOLLEM_BASE', dirname(__FILE__) . '/..');
> +require_once GOLLEM_BASE . '/lib/Gollem.php';
>  
>  $prefGroups['display'] = array(
>      'column' => _("User Interface"),

-- 
Gregory Colpart <reg at evolix.fr>  GnuPG:1024D/C1027A0E
Evolix - Informatique et Logiciels Libres http://www.evolix.fr/