Projects
Kolab:Winterfell
libkolab
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 18
View file
debian.changelog
Changed
@@ -1,4 +1,4 @@ -libkolab (2.0~dev20151230-0~kolab3) unstable; urgency=low +libkolab (2.0~dev20151230-0~kolab4) unstable; urgency=low * Liberate the build requirements for Debian/Ubuntu
View file
debian.rules
Changed
@@ -46,7 +46,10 @@ mv debian/tmp/$(PHPEXT)/kolabshared.php debian/tmp/usr/share/php/kolabshared.php echo "$(PHPEXT)" >> debian/php-kolab.install # Put kolab.ini into place - if [ -d "/etc/php/mods-available" ]; then \ + if [ -d "/etc/php/7.0/mods-available" ]; then \ + echo "debian/kolab.ini etc/php/7.0/mods-available" >> debian/php-kolab.install ; \ + echo "debian/kolabdummy.ini etc/php/7.0/mods-available" >> debian/php-kolab.install ; \ + elif [ -d "/etc/php/mods-available" ]; then \ echo "debian/kolab.ini etc/php/mods-available" >> debian/php-kolab.install ; \ echo "debian/kolabdummy.ini etc/php/mods-available" >> debian/php-kolab.install ; \ else \
View file
debian.tar.gz/php-kolab.postinst
Changed
@@ -5,10 +5,12 @@ #EXTRA# #DEBHELPER# -if [ -d "/etc/php5/mods-available" ]; then - inidir=/etc/php5/mods-available +if [ -d "/etc/php/7.0/mods-available" ]; then + inidir=/etc/php/7.0/mods-available elif [ -d "/etc/php/mods-available" ]; then inidir=/etc/php/mods-available +elif [ -d "/etc/php5/mods-available" ]; then + inidir=/etc/php5/mods-available else inidir=/etc/php5/conf.d fi @@ -22,11 +24,19 @@ if [ "$1" = "configure" ]; then # Register new conffile with UCF - ucf /usr/share/php5/${module}/${inifile} ${inidir}/${inifile} + if [ -f "/usr/share/php5/${module}/${inifile}" ]; then + ucf /usr/share/php5/${module}/${inifile} ${inidir}/${inifile} + fi + ucfr --force ${package} ${inidir}/${inifile} # Move pre-extension manager conffile - dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} ${inidir}/${inifile} 0.4.0~ -- "$@"; + if [ -f "/etc/php5/conf.d/${inifile}" ]; then + dpkg-maintscript-helper mv_conffile \ + /etc/php5/conf.d/${inifile} \ + ${inidir}/${inifile} \ + 0.4.0~ -- "$@"; + fi if [ -f "${inidir}/${inifile}.dpkg-new" ]; then md5sum="$(md5sum ${inidir}/${inifile}.dpkg-new | sed -e 's/ .*//')" @@ -37,10 +47,10 @@ fi # Enable the module - if [ -x "$(which $php5enmod 2>/dev/null)" ]; then - php5enmod ${module}/${priority:-19} - elif [ -x "$(which $phpenmod 2>/dev/null)" ]; then - phpenmod ${module}/${priority:-19} + if [ -x "$(which phpenmod 2>/dev/null)" ]; then + phpenmod ${module}/${priority:-19} + elif [ -x "$(which php5enmod 2>/dev/null)" ]; then + php5enmod ${module}/${priority:-19} fi fi # End dummy plugin @@ -53,11 +63,19 @@ if [ "$1" = "configure" ]; then # Register new conffile with UCF - ucf /usr/share/php5/${module}/${inifile} ${inidir}/${inifile} + if [ -f "/usr/share/php5/${module}/${inifile}" ]; then + ucf /usr/share/php5/${module}/${inifile} ${inidir}/${inifile} + fi + ucfr --force ${package} ${inidir}/${inifile} # Move pre-extension manager conffile - dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} ${inidir}/${inifile} 0.4.0~ -- "$@"; + if [ -f "/etc/php5/conf.d/${inifile}" ]; then + dpkg-maintscript-helper mv_conffile \ + /etc/php5/conf.d/${inifile} \ + ${inidir}/${inifile} \ + 0.4.0~ -- "$@"; + fi if [ -f "${inidir}/${inifile}.dpkg-new" ]; then md5sum="$(md5sum ${inidir}/${inifile}.dpkg-new | sed -e 's/ .*//')" @@ -68,18 +86,18 @@ fi # Enable the module - if [ -x "$(which $php5enmod 2>/dev/null)" ]; then - php5enmod ${module}/${priority:-21} - elif [ -x "$(which $phpenmod 2>/dev/null)" ]; then - phpenmod ${module}/${priority:-21} + if [ -x "$(which phpenmod 2>/dev/null)" ]; then + phpenmod ${module}/${priority:-21} + elif [ -x "$(which php5enmod 2>/dev/null)" ]; then + php5enmod ${module}/${priority:-21} fi fi if [ "$1" = "configure" ]; then # make sure that kolabformat.so is loaded after dummy.so, see #2050 - sed -i "s/extension=dummy.so/extension=dummy.so\nextension=kolabformat.so/" $inidir/kolab.ini || echo "cannot find $inidir/kolab.ini" - sed -i "s/extension=kolabformat.so/;extension=kolabformat.so/" $inidir/kolabformat.ini || echo "cannot find $inidir/kolabformat.ini" + sed -i "s/extension=dummy.so/extension=dummy.so\nextension=kolabformat.so/" ${inidir}/kolab.ini + sed -i "s/extension=kolabformat.so/;extension=kolabformat.so/" ${inidir}/kolabformat.ini fi
View file
debian.tar.gz/php-kolab.postrm
Changed
@@ -5,7 +5,11 @@ #EXTRA# #DEBHELPER# -if [ -d "/etc/php5/mods-available" ]; then +if [ -d "/etc/php/7.0/mods-available" ]; then + inidir=/etc/php/7.0/mods-available +elif [ -d "/etc/php/mods-available" ]; then + inidir=/etc/php/mods-available +elif [ -d "/etc/php5/mods-available" ]; then inidir=/etc/php5/mods-available else inidir=/etc/php5/conf.d @@ -15,27 +19,32 @@ package=php-${module} inifile=${module}.ini -dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} ${inidir}/${inifile} 0.3.0~ -- "$@"; +if [ -f "/etc/php5/conf.d/${inifile}" ]; then + dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} ${inidir}/${inifile} 0.3.0~ -- "$@"; +fi # Query which package has this conffile registered if which ucfq >/dev/null; then -ucfp=$(ucfq -w ${inidir}/${inifile} | cut -f 2 -d:) + ucfp=$(ucfq -w ${inidir}/${inifile} | cut -f 2 -d:) fi # Only work with the config file if it still belongs to us if test "$ucfp" = ${package}; then - if [ "$1" = "purge" ]; then - for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do - rm -f ${inidir}/${inifile}${ext} - done - rm -f ${inidir}/${inifile} - if which ucf >/dev/null; then - ucf --purge ${inidir}/${inifile} - fi - if which ucfr >/dev/null; then - ucfr --purge ${package} ${inidir}/${inifile} - fi - fi + if [ "$1" = "purge" ]; then + for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do + rm -f ${inidir}/${inifile}${ext} + done + + rm -f ${inidir}/${inifile} + + if which ucf >/dev/null; then + ucf --purge ${inidir}/${inifile} + fi + + if which ucfr >/dev/null; then + ucfr --purge ${package} ${inidir}/${inifile} + fi + fi fi # Dummy plugin (workaround for #2050) @@ -43,26 +52,31 @@ package=php-kolab inifile=${module}.ini -dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} ${inidir}/${inifile} 0.3.0~ -- "$@"; +if [ -f "/etc/php5/conf.d/${inifile}" ]; then + dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} ${inidir}/${inifile} 0.3.0~ -- "$@"; +fi # Query which package has this conffile registered if which ucfq >/dev/null; then -ucfp=$(ucfq -w ${inidir}/${inifile} | cut -f 2 -d:) + ucfp=$(ucfq -w ${inidir}/${inifile} | cut -f 2 -d:) fi # Only work with the config file if it still belongs to us if test "$ucfp" = ${package}; then - if [ "$1" = "purge" ]; then - for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do - rm -f ${inidir}/${inifile}${ext} - done - rm -f ${inidir}/${inifile} - if which ucf >/dev/null; then - ucf --purge ${inidir}/${inifile} - fi - if which ucfr >/dev/null; then - ucfr --purge ${package} ${inidir}/${inifile} - fi + if [ "$1" = "purge" ]; then + for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do + rm -f ${inidir}/${inifile}${ext} + done + + rm -f ${inidir}/${inifile} + + if which ucf >/dev/null; then + ucf --purge ${inidir}/${inifile} + fi + + if which ucfr >/dev/null; then + ucfr --purge ${package} ${inidir}/${inifile} + fi fi fi # End dummy plugin
View file
debian.tar.gz/php-kolab.preinst
Changed
@@ -7,12 +7,14 @@ # Dummy plugin (workaround for #2050) inifile=kolabdummy.ini - -dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} /etc/php5/mods-available/${inifile} 0.3.0~ -- "$@"; +if [ -f "/etc/php5/conf.d/${inifile}" ]; then + dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} /etc/php5/mods-available/${inifile} 0.3.0~ -- "$@"; +fi # End dummy plugin inifile=kolab.ini - -dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} /etc/php5/mods-available/${inifile} 0.3.0~ -- "$@"; +if [ -f "/etc/php5/conf.d/${inifile}" ]; then + dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} /etc/php5/mods-available/${inifile} 0.3.0~ -- "$@"; +fi exit 0
View file
debian.tar.gz/php-kolab.prerm
Changed
@@ -5,7 +5,11 @@ #EXTRA# #DEBHELPER# -if [ -d "/etc/php5/mods-available" ]; then +if [ -d "/etc/php/7.0/mods-available" ]; then + inidir=/etc/php/7.0/mods-available +elif [ -d "/etc/php/mods-available" ]; then + inidir=/etc/php/mods-available +elif [ -d "/etc/php5/mods-available" ]; then inidir=/etc/php5/mods-available/ else inidir=/etc/php5/conf.d/ @@ -16,7 +20,9 @@ inifile=${module}.ini if [ "$1" = "remove" ]; then - if [ -x "$(which php5dismod 2>/dev/null)" ]; then + if [ -x "$(which phpdismod 2>/dev/null)" ]; then + phpdismod ${module} + elif [ -x "$(which php5dismod 2>/dev/null)" ]; then php5dismod ${module} elif [ -f "${inidir}/${inifile}" ]; then rm -f "${inidir}/${inifile}" @@ -29,7 +35,9 @@ inifile=${module}.ini if [ "$1" = "remove" ]; then - if [ -x "$(which php5dismod 2>/dev/null)" ]; then + if [ -x "$(which phpdismod 2>/dev/null)" ]; then + phpdismod ${module} + elif [ -x "$(which php5dismod 2>/dev/null)" ]; then php5dismod ${module} elif [ -f "${inidir}/${inifile}" ]; then rm -f "${inidir}/${inifile}"
View file
debian.tar.gz/php-kolab.triggers
Deleted
@@ -1,1 +0,0 @@ -activate /etc/php5/conf.d
View file
libkolab.dsc
Changed
@@ -2,7 +2,7 @@ Source: libkolab Binary: libkolab2, php-kolab, python-kolab, libkolab-dev Architecture: any -Version: 2.0~dev20151230-0~kolab2 +Version: 2.0~dev20151230-0~kolab4 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel@lists.alioth.debian.org> Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Christoph Wickert <wickert@kolabsys.com>, Paul Klos <kolab@klos2day.nl> Homepage: http://git.kolab.org/libkolab
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.