changes to build 16.1 rpm and deb packages

doc/rpm-build/.gitignore

@@ -0,0 +1 @@
+debian/

doc/rpm-build/debian.control

@@ -11,65 +11,62 @@ Architecture: all
 Depends:
  egroupware-epl-core (= ${binary:Version}),
  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}),
- egroupware-epl-developer-tools (= ${binary:Version}),
- egroupware-epl-emailadmin (= ${binary:Version}),
  egroupware-epl-mail (= ${binary:Version}),
  egroupware-epl-filemanager (= ${binary:Version}),
  egroupware-epl-infolog (= ${binary:Version}),
  egroupware-epl-importexport (= ${binary:Version}),
  egroupware-epl-news-admin (= ${binary:Version}),
  egroupware-epl-notifications (= ${binary:Version}),
- egroupware-epl-phpbrain (= ${binary:Version}),
- egroupware-epl-phpfreechat (= ${binary:Version}),
  egroupware-epl-projectmanager (= ${binary:Version}),
  egroupware-epl-registration (= ${binary:Version}),
  egroupware-epl-resources (= ${binary:Version}),
- egroupware-epl-sambaadmin (= ${binary:Version}),
+ egroupware-epl-stylite (= ${binary:Version}),
- egroupware-epl-sitemgr (= ${binary:Version}),
  egroupware-epl-timesheet (= ${binary:Version}),
  egroupware-epl-tracker (= ${binary:Version}),
- egroupware-epl-wiki (= ${binary:Version}),
  ${misc:Depends}
-Recommends: egroupware-epl-archive (= ${binary:Version})
 Replaces: egroupware
 Conflicts: egroupware
+# suggest no longer by default installed packages (all requiring egroupware-epl-compat)
+Suggests: egroupware-epl-jdots,
+ egroupware-epl-phpbrain,
+ egroupware-epl-phpfreechat,
+ egroupware-epl-sambaadmin,
+ egroupware-epl-sitemgr,
+ egroupware-epl-wiki
 Description: web-based groupware suite - metapackage
  ${commondesc}
  .
- This package is a metapackage containing dependencies on all the
+ This package is a metapackage containing dependencies on default
- EGroupware applications.  It can be used to conveniently install
+ EGroupware applications. Further contrib applications can then be
- EGroupware with all available applications.
+ installed individually, when needed.
 
 Package: egroupware-epl-core
 Architecture: all
 Depends: apache2,
- php5 (>= 5.3.3),
+ php5 (>= 5.4.0) | libapache2-mod-php (>=7.0),
- php5-cli,
+ php5-cli | php-cli,
- php5-sqlite,
+ php5-mysql | php5-pgsql | php-mysql | php-pgsql,
- php5-mysql | php5-pgsql | php5-odbc,
+ php5-json | php-json,
- php5-json,
+ php5-gd | php-gd,
- php5-gd,
+ php5-mcrypt | php-mcrypt,
- php5-mcrypt,
+ php5-xsl | php-xsl,
- php5-xsl,
  ${misc:Depends}
-Recommends: mariadb-server | mysql-server, php-apc, php5-pecl-smb, php5-tidy, mariadb-client | mysql-client | postgresql-client
+Recommends: mariadb-server | mysql-server, php-opcache | php-apc, php-apcu, php5-pecl-smb, php5-tidy | php-tidy,
-Suggests: egroupware-epl,
+ mariadb-client | mysql-client | postgresql-client, php5-bcmath | php-bcmath,
- php5-ldap,
+ php5-ldap | php-ldap,
- php5-mhash,
+ php5-mhash | php-mhash
- php5-auth-pam,
+Suggests: egroupware-epl
- php-log
+Provides: egroupware-epl-addressbook, egroupware-epl-pear
-Provides: egroupware-epl-addressbook, egroupware-epl-etemplate, egroupware-epl-pear
+Replaces: egroupware-core, egroupware-addressbook, egroupware-epl-addressbook,
-Replaces: egroupware-core, egroupware-addressbook, egroupware-epl-addressbook, egroupware-etemplate, egroupware-epl-etemplate,
  egroupware-syncml, egroupware-epl-syncml, egroupware-polls, egroupware-epl-polls, egroupware-phpsysinfo, egroupare-epl-phpsysinfo,
- egroupware-epl-pear, egroupware-pear, egroupware-epl-manual, egroupware-manual
+ egroupware-epl-pear, egroupware-pear, egroupware-epl-manual, egroupware-manual, egroupware-developer-tools, egroupware-epl-developer-tools,
+ egroupware-emailadmin, egroupware-epl-emailadmin, egroupware-epl-pixelegg
 Conflicts: egroupware-syncml, egroupware-epl-syncml, egroupware-polls, egroupware-epl-polls, egroupware-phpsysinfo, egroupware-epl-phpsysinfo,
- egroupware-epl-pear, egroupware-pear, egroupware-epl-manual, egroupware-manual
+ egroupware-epl-pear, egroupware-pear, egroupware-epl-manual, egroupware-manual, egroupware-epl-developer-tools,
+ egroupware-emailadmin, egroupware-epl-emailadmin, egroupware-epl-pixelegg
 Description: web-based groupware suite - core modules
  ${commondesc}
  .
@@ -79,6 +76,19 @@ Description: web-based groupware suite - core modules
  EGroupware applications are shipped separately in packages named
  "egroupware-epl-<name>".
 
+Package: egroupware-epl-compat
+Architecture: all
+Provides: egroupware-epl-etemplate
+Replaces: egroupware-etemplate, egroupware-epl-etemplate
+Conflicts: egroupware-etemplate, egroupware-epl-etemplate
+Depends: egroupware-epl-core (>= ${binary:Version}),
+ ${misc:Depends}
+Description: web-based groupware suite - old / compatibility api
+ ${commondesc}
+ .
+ This package provides compatibility to old / pre 16.1 EGroupware api.
+ So to speak the phpgwapi and etemplate directories.
+
 Package: egroupware-epl-bookmarks
 Architecture: all
 Depends: egroupware-epl-core (>= ${binary:Version}),
@@ -103,34 +113,6 @@ Description: web-based groupware suite - calendar management application
  This EGroupware application provides a powerful calendar with a meeting
  request system, alarms, iCal and e-Mail support, and ACL security.
 
-Package: egroupware-epl-developer-tools
-Architecture: all
-Depends: egroupware-epl-core (>= ${binary:Version}),
- ${misc:Depends}
-Conflicts: egroupware-developer-tools
-Replaces: egroupware-developer-tools
-Description: web-based groupware suite - developer tools
- ${commondesc}
- .
- This EGroupware application contains tools for EGroupware developers
- and translators.  The translation tools allow creating and extending
- translation files for EGroupware.  They can search the sources for new
- or added phrases and show the ones missing in a given language.
-
-Package: egroupware-epl-emailadmin
-Architecture: all
-Depends: egroupware-epl-core (>= ${binary:Version}),
- ${misc:Depends}
-Recommends: php5-bcmath
-Conflicts: egroupware-emailadmin
-Replaces: egroupware-emailadmin
-Description: web-based groupware suite - e-mail user administration application
- ${commondesc}
- .
- This EGroupware application allows the administration of e-mail user
- accounts.  It is intended to be used with the package
- egroupware-epl-mail.
-
 Package: egroupware-epl-esync
 Architecture: all
 Depends: egroupware-epl-core (>= ${binary:Version}),
@@ -144,7 +126,7 @@ Description: web-based groupware suite - esync application
 
 Package: egroupware-epl-phpfreechat
 Architecture: all
-Depends: egroupware-epl-core (>= ${binary:Version}),
+Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-compat (>= ${binary:Version}),
  ${misc:Depends}
 Replaces: egroupware-phpfreechat
 Conflicts: egroupware-phpfreechat
@@ -155,7 +137,7 @@ Description: web-based groupware suite - chat application
 
 Package: egroupware-epl-mail
 Architecture: all
-Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-emailadmin (>= ${binary:Version}),
+Depends: egroupware-epl-core (>= ${binary:Version}),
  ${misc:Depends}
 Provides: mail-reader, imap-client
 Conflicts: egroupware-felamimail, egroupware-epl-felamimail
@@ -169,7 +151,6 @@ Package: egroupware-epl-filemanager
 Architecture: all
 Depends: egroupware-epl-core (>= ${binary:Version}),
  ${misc:Depends}
-Suggests: php5-cli
 Conflicts: egroupware-filemanager
 Replaces: egroupware-filemanager
 Description: web-based groupware suite - file manager application
@@ -179,7 +160,7 @@ Description: web-based groupware suite - file manager application
  Abilities include all common file actions (upload, mkdir, rename,
  delete, copy, move), creating, and editing text files, and syncing with
  the file system.  Per file/directory comments are stored, and version
- history is tracked.  Group sharing and ACLs are fully supported.
+ history is tracked (EPL only).  Group sharing and ACLs are fully supported.
 
 Package: egroupware-epl-importexport
 Architecture: all
@@ -230,7 +211,7 @@ Description: web-based groupware suite - notifications
 
 Package: egroupware-epl-phpbrain
 Architecture: all
-Depends: egroupware-epl-core (>= ${binary:Version}),
+Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-compat (>= ${binary:Version}),
  ${misc:Depends}
 Conflicts: egroupware-phpbrain
 Replaces: egroupware-phpbrain
@@ -278,15 +259,15 @@ Description: web-based groupware suite - resource manager application
 
 Package: egroupware-epl-sambaadmin
 Architecture: all
-Depends: egroupware-epl-core (>= ${binary:Version}),
+Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-compat (>= ${binary:Version}),
- php5-ldap,
+ php5-ldap | php-ldap,
  ${misc:Depends}
 Conflicts: egroupware-sambaadmin
 Replaces: egroupware-sambaadmin
 Description: web-based groupware suite - Samba administration application
  ${commondesc}
  .
- This EGroupware application allows managing LDAP-based Samba servers.
+ This EGroupware application allows managing LDAP-based Samba3 servers.
 
 Package: egroupware-epl-sitemgr
 Architecture: all
@@ -337,7 +318,7 @@ Description: web-based groupware suite - external dependencies
 
 Package: egroupware-epl-wiki
 Architecture: all
-Depends: egroupware-epl-core (>= ${binary:Version}),
+Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-compat (>= ${binary:Version}),
  ${misc:Depends}
 Conflicts: egroupware-wiki
 Replaces: egroupware-wiki
@@ -348,12 +329,9 @@ Description: web-based groupware suite - wiki application
 
 Package: egroupware-epl-jdots
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, egroupware-epl-core (>= ${binary:Version}),
+Depends: egroupware-epl-core (>= ${binary:Version}), egroupware-epl-compat (>= ${binary:Version}),
-Description: Stylite Template set for EGroupware EPL
+ ${misc:Depends}
- ${commondesc}
+Description: Old tab-based EPL template based on idots look
-
-Package: egroupware-epl-pixelegg
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, egroupware-epl-core (>= ${binary:Version}), egroupware-epl-jdots (>= ${binary:Version})
-Description: Pixelegg Template set for EGroupware 14.1
  ${commondesc}
+ .
+ EPL 11.1 default template.

doc/rpm-build/debian.postinst

@@ -67,7 +67,6 @@ then
 				--admin_user "$admin_user" \
 				--admin_passwd "$admin_password" \
 				--lang "$lang" \
-				--db_type mysql \
 				--db_root "$db_root" \
 				--db_root_pw "$db_root_pw" 2>&1 | /usr/bin/tee -a $install_log
 		fi

doc/rpm-build/debian.rules

@@ -6,9 +6,9 @@ SHELL = /bin/sh -e
 PACKAGES := $(shell dh_listpackages)
 MODULES = $(filter-out core,$(patsubst egroupware-epl-%,%,$(filter egroupware-epl-%,$(PACKAGES))))
 COREDIR = debian/egroupware-epl-core/usr/share/egroupware
-COREDOC = debian/egroupware-epl-core/usr/share/doc/egroupware-core
+COREDOC = debian/egroupware-epl-core/usr/share/doc/egroupware-epl-core
 PACKAGEDIR = debian/egroupware-epl-$${APP}/usr/share/egroupware/$${APPDIR}
-PACKAGEDOC = debian/egroupware-epl-$${APP}/usr/share/doc/egroupware-$${APPDIR}
+PACKAGEDOC = debian/egroupware-epl-$${APP}/usr/share/doc/egroupware-epl-$${APPDIR}
 
 COPYRIGHT = -iname 'copyright*' -or -iname 'copying*' -or -iname '*license*'
 CHANGELOG = -iname 'changelog*'
@@ -37,18 +37,23 @@ install: build
 	dh_installdirs
 
 	# apply the patch
-	cat ./doc/rpm-build/class.uiasyncservice.inc.php.patch | patch -p1
+	cat ./doc/rpm-build/asyncservice.patch | patch -p1
 
 	# customize apache config
 	mkdir -p $(CURDIR)/debian/egroupware-epl-core/etc/egroupware
-	sed 's/\/usr\/share\/pear/\/usr\/share\/php:\/usr\/local\/zend\/share\/pear/' $(CURDIR)/doc/rpm-build/apache.conf > $(CURDIR)/debian/egroupware-epl-core/etc/egroupware/apache.conf
+	cp $(CURDIR)/doc/rpm-build/apache.conf $(CURDIR)/debian/egroupware-epl-core/etc/egroupware/apache.conf
 
 	# install core modules
 
-	for DIR in admin api home phpgwapi preferences etemplate addressbook setup doc; do \
+	for DIR in api admin home preferences addressbook setup doc pixelegg; do \
 	  cd $(CURDIR)/$${DIR}; \
 	  find $(FINDOPT) $(APPFILES) \
 	    -exec $(INSTALL) {} $(CURDIR)/$(COREDIR)/$${DIR}/{} \; ; \
+	  if [ -d $(CURDIR)/$${DIR}/doc ] ; then \
+	    cd $(CURDIR)/$${DIR}/doc; \
+	    find $(FINDOPT) $(DOCFILES) \
+	      -exec $(INSTALL) {} $(CURDIR)/$(COREDOC)/{} \; ;\
+	  fi ; \
 	done
 
 	# install applications
@@ -56,10 +61,26 @@ install: build
     # lv: activesync (tm) microsoft and has to be renamed
 
 	for APP in $(MODULES) ; do \
-	  APPDIR=$$(echo $${APP} | sed 's/-/_/g') ; \
+      case $${APP} in \
-      if [ "$${APP}" = "esync" ]; then \
+		"esync") \
 		  APPDIR="activesync"; \
-      fi; \
+		  ;; \
+		"compat") \
+		  APPDIR="phpgwapi"; \
+	      cd $(CURDIR)/$${APPDIR}; \
+	      find $(FINDOPT) $(APPFILES) \
+	        -exec $(INSTALL) {} $(CURDIR)/$(PACKAGEDIR)/{} \; ; \
+	      if [ -d $(CURDIR)/$${APPDIR}/doc ] ; then \
+	        cd $(CURDIR)/$${APPDIR}/doc; \
+	        find $(FINDOPT) $(DOCFILES) \
+	          -exec $(INSTALL) {} $(CURDIR)/$(PACKAGEDOC)/{} \; ;\
+	      fi ; \
+		  APPDIR="etemplate"; \
+		  ;; \
+		*) \
+		  APPDIR=$$(echo $${APP} | sed 's/-/_/g') ; \
+		  ;; \
+	  esac; \
 	  if [ -d $(CURDIR)/$${APPDIR} ] ; then \
 	    cd $(CURDIR)/$${APPDIR}; \
 	    find $(FINDOPT) $(APPFILES) \

doc/rpm-build/egroupware-epl.dsc

@@ -1,12 +1,12 @@
 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-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
+Binary: egroupware-epl, egroupware-epl-core, egroupware-epl-vendor, egroupware-epl-bookmarks, egroupware-epl-calendar, egroupware-epl-emailadmin, egroupware-epl-esync, egroupware-epl-mail, egroupware-epl-filemanager, egroupware-epl-infolog, 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-compat
 Architecture: all
-Version: 16.1.20151109
+Version: 16.1.20160525
 Maintainer: Ralf Becker <rb@stylite.de>
 Homepage: http://www.egroupware.org/
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 5), po-debconf
-Debtransform-Tar: egroupware-epl-16.1.20151109.tar.gz
+Debtransform-Tar: egroupware-epl-all-16.1.20160525.tar.bz2
-Debtransform-Files-Tar: debian.tar.gz phpfreechat_data_public.tar.gz
+Debtransform-Files-Tar: debian.tar.gz
 DEBTRANSFORM-RELEASE

doc/rpm-build/egroupware-epl.spec

@@ -83,12 +83,12 @@ Prefix: /usr/share
 
 Distribution: %{distribution}
 
-Source0: %{name}-%{version}.tar.gz
+Source0: %{name}-all-%{version}.tar.bz2
 Source2: %{name}-stylite-%{version}.tar.bz2
 Source3: %{name}-archive-%{version}.tar.bz2
 Source4: %{name}-esyncpro-%{version}.tar.bz2
-Source5: %{name}-contrib-%{version}.tar.gz
+#Source5: %{name}-contrib-%{version}.tar.gz
-Source6: phpfreechat_data_public.tar.gz
+#Source6: phpfreechat_data_public.tar.gz
 Source8: %{name}-rpmlintrc
 #Source9: %{name}-gallery-%{version}.tar.bz2
 Patch0: asyncservice.patch
@@ -522,8 +522,8 @@ echo "post_install: %{post_install}"
 %setup2 -T -D -a 2 -n %{egwdirname}
 %setup3 -T -D -a 3 -n %{egwdirname}
 %setup4 -T -D -a 4 -n %{egwdirname}
-%setup5 -T -D -a 5 -n %{egwdirname}
+#%setup5 -T -D -a 5 -n %{egwdirname}
-%setup6 -T -D -a 6 -n %{egwdirname}
+#%setup6 -T -D -a 6 -n %{egwdirname}
 #%setup9 -T -D -a 9 -n %{egwdirname}
 %patch0 -p 0
 #%patch1 -p 0