From 789100e315e4623d031091aecfd382f4d01ab86e Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sat, 8 Jan 2011 15:04:10 +0000 Subject: [PATCH] Don't use debian/control.in anymore. --- debian/control | 4 +-- debian/control.in | 74 ----------------------------------------------- debian/rules | 4 --- 3 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 debian/control.in diff --git a/debian/control b/debian/control index ddacdcf..bb789eb 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,7 @@ Section: web Priority: extra Maintainer: Debian Roundcube Maintainers Uploaders: Vincent Bernat , Romain Beauxis -Build-Depends: cdbs, - debhelper, - dh-buildinfo, po-debconf +Build-Depends: cdbs, debhelper (>= 5), dh-buildinfo, po-debconf Homepage: http://www.roundcube.net/ Standards-Version: 3.9.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-roundcube/trunk diff --git a/debian/control.in b/debian/control.in deleted file mode 100644 index fb540b2..0000000 --- a/debian/control.in +++ /dev/null @@ -1,74 +0,0 @@ -Source: roundcube -Section: web -Priority: extra -Maintainer: Debian Roundcube Maintainers -Uploaders: Vincent Bernat , Romain Beauxis -Build-Depends: @cdbs@, po-debconf -Homepage: http://www.roundcube.net/ -Standards-Version: 3.9.1 -Vcs-Svn: svn://svn.debian.org/svn/pkg-roundcube/trunk -Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/trunk/ - -Package: roundcube-core -Architecture: all -Depends: dbconfig-common, debconf | debconf-2.0, ucf, - apache2 | lighttpd | httpd, - php5, php5-mcrypt, php5-gd, - php-mdb2 (>= 2.5.0), php-auth, php-net-smtp (>= 1.4.2), - php-net-socket, php-mail-mime (>= 1.8.0), php5-pspell, - tinymce (>= 3), libjs-jquery (>= 1.4.2), - libmagic1, - roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), - ${misc:Depends} -Suggests: php-auth-sasl (>= 1.0.3) -Replaces: roundcube -Breaks: roundcube (<< 0.1~rc2-2) -Description: skinnable AJAX based webmail solution for IMAP servers - RoundCube Webmail is a browser-based multilingual IMAP client with an - application-like user interface. It provides full functionality - expected from an e-mail client, including MIME support, address book, - folder manipulation and message filters. - . - The user interface is fully skinnable using XHTML and CSS 2. - . - This package provides the core code for roundcube. You should install - it along with one of the roundcube database metapackages. - -Package: roundcube -Architecture: all -Depends: roundcube-core (= ${source:Version}), ${misc:Depends} -Description: skinnable AJAX based webmail solution for IMAP servers - metapackage - RoundCube Webmail is a browser-based multilingual IMAP client with an - application-like user interface. It provides full functionality - expected from an e-mail client, including MIME support, address book, - folder manipulation and message filters. - . - The user interface is fully skinnable using XHTML and CSS 2. - . - This package will install a full roundcube application. - -Package: roundcube-mysql -Architecture: all -Depends: php-mdb2-driver-mysql (>= 1.5.0b2), mysql-client | virtual-mysql-client, ${misc:Depends} -Suggests: mysql-server -Description: metapackage providing MySQL dependencies for RoundCube - This package provides MySQL dependencies for RoundCube Webmail, a - skinnable AJAX based webmail solution for IMAP servers. Install this - one if you want to use a MySQL database with RoundCube. - -Package: roundcube-pgsql -Architecture: all -Depends: php-mdb2-driver-pgsql (>= 1.5.0b2), postgresql-client-8.1 | postgresql-client, ${misc:Depends} -Suggests: postgresql-server -Description: metapackage providing PostgreSQL dependencies for RoundCube - This package provides PostgreSQL dependencies for RoundCube Webmail, - a skinnable AJAX based webmail solution for IMAP servers. Install - this one if you want to use a PostgreSQL database with RoundCube. - -Package: roundcube-sqlite -Architecture: all -Depends: php-mdb2-driver-sqlite (>= 1.5.0b2), sqlite, ${misc:Depends} -Description: metapackage providing sqlite dependencies for RoundCube - This package provides sqlite dependencies for RoundCube Webmail, a - skinnable AJAX based webmail solution for IMAP servers. Install this - one if you want to use a sqlite database with RoundCube. diff --git a/debian/rules b/debian/rules index 529c41f..8de2d57 100755 --- a/debian/rules +++ b/debian/rules @@ -4,10 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk DEB_INSTALL_CHANGELOGS_ALL=CHANGELOG -# In order to regenerate 'debian/control' : -# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean -# Then check manually if everything's ok - binary-install/roundcube-core:: # Remove plugins rm -rf $(CURDIR)/debian/roundcube-core/usr/share/roundcube/plugins -- 2.39.2