Hi! We'd like to propose some minor changes in Roundcube packaging. Here is the changelog: roundcube (0.1.1-8) unstable; urgency=low [ Vincent Bernat ] * Backport some changes from experimental version: + Versioned roundcube-core dependency for roundcube + Fix lighttpd.conf to make it work with latest versions (Closes: #494044) + Ship a bug/control file to have all bugs submitted against roundcube metapackage + Fix debian/roundcube-core.cron.daily to use /etc/default/roundcube-core instead of /etc/default/roundcube which should not exist any more + Do not prepend path to lighty util in postinst and postrm, as per Policy Manual section 6.1 + Adapt descriptions of roundcube-database packages to refer them as metapackages instead of virtual package (Closes: #495434). [ Romain Beauxis ] * Changed versioned dependency of rouncube from binary:Version to source:Version since these are all architecture independant packages. -- Romain Beauxis <toots@rastageeks.org> Wed, 20 Aug 2008 01:25:30 +0200 Apart from the bugfix, the new bug/control file is handy to avoid that users report bug against roundcube-core and that other users do not find the bug because they are looking at roundcube package. We did not upload the new package to unstable yet. May we proceed with uploading and come back here to get a freeze exception? Here is the complete diff:
Index: debian/bug.control =================================================================== --- debian/bug.control (.../tags/0.1.1-7) (révision 0) +++ debian/bug.control (.../branches/lenny) (révision 166) @@ -0,0 +1,2 @@ +Submit-As: roundcube +Report-With: roundcube-core Index: debian/svn-deblayout =================================================================== --- debian/svn-deblayout (.../tags/0.1.1-7) (révision 0) +++ debian/svn-deblayout (.../branches/lenny) (révision 166) @@ -0,0 +1 @@ +origDir=../../tarballs Index: debian/control =================================================================== --- debian/control (.../tags/0.1.1-7) (révision 140) +++ debian/control (.../branches/lenny) (copie de travail) @@ -11,7 +11,7 @@ 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 (>= 1.5.0), ucf, tinymce2 | tinymce (<< 3), ${misc:Depends}, libmagic1 +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 (>= 1.5.0), ucf, tinymce (<< 3), ${misc:Depends}, libmagic1 Replaces: roundcube Conflicts: roundcube (<< 0.1~rc2-2) Description: skinnable AJAX based webmail solution for IMAP servers @@ -23,11 +23,11 @@ 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 virtual packages. + it along with one of the roundcube database metapackages. Package: roundcube Architecture: all -Depends: roundcube-sqlite | roundcube-db, roundcube-core +Depends: roundcube-sqlite | roundcube-db, roundcube-core (= ${source:Version}) 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 @@ -43,7 +43,7 @@ Depends: php5-mysql, mysql-client | virtual-mysql-client Suggests: mysql-server Provides: roundcube-db -Description: virtual package providing MySQL dependencies for RoundCube +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. @@ -53,7 +53,7 @@ Depends: php5-pgsql, postgresql-client-8.1 | postgresql-client Suggests: postgresql-server Provides: roundcube-db -Description: virtual package providing PostgreSQL dependencies for RoundCube +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. @@ -62,7 +62,7 @@ Architecture: all Depends: php5-sqlite, sqlite Provides: roundcube-db -Description: virtual package providing sqlite dependencies for RoundCube +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. Index: debian/control.in =================================================================== --- debian/control.in (.../tags/0.1.1-7) (révision 140) +++ debian/control.in (.../branches/lenny) (copie de travail) @@ -23,11 +23,11 @@ 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 virtual packages. + it along with one of the roundcube database metapackages. Package: roundcube Architecture: all -Depends: roundcube-sqlite | roundcube-db, roundcube-core +Depends: roundcube-sqlite | roundcube-db, roundcube-core (= ${source:Version}) 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 @@ -43,7 +43,7 @@ Depends: php5-mysql, mysql-client | virtual-mysql-client Suggests: mysql-server Provides: roundcube-db -Description: virtual package providing MySQL dependencies for RoundCube +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. @@ -53,7 +53,7 @@ Depends: php5-pgsql, postgresql-client-8.1 | postgresql-client Suggests: postgresql-server Provides: roundcube-db -Description: virtual package providing PostgreSQL dependencies for RoundCube +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. @@ -62,7 +62,7 @@ Architecture: all Depends: php5-sqlite, sqlite Provides: roundcube-db -Description: virtual package providing sqlite dependencies for RoundCube +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. Index: debian/conf/lighttpd.conf =================================================================== --- debian/conf/lighttpd.conf (.../tags/0.1.1-7) (révision 140) +++ debian/conf/lighttpd.conf (.../branches/lenny) (copie de travail) @@ -2,11 +2,8 @@ # virtual host configuration. Do not forget to adapt the rest of the # configuration. -alias.url += ( - "/roundcube" => "/var/lib/roundcube", - # The following line allow to use tinymce. Look at README.Debian - "/roundcube/program/js/tiny_mce" => "/usr/share/tinymce2/www" -) +alias.url += ("/roundcube/program/js/tiny_mce" => "/usr/share/tinymce2/www") +alias.url += ("/roundcube" => "/var/lib/roundcube") $HTTP["url"] =~ "^/roundcube" { server.follow-symlink = "enable" Index: debian/changelog =================================================================== --- debian/changelog (.../tags/0.1.1-7) (révision 140) +++ debian/changelog (.../branches/lenny) (copie de travail) @@ -1,3 +1,25 @@ +roundcube (0.1.1-8) unstable; urgency=low + + [ Vincent Bernat ] + * Backport some changes from experimental version: + + Versioned roundcube-core dependency for roundcube + + Fix lighttpd.conf to make it work with latest versions (Closes: #494044) + + Ship a bug/control file to have all bugs submitted against roundcube + metapackage + + Fix debian/roundcube-core.cron.daily to use + /etc/default/roundcube-core instead of /etc/default/roundcube which + should not exist any more + + Do not prepend path to lighty util in postinst and postrm, as per + Policy Manual section 6.1 + + Adapt descriptions of roundcube-database packages to refer them as + metapackages instead of virtual package (Closes: #495434). + + [ Romain Beauxis ] + * Changed versioned dependency of rouncube from binary:Version to + source:Version since these are all architecture independant packages. + + -- Romain Beauxis <toots@rastageeks.org> Wed, 20 Aug 2008 01:25:30 +0200 + roundcube (0.1.1-7) unstable; urgency=low * Another fix for incorrect tinymce path. This should be the last one! Index: debian/rules =================================================================== --- debian/rules (.../tags/0.1.1-7) (révision 140) +++ debian/rules (.../branches/lenny) (copie de travail) @@ -44,5 +44,9 @@ rm -rf $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/js/tiny_mce dh_link -proundcube-core usr/share/tinymce2/www usr/share/roundcube/program/js/tiny_mce +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/% : + install -d $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg) + install -m 644 $(CURDIR)/debian/bug.control $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/control + clean:: debconf-updatepo Index: debian/roundcube-core.postinst =================================================================== --- debian/roundcube-core.postinst (.../tags/0.1.1-7) (révision 140) +++ debian/roundcube-core.postinst (.../branches/lenny) (copie de travail) @@ -23,7 +23,7 @@ echo "Lighttpd not installed, skipping" else ln -s /etc/roundcube/lighttpd.conf /etc/lighttpd/conf-available/50-roundcube.conf - /usr/sbin/lighty-enable-mod roundcube + lighty-enable-mod roundcube fi fi } Index: debian/roundcube-core.postrm =================================================================== --- debian/roundcube-core.postrm (.../tags/0.1.1-7) (révision 140) +++ debian/roundcube-core.postrm (.../branches/lenny) (copie de travail) @@ -19,7 +19,7 @@ if [ ! -x /usr/sbin/lighty-disable-mod ] ; then echo "Lighttpd not installed, skipping" else - /usr/sbin/lighty-disable-mod roundcube + lighty-disable-mod roundcube fi # See bug #448682 if [ -h /etc/lighttpd/conf-enabled/50-roundcube.conf ] ; then Index: debian/roundcube-core.cron.daily =================================================================== --- debian/roundcube-core.cron.daily (.../tags/0.1.1-7) (révision 140) +++ debian/roundcube-core.cron.daily (.../branches/lenny) (copie de travail) @@ -2,8 +2,8 @@ MAX_TMPFILE_LIFETIME=5 # MAX_TMPFILE_LIFETIME can be overridden in this file -if [ -r /etc/default/roundcube ]; then - . /etc/default/roundcube +if [ -r /etc/default/roundcube-core ]; then + . /etc/default/roundcube-core fi find /var/lib/roundcube/temp -type f -mtime +$MAX_TMPFILE_LIFETIME -print0 | xargs -0 -r rm
Thanks. -- # Basic IBM dingbats, some of which will never have a purpose clear # to mankind 2.4.0 linux/drivers/char/cp437.uni
Attachment:
pgpmhSxpJA6dh.pgp
Description: PGP signature