From bf1c46d816fd89f8a699985291c913742e4301e8 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Wed, 5 Mar 2008 21:55:38 +0000 Subject: [PATCH 1/1] Correct path to /usr/share/file/magic --- debian/changelog | 1 + debian/control | 2 +- debian/control.in | 2 +- debian/patches/series | 1 + debian/rules | 2 ++ 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b05b05d..729123f 100644 --- 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 Wed, 05 Mar 2008 20:49:03 +0100 diff --git a/debian/control b/debian/control index 59efe28..0800586 100644 --- 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 0cb8c1a..df7455f 100644 --- 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 ce05f9b..b5789c7 100644 --- 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 4c71ac6..e60c4ad 100755 --- 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 -- 2.39.2