Merge lp:~kamalmostafa/ubuntu/lucid/mailutils/fix-517366-ftbfs into lp:ubuntu/lucid/mailutils

[Kamal Mostafa]

[Iulian Udrea (iulian)]

I've replaced LP: #nnnnnn with the actual bug number in disable_am_gnu_radius.diff, line 15. Other than that it looks good.

Thank you.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-16 10:57:44 +0000
+++ debian/changelog	2010-02-05 02:45:21 +0000
@@ -1,3 +1,11 @@
+mailutils (1:2.1+dfsg1-4ubuntu1) lucid; urgency=low
+
+  * Fix FTBFS in Ubuntu Lucid (LP: #517366)
+    - configure.ac: Disable AM_GNU_RADIUS check (breaks internal autoconf)
+    - python-mailutils.install: python2.6 needs dist-packages not site-packages
+
+ -- Kamal Mostafa <[e-mail]>  Thu, 04 Feb 2010 18:21:47 -0800
+
 mailutils (1:2.1+dfsg1-4) unstable; urgency=low
 
   * Fix lenny upgrades of mailutils-mh by adding missing replaces,

=== modified file 'debian/control'
--- debian/control	2010-01-16 10:57:44 +0000
+++ debian/control	2010-02-05 02:45:21 +0000
@@ -1,7 +1,8 @@
 Source: mailutils
 Section: mail
 Priority: optional
-Maintainer: Jordi Mallach <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Jordi Mallach <[e-mail]>
 Uploaders: Luk Claes <[e-mail]>
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-mailutils/

=== added file 'debian/patches/disable_am_gnu_radius.diff'
--- debian/patches/disable_am_gnu_radius.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/disable_am_gnu_radius.diff	2010-02-05 02:45:21 +0000
@@ -0,0 +1,25 @@
+Index: mailutils/configure.ac
+===================================================================
+--- mailutils.orig/configure.ac	2010-02-04 17:52:33.000000000 -0800
++++ mailutils/configure.ac	2010-02-04 17:52:40.000000000 -0800
+@@ -814,12 +814,14 @@
+ 
+ MU_ENABLE_SUPPORT(maildir)
+ 
+-# FIXME: Should be --with-radius 
+-MU_ENABLE_SUPPORT(radius,
+-                  [AM_GNU_RADIUS(1.6,
+-		                 [MU_AUTHLIBS="$MU_AUTHLIBS -lgnuradius"
+-				  mu_cv_enable_radius=yes],
+-				 [mu_cv_enable_radius=no])]) 
++## Disabled to avoid FTBFS in Ubuntu Lucid (LP: #nnnnnn):
++##
++## # FIXME: Should be --with-radius 
++## MU_ENABLE_SUPPORT(radius,
++##                   [AM_GNU_RADIUS(1.6,
++## 		                 [MU_AUTHLIBS="$MU_AUTHLIBS -lgnuradius"
++## 				  mu_cv_enable_radius=yes],
++## 				 [mu_cv_enable_radius=no])]) 
+ 
+ AC_ARG_ENABLE([experimental],
+               AC_HELP_STRING([--enable-experimental],

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-12-16 15:01:02 +0000
+++ debian/patches/series	2010-02-05 02:45:21 +0000
@@ -4,3 +4,4 @@
 program_descriptions.diff
 readmsg_command_line_segfaults.diff
 spelling_fixes.diff
+disable_am_gnu_radius.diff

=== modified file 'debian/python-mailutils.install'
--- debian/python-mailutils.install	2009-10-17 17:29:42 +0000
+++ debian/python-mailutils.install	2010-02-05 02:45:21 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/python*/site-packages/mailutils/*.py
+debian/tmp/usr/lib/python*/dist-packages/mailutils/*.py