Correct path to /usr/share/file/magic

diff --git a/debian/changelog b/debian/changelog
index b05b05d844ad7cc10a4d5f0fd17360d8c7778ec2..729123faf71a39f249d6d03fa3c754943b6d1f0d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ roundcube (0.1-1) UNRELEASED; urgency=low
   * Do not depend on a specific revision of cdbs.
   * Move po-debconf from Build-Depends-Indep to Build-Depends since it is
     needed for clean target.
+  * Correct path to /usr/share/file/magic, provided by libmagic1.
 
  -- Vincent Bernat <bernat@luffy.cx>  Wed, 05 Mar 2008 20:49:03 +0100
 

diff --git a/debian/control b/debian/control
index 59efe28c122dbf018a9f8868a85321d2a0bba8ae..0800586dbefb93a45d06b3d15bafd15c1d2efe54 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube
 
 Package: roundcube-core
 Architecture: all
-Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, tinymce, ${misc:Depends}
+Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, tinymce, ${misc:Depends}, libmagic1
 Replaces: roundcube
 Conflicts: roundcube (<< 0.1~rc2-2)
 Description: skinnable AJAX based webmail solution for IMAP servers

diff --git a/debian/control.in b/debian/control.in
index 0cb8c1a5e1f70978780894745e3980cdf68a4bab..df7455f8f0beeac78445ebbec819a1de6638f615 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -12,7 +12,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube
 
 Package: roundcube-core
 Architecture: all
-Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, tinymce, ${misc:Depends}
+Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, tinymce, ${misc:Depends}, libmagic1
 Replaces: roundcube
 Conflicts: roundcube (<< 0.1~rc2-2)
 Description: skinnable AJAX based webmail solution for IMAP servers

diff --git a/debian/patches/series b/debian/patches/series
index ce05f9b4c454f9ed09da4819600dad1287d1102b..b5789c7c92ca32cb79affe7d7791ee1e395fccf2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ dbconfig-common_support.patch
 correct_install_path.patch
 use_packaged_tinymce.patch
 use-db-backend.patch
+correct-magic-path.patch

diff --git a/debian/rules b/debian/rules
index 4c71ac6f99d456b1bd0d6c87e102c1ad2a61feef..e60c4ade9445553bba3943c22082ee477eeb8cf3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,8 @@ binary-install/roundcube-core::
        install -m 0644 $(CURDIR)/SQL/sqlite.update.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/sqlite/0.1~rc1~dfsg-1
        # Some files are executable while not being scripts or binary...
        find $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/localization -type f -print0 | xargs -0 chmod -x
+       # Remove useless file
+       rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/lib/magic
        # Remove files shipped in tinymce package
        rm -rf $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/js/tiny_mce
        dh_link -proundcube-core usr/share/tinymce/www usr/share/roundcube/program/js/tiny_mce