ASSIGNED - # 8824: wrong dependency for tine20-worker
authorLars Kneschke <l.kneschke@metaways.de>
Tue, 17 Sep 2013 05:19:48 +0000 (07:19 +0200)
committerLars Kneschke <l.kneschke@metaways.de>
Tue, 17 Sep 2013 05:31:03 +0000 (07:31 +0200)
https://forge.tine20.org/mantisbt/view.php?id=8824

Fixed multiple problems building packages for Collin

Change-Id: Iad57cc405b2e9a7a089af81a4046a58a0377e218

scripts/packaging/build-tine20-packages.sh
scripts/packaging/debian/changelog
scripts/packaging/debian/control
scripts/packaging/debian/patches/config.inc.php.dist.diff
scripts/packaging/debian/rules
scripts/packaging/debian/tine20-libraries.install
scripts/packaging/debian/tine20-tinebase.install
tine20/build.xml

index 3af033f..41f1870 100755 (executable)
@@ -215,14 +215,14 @@ function createArchives()
                     (cd $TEMPDIR/tine20/library/ExtJS/src;     rm -rf $(ls | grep -v debug.js))
                     (cd $TEMPDIR/tine20/library/ExtJS;         rm -rf $(ls | grep -v adapter | grep -v ext-all-debug.js | grep -v ext-all.js | grep -v resources | grep -v src))
                     
-                    # cleanup HTMLPurifier
-                    (cd $TEMPDIR/tine20/library/HTMLPurifier;  rm -rf HTMLPurifier.*.php)
+                    ## cleanup HTMLPurifier
+                    #(cd $TEMPDIR/tine20/library/HTMLPurifier;  rm -rf HTMLPurifier.*.php)
 
                     # cleanup OpenLayers
                     (cd $TEMPDIR/tine20/library/OpenLayers;    rm -rf $(ls | grep -v img | grep -v license.txt | grep -v OpenLayers.js | grep -v theme))
 
-                    # cleanup PHPExcel
-                    (cd $TEMPDIR/tine20/library/PHPExcel/PHPExcel/Shared;  rm -rf PDF)
+                    ## cleanup PHPExcel
+                    #(cd $TEMPDIR/tine20/library/PHPExcel/PHPExcel/Shared;  rm -rf PDF)
                     
                     # cleanup qCal
                     (cd $TEMPDIR/tine20/library/qCal;  rm -rf docs tests)
@@ -234,7 +234,7 @@ function createArchives()
                     (mv $TEMPDIR/tine20/langstatistics.json $TEMPDIR/tine20/Tinebase/translations/langstatistics.json)
                     
                     echo -n "building "
-                    local FILES="Addressbook Admin Setup Tinebase Zend images library styles docs config.inc.php.dist index.php langHelper.php LICENSE PRIVACY README RELEASENOTES CREDITS setup.php tine20.php bootstrap.php worker.php"
+                    local FILES="Addressbook Admin Setup Tinebase Zend images library vendor docs fonts config.inc.php.dist index.php langHelper.php LICENSE PRIVACY README RELEASENOTES CREDITS setup.php tine20.php bootstrap.php worker.php"
                     (cd $TEMPDIR/tine20; tar cjf ../../packages/tine20/$RELEASE/tine20-${UCFILE}_$RELEASE.tar.bz2 $FILES)
                     (cd $TEMPDIR/tine20; zip -qr ../../packages/tine20/$RELEASE/tine20-${UCFILE}_$RELEASE.zip     $FILES)
                     
index ab233d4..f12366e 100644 (file)
@@ -1,3 +1,9 @@
+tine20 (2013.10.0~beta1-0) natty; urgency=low
+
+  * New upstream release "Collin" Beta 1
+
+ -- Philipp Schüle <p.schuele@metaways.de>  Thu, 17 Sep 2013 13:41:22 +0200
+
 tine20 (2013.03.7-0) natty; urgency=low
 
   * New upstream release "Kristina" Service Release 6
index 05808ab..159dffc 100644 (file)
@@ -43,7 +43,7 @@ Depends: ${misc:Depends},
  php5-mcrypt, 
  php5-gd,
  makepasswd
-Recommends: mysql-client | postgresql-client (>= 9.1), php-apc
+Recommends: mysql-client | postgresql-client (>= 9.1), php-apc | php5-apc
 Description: Tine 2.0 webserver integration package
  This package integrates Tine 2.0 with the webserver, by installing all needed
  dependencies to make Tine 2.0 available via HTTP(S).
@@ -156,9 +156,9 @@ Depends: ${tine20:Modules},
  php5-mysql | php5-mysqli | php5-pgsql,
  php5-mcrypt, 
  php5-gd,
- php-apc,
  php5-cli,
  php5-redis (>= 2.2.2)
+Recommends: php-apc | php5-apc
 Description: webbased groupware and crm - asynchronous worker
  This package contains the asynchronous worker of Tine 2.0. Install this package
  if you have a high number of users.
index 119429d..089b706 100644 (file)
@@ -1,8 +1,8 @@
 --- a/config.inc.php.dist
 +++ b/config.inc.php.dist
-@@ -7,32 +7,29 @@
- // minimal configuration
- return array(
+@@ -9,32 +9,29 @@
+     // set 'count' equal zero to disable captcha, or set to number of invalid logins before request captcha.
+     'captcha' => array('count'=>0), 
      'database' => array(
 -        'host'          => 'ENTER DATABASE HOSTNAME',
 -        'dbname'          => 'ENTER DATABASE NAME',
index c3589bd..f05cd95 100755 (executable)
@@ -43,6 +43,7 @@ override_dh_installdeb:
        
        # generate list of available subpackages
        (echo -n "tine20:Modules="; for x in $(MODULES); do echo -n "tine20-$$x (= \$${binary:Version}),"; done; echo "") >> debian/tine20-webstack.substvars
+       (echo -n "tine20:Modules="; for x in $(MODULES); do echo -n "tine20-$$x (= \$${binary:Version}),"; done; echo "") >> debian/tine20-worker.substvars
 
 # overwrite dh_fixperms to execute an additional shell script
 override_dh_fixperms:
index 18ab972..9d17d7e 100644 (file)
@@ -1 +1,3 @@
 library                  /usr/share/tine20
+vendor                   /usr/share/tine20
+
index a801282..479c694 100644 (file)
@@ -8,9 +8,9 @@ LICENSE                  /usr/share/tine20
 PRIVACY                  /usr/share/tine20
 bootstrap.php            /usr/share/tine20
 images                   /usr/share/tine20
+fonts                    /usr/share/tine20
 index.php                /usr/share/tine20
 langHelper.php           /usr/share/tine20
 setup.php                /usr/share/tine20
-styles                   /usr/share/tine20
 tine20.php               /usr/share/tine20
 debian/etc/php5.ini      /etc/tine20
index 64b9459..ce73a0a 100644 (file)
                 <exclude name=".tx/*" />
                 <exclude name="build/*" />
                 <exclude name="docs/*" />
+                <exclude name="fonts/*" />
                 <exclude name="images/*" />
                 <exclude name="library/*" />
                 <exclude name="styles/*" />
                 <exclude name="themes/*" />
                 <exclude name="vendor/*" />
+                <exclude name="Tool/*" />
                 <exclude name="Zend/*" />
             </fileset>
         </foreach>