pending changes

doc/rpm-build/debian.control

@@ -13,7 +13,6 @@ Depends:
  egroupware-epl-vendor (= ${binary:Version}),
  egroupware-epl-jdots (= ${binary:Version}),
  egroupware-epl-pixelegg (= ${binary:Version}),
- egroupware-epl-stylite (= ${binary:Version}),
  egroupware-epl-esync (= ${binary:Version}),
  egroupware-epl-bookmarks (= ${binary:Version}),
  egroupware-epl-calendar (= ${binary:Version}),
@@ -58,7 +57,7 @@ Depends: apache2,
  php5-mcrypt,
  php5-xsl,
  ${misc:Depends}
-Recommends: mysql-server, php-apc, php5-pecl-smb, php5-tidy, mysql-client | postgresql-client
+Recommends: mariadb-server | mysql-server, php-apc, php5-pecl-smb, php5-tidy, mariadb-client | mysql-client | postgresql-client
 Suggests: egroupware-epl,
  php5-ldap,
  php5-mhash,

doc/rpm-build/egroupware-epl.dsc

@@ -2,10 +2,11 @@ Format: 1.0
 Source: egroupware-epl
 Binary: egroupware-epl, egroupware-epl-core, egroupware-epl-vendor, egroupware-epl-bookmarks, egroupware-epl-calendar, egroupware-epl-developer-tools, egroupware-epl-emailadmin, egroupware-epl-esync, egroupware-epl-mail, egroupware-epl-filemanager, egroupware-epl-infolog, egroupware-epl-manual, egroupware-epl-news-admin, egroupware-epl-notifications, egroupware-epl-phpbrain, egroupware-epl-projectmanager, egroupware-epl-registration, egroupware-epl-resources, egroupware-epl-sambaadmin, egroupware-epl-sitemgr, egroupware-epl-timesheet, egroupware-epl-tracker, egroupware-epl-wiki, egroupware-epl-jdots, egroupware-epl-pixelegg
 Architecture: all
-Version: 14.2.20141211-1
+Version: 14.2.20150707
 Maintainer: Ralf Becker <rb@stylite.de>
-Homepage: http://www.stylite.de/EPL
+Homepage: http://www.egroupware.org/
-Standards-Version: 3.8.0
+Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 5), po-debconf
-Debtransform-Tar: egroupware-epl-14.2.20141211.tar.gz
+Debtransform-Tar: egroupware-epl-14.2.20150707.tar.gz
 Debtransform-Files-Tar: debian.tar.gz phpfreechat_data_public.tar.gz
+DEBTRANSFORM-RELEASE

doc/rpm-build/egroupware-epl.spec

@@ -80,9 +80,9 @@ Prefix: /usr/share
 Distribution: %{distribution}
 
 Source0: %{name}-%{version}.tar.gz
-Source2: %{name}-stylite-%{version}.tar.bz2
+#Source2: %{name}-stylite-%{version}.tar.bz2
 Source3: %{name}-archive-%{version}.tar.bz2
-Source4: %{name}-esyncpro-%{version}.tar.bz2
+#Source4: %{name}-esyncpro-%{version}.tar.bz2
 #Source5: %{name}-jdots-%{version}.tar.bz2
 Source6: phpfreechat_data_public.tar.gz
 Source8: %{name}-rpmlintrc
@@ -99,7 +99,7 @@ Buildarch: noarch
 AutoReqProv: no
 
 Requires: %{name}-core            = %{version}
-Requires: %{name}-stylite         = %{version}
+#Requires: %{name}-stylite         = %{version}
 Requires: %{name}-jdots           = %{version}
 Requires: %{name}-esync           = %{version}
 Requires: %{name}-bookmarks       = %{version}
@@ -446,18 +446,18 @@ Obsoletes: %{egw_packagename}-sitemgr
 %description sitemgr
 This is the Sitemanager CMS app for EGroupware.
 
-%package stylite
+#%package stylite
-Version: %{version}
+#Version: %{version}
-Summary: Stylite EPL enhancements
+#Summary: Stylite EPL enhancements
-License: proprietary, see http://www.stylite.de/EPL
+#License: proprietary, see http://www.stylite.de/EPL
-Group: Web/Database
+#Group: Web/Database
-AutoReqProv: no
+#AutoReqProv: no
-Requires: egw-core >= %{version}
+#Requires: egw-core >= %{version}
-Obsoletes: %{name}-groups
+#Obsoletes: %{name}-groups
-%description stylite
+#%description stylite
-The package contains Stylite proprietary EPL enhancements:
+#The package contains Stylite proprietary EPL enhancements:
-- stylite.links stream wrapper allows browsing of app directories
+#- stylite.links stream wrapper allows browsing of app directories
-- filemanger favorites
+#- filemanger favorites
 
 %package timesheet
 Version: %{version}
@@ -503,30 +503,30 @@ Dependencies include:
 - diverse Horde framework packages like Horde_Imap_Client
 - some PEAR packages incl. PEAR itself
 
-%package esyncpro
+#%package esyncpro
-Version: %{version}
+#Version: %{version}
-Summary: Stylite eSync Provisioning
+#Summary: Stylite eSync Provisioning
-License: proprietary
+#License: proprietary
-Group: Web/Database
+#Group: Web/Database
-AutoReqProv: no
+#AutoReqProv: no
-Requires: egw-core >= %{version}, %{name}-esync >= %{version}
+#Requires: egw-core >= %{version}, %{name}-esync >= %{version}
-%description esyncpro
+#%description esyncpro
-Stylite's eSync Provisioning app allows to edit and assign
+#Stylite's eSync Provisioning app allows to edit and assign
-policies to devices and keeps a central list of syncing devices.
+#policies to devices and keeps a central list of syncing devices.
-It also allows to remote wipe or view sync logs of all devices.
+#It also allows to remote wipe or view sync logs of all devices.
 
-%post esyncpro
+#%post esyncpro
-# update/install esyncpro
+## update/install esyncpro
-%{post_install} --install-update-app esyncpro 2>&1 | tee -a %{install_log}
+#%{post_install} --install-update-app esyncpro 2>&1 | tee -a %{install_log}
 
 %prep
 echo "Detected php: %{php}"
 echo "post_install: %{post_install}"
 %setup0 -c -n %{egwdirname}
 #%setup1 -T -D -a 1 -n %{egwdirname}
-%setup2 -T -D -a 2 -n %{egwdirname}
+#%setup2 -T -D -a 2 -n %{egwdirname}
 %setup3 -T -D -a 3 -n %{egwdirname}
-%setup4 -T -D -a 4 -n %{egwdirname}
+#%setup4 -T -D -a 4 -n %{egwdirname}
 #%setup5 -T -D -a 5 -n %{egwdirname}
 %setup6 -T -D -a 6 -n %{egwdirname}
 #%setup9 -T -D -a 9 -n %{egwdirname}
@@ -615,9 +615,9 @@ ln -s ../../..%{egwdatadir}/header.inc.php
 %defattr(-,root,root)
 %{egwdir}/activesync
 
-%files esyncpro
+#%files esyncpro
-%defattr(-,root,root)
+#%defattr(-,root,root)
-%{egwdir}/esyncpro
+#%{egwdir}/esyncpro
 
 %%files calendar
 %defattr(-,root,root)
@@ -695,9 +695,9 @@ ln -s ../../..%{egwdatadir}/header.inc.php
 %defattr(-,root,root)
 %{egwdir}/sitemgr
 
-%files stylite
+#%files stylite
-%defattr(-,root,root)
+#%defattr(-,root,root)
-%{egwdir}/stylite
+#%{egwdir}/stylite
 
 %files timesheet
 %defattr(-,root,root)