Merged recent bugfixes from 5.0

git-svn-id: svn+ssh://scm.fusionforge.org/srv/svn/fusionforge/trunk@9116 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6

Makefile.debian

@@ -251,6 +251,7 @@ $(TARBALLS)/$(ORIGFILE): $(TARBALLS)
 		grep -v rpm-specific | grep -v docs/phpdoc/docs | \
 		grep -v ^./debian/ | grep -v \\.jar$$ | \
 		grep -v \\.pdf$$ | grep -v plugins/fckeditor/www/_samples | \
+		grep -v plugins/wiki/www/lib/pear | \
 		cpio -o -H ustar | gzip > $(TARBALLS)/$(ORIGFILE)
 
 pbuilderenv: $(PBUILDERTGZ) $(PBUILDERTGZ)/base-$(DISTRIB).tgz

gforge/common/docman/engine/parser_html.php

@@ -3,6 +3,7 @@
 /**
  * FusionForge document search engine
  *
+ * Copyright 2005, Fabio Bertagnin
  * Copyright 2009-2010, Franck Villaume
  *
  * This file is part of FusionForge.

gforge/debian/changelog

@@ -1,3 +1,11 @@
+fusionforge (5.0~rc1+svn9102-1) experimental; urgency=low
+
+  * New snapshot from upstream SVN (Branch_5_0).
+  * Filtered out PEAR modules from source package to fix (hopefully) the
+    final license problems in the package.
+
+ -- Roland Mas <lolando@debian.org>  Tue, 16 Mar 2010 16:30:50 +0100
+
 fusionforge (5.0~rc1-1) experimental; urgency=low
 
   * New upstream release candidate.

gforge/debian/copyright

@@ -243,77 +243,5 @@ are under a BSD-like license:
 | OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 `----
 
-Finally, the upstream sources also contain a copy of the DB, Cache and
-File_Passwd PHP modules obtained from PEAR and subject to the PHP
-license version 2.02 (these files are not used in the Debian
-packages):
-,----
-| -------------------------------------------------------------------- 
-|                   The PHP License, version 2.02
-| Copyright (c) 1999, 2000 The PHP Group. All rights reserved.
-| -------------------------------------------------------------------- 
-| 
-| Redistribution and use in source and binary forms, with or without
-| modification, is permitted provided that the following conditions
-| are met:
-| 
-|   1. Redistributions of source code must retain the above copyright
-|      notice, this list of conditions and the following disclaimer. 
-|  
-|   2. Redistributions in binary form must reproduce the above 
-|      copyright notice, this list of conditions and the following 
-|      disclaimer in the documentation and/or other materials provided
-|      with the distribution.
-|  
-|   3. The name "PHP" must not be used to endorse or promote products 
-|      derived from this software without prior permission from the 
-|      PHP Group.  This does not apply to add-on libraries or tools
-|      that work in conjunction with PHP.  In such a case the PHP
-|      name may be used to indicate that the product supports PHP.
-|  
-|   4. The PHP Group may publish revised and/or new versions of the
-|      license from time to time. Each version will be given a
-|      distinguishing version number.
-|      Once covered code has been published under a particular version
-|      of the license, you may always continue to use it under the
-|      terms of that version. You may also choose to use such covered
-|      code under the terms of any subsequent version of the license
-|      published by the PHP Group. No one other than the PHP Group has
-|      the right to modify the terms applicable to covered code created
-|      under this License.
-| 
-|   5. Redistributions of any form whatsoever must retain the following
-|      acknowledgment:
-|      "This product includes PHP, freely available from
-|      http://www.php.net/".
-| 
-|   6. The software incorporates the Zend Engine, a product of Zend
-|      Technologies, Ltd. ("Zend"). The Zend Engine is licensed to the
-|      PHP Association (pursuant to a grant from Zend that can be
-|      found at http://www.php.net/license/ZendGrant/) for
-|      distribution to you under this license agreement, only as a
-|      part of PHP.  In the event that you separate the Zend Engine
-|      (or any portion thereof) from the rest of the software, or
-|      modify the Zend Engine, or any portion thereof, your use of the
-|      separated or modified Zend Engine software shall not be governed
-|      by this license, and instead shall be governed by the license
-|      set forth at http://www.zend.com/license/ZendLicense/. 
-| 
-| 
-| 
-| THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
-| ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-| THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
-| PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
-| DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-| INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
-| SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-| HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-| STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-| ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-| OF THE POSSIBILITY OF SUCH DAMAGE.
-`----
-
 On Debian systems, the complete text of the GNU General Public License
 can be found in the /usr/share/common-licenses directory.

gforge/packaging/install/db-postgresql

@@ -59,6 +59,7 @@ db/20090507-add_artifact_workflow.sql	usr/share/gforge/db/
 db/20090507-add_element_pos.sql		usr/share/gforge/db/
 db/20090507-add_project_query.sql	usr/share/gforge/db/
 db/20090507-browse_list.sql		usr/share/gforge/db/
+db/20100308-forum-attachment-types.sql	usr/share/gforge/db/
 #
 utils/inject-users.php usr/share/gforge/bin/
 utils/inject-groups.php usr/share/gforge/bin/