--- gollem-1.1.1+debian0.orig/debian/examples
+++ gollem-1.1.1+debian0/debian/examples
@@ -0,0 +1,3 @@
+config/
+po/
+
--- gollem-1.1.1+debian0.orig/debian/rules
+++ gollem-1.1.1+debian0/debian/rules
@@ -0,0 +1,139 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# List all Files and directories here that should not be copied to
+COPY_EXCLUDE=^(patch-stamp|build-stamp|configure-stamp|config|COPYING|debian|docs|po|README|scripts|\{arch\})$
+
+srcpkg = $(shell dpkg-parsechangelog | sed -ne 's/Source: *//p')
+srcver = $(shell dpkg-parsechangelog | sed -ne 's/Version: *\(.*:\)\?\(.*\)-.*$$/\2/p')
+
+#{{{ generic rules
+../$(srcpkg)_$(srcver).orig.tar.gz:
+	@if git rev-parse --git-dir >/dev/null 2>&1; then                 \
+	pristine-tar checkout $@;                                     \
+	fi
+
+check-tarball: ../$(srcpkg)_$(srcver).orig.tar.gz
+
+.PHONY: check-tarball
+
+#}}}
+#{{{ maintainer stuff
+
+refresh-patches: check-tarball
+	@dh_testdir
+	@echo 'refreshing debian/patches:'
+	@rm -rf '$(CURDIR)'/debian/patches
+	@mkdir -p '$(CURDIR)'/debian/patches
+	@cd '$(CURDIR)'/debian/patches && git format-patch upstream..upstream+patches
+	@echo .
+#}}}
+
+patch: patch-stamp check-tarball
+patch-stamp:
+	dh_testdir
+	set -e; test -e patch-stamp || \
+		for i in `ls -1 debian/patches/*.patch || :`; do patch -p1 <$$i > /dev/null; done
+	touch $@
+
+unpatch:
+	dh_testdir
+	set -e; ! test -e patch-stamp || \
+		for i in `ls -1r debian/patches/*.patch || :`; do patch -p1 -R <$$i > /dev/null; done
+	rm -f patch-stamp
+
+configure: configure-stamp patch
+configure-stamp: patch
+	dh_testdir
+	touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp 
+	dh_testdir
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	dh_clean build-stamp configure-stamp
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+	#### copy files ####
+	for i in $$(ls -1 | egrep -v "$(COPY_EXCLUDE)"); do \
+		echo install $$i ; \
+		cp -a $$i debian/gollem/usr/share/horde3/gollem ; \
+	done
+	#### copy configuration files ####
+	for i in config/*.dist; do \
+		NAME=etc/horde/gollem/$$(basename $$i ".dist"); \
+		cp -a $$i debian/gollem/$$NAME; \
+	done
+	cp config/conf.xml debian/gollem/etc/horde/gollem/
+	touch debian/gollem/etc/horde/gollem/conf.php
+	touch debian/gollem/etc/horde/gollem/conf.bak.php
+#	chown www-data:root debian/gollem/etc/horde/gollem/conf.php
+#	chown www-data:root debian/gollem/etc/horde/gollem/conf.php.bak
+	dh_link etc/horde/gollem usr/share/horde3/gollem/config
+	#### create htaccess  to restrict acess by web ####
+	echo "Deny from all" > debian/gollem/etc/horde/gollem/.htaccess
+	#### CREDITS file accessible to help viewer ####
+	mkdir -m 755 debian/gollem/usr/share/horde3/gollem/docs
+	cp -a docs/CREDITS debian/gollem/usr/share/horde3/gollem/docs
+	#### change made for program run with no problems ###
+	# change HORDE_BASE  in php files
+	# change /usr/local/bin/php to /usr/bin/php
+	# change GOLLEM_BASE in php files
+	for i in $$(find debian/gollem -name "*.php"); do \
+		cat $$i | \
+		sed -e "s/define('HORDE_BASE'.*;/define\('HORDE_BASE', '\/usr\/share\/horde3\'\);/" |\
+		sed -e "s/define('GOLLEM_BASE'.*;/define\('GOLLEM_BASE', '\/usr\/share\/horde3\/gollem'\);/" |\
+		sed -e "s/\/usr\/local\/bin/\/usr\/bin/" > $$i.rew; \
+		cat $$i.rew > $$i; \
+		rm -f $$i.rew; \
+	done
+	#### change permissions of scripts ####
+	for i in $$(find debian/gollem/usr/share/horde3/gollem -type f | \
+		xargs grep '^#!\/' |cut -d: -f1); do \
+		chmod u+x $$i; \
+	done
+	chmod -x debian/gollem/usr/share/horde3/gollem/locale/ca_ES/help.xml
+	#### end ####
+
+	#### Remove javascript source files
+	rm -rf debian/gollem/usr/share/horde3/gollem/js/src/
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs -XINSTALL
+	mv debian/gollem/usr/share/doc/gollem/CHANGES \
+		debian/gollem/usr/share/doc/gollem/changelog
+	dh_installexamples
+	rm -f debian/gollem/usr/share/doc/gollem/examples/config/motd.php.dist
+	# clean '.arch-ids' directories to use with tla-buildpackage
+	-find debian/gollem -depth -name ".arch-ids" -exec rm -Rf {} \;
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do by default.
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
--- gollem-1.1.1+debian0.orig/debian/links
+++ gollem-1.1.1+debian0/debian/links
@@ -0,0 +1 @@
+/usr/share/javascript/scriptaculous/prototype.js    /usr/share/horde3/gollem/js/prototype.js
--- gollem-1.1.1+debian0.orig/debian/compat
+++ gollem-1.1.1+debian0/debian/compat
@@ -0,0 +1 @@
+5
--- gollem-1.1.1+debian0.orig/debian/copyright
+++ gollem-1.1.1+debian0/debian/copyright
@@ -0,0 +1,34 @@
+This package was debianized by Roberto C. Sanchez <roberto@familiasanchez.net> on
+Wed, 24 Aug 2005 17:08:55 -0400.
+
+It was downloaded from ftp://ftp.horde.org/pub/gollem/
+
+Upstream Authors:
+        See /usr/share/doc/gollem/CREDITS
+
+Copyright Holder: 
+
+Copyright (C) 2005 The Horde Project 
+Copyright (C) 2005 Max Kalika <max@horde.org>
+Copyright (C) 2005 Michael Slusarz <slusarz@curecanti.org>
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+   02111-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- gollem-1.1.1+debian0.orig/debian/README.Debian
+++ gollem-1.1.1+debian0/debian/README.Debian
@@ -0,0 +1,157 @@
+gollem for Debian
+-----------------
+
+Note: The format for this document and the basic packaging framework was mostly
+robbed from horde3 and imp4 by Ola Lundqvist and Jose Carlos Medeiros.
+
+To configure this package use the horde3 web configuration. To let
+it write to the configuration files you have to change the owner
+of the /etc/horde/gollem dir and config files to be owned by www-data.
+
+If you do not do that you have to cut from the web configuration
+program and paste into the config file yourself.
+
+The reason why this is not the default option is that to allow writing
+to configuration files without any authentication is a big
+security hole.
+
+.....................................................................
+
+Some notes from upstream INSTALL document follow here:
+
+Prerequisites
+=============
+
+To function properly, Gollem **REQUIRES** the following:
+
+1. A working Horde installation.
+
+   Gollem runs within the `Horde Application Framework`_, a set of common tools
+   for Web applications written in PHP.  You must install Horde before
+   before installing Gollem.
+
+   .. Important:: Gollem 1.0 requires version 3.0 of the Horde Framework -
+                  earlier versions of Horde will **not** work.
+
+   .. Note:: While Gollem 1.0 will work with version 3.0 of the Horde
+             Framework, there were numerous enhancements and bugfixes to the
+             Horde VFS libraries after 3.0 was released.  Therefore, it is
+             **highly** recommended that you upgrade to the latest version of
+             the Horde Framework.
+
+   The Horde Framework can be obtained from the Horde website and FTP server,
+   at
+
+      http://www.horde.org/horde/
+
+      ftp://ftp.horde.org/pub/horde/
+
+   Many of Gollem's prerequisites are also Horde prerequisites.
+
+   .. Important:: Be sure to have completed all of the steps in the
+                  `horde/docs/INSTALL`_ file for the Horde Framework before
+                  installing Gollem.
+
+   .. _`Horde Application Framework`: http://www.horde.org/horde/
+
+
+2. The following PHP capabilities:
+
+   a. FTP support (--with-ftp) [OPTIONAL]
+
+      If using the FTP VFS driver, the FTP PHP module is **required**.
+
+   b. SQL support [OPTIONAL]
+
+      If using an SQL VFS driver, then SQL PHP support is **required**. For
+      further information on how to set up SQL support in Horde, please
+      reference the Horde installation document (`horde/docs/INSTALL`_).
+
+
+3. If using a FTP backend, you **must** have at least one FTP server.
+   If using a SQL backend, you **must** have at least one SQL server.
+
+
+Installing Gollem
+=================
+
+Gollem is written in PHP, and must be installed in a web-accessible directory.
+The precise location of this directory will differ from system to system.
+Conventionally, Gollem is installed directly underneath Horde in the web
+server's document tree.
+
+Since Gollem is written in PHP, there is no compilation necessary; simply
+expand the distribution where you want it to reside and rename the root
+directory of the distribution to whatever you wish to appear in the URL.  For
+example, with the Apache web server's default document root of
+``/usr/local/apache/htdocs``, you would type::
+
+   cd /usr/local/apache/htdocs/horde
+   tar zxvf /path/to/gollem-1.0.tar.gz
+   mv gollem-1.0 gollem
+
+and would then find Gollem at the URL::
+
+   http://your-server/horde/gollem/
+
+
+Configuring Gollem
+==================
+
+1. Configuring Horde for Gollem
+
+   a. Register the application
+
+      In ``horde/config/registry.php``, find the ``applications['gollem']``
+      stanza.  The default settings here should be okay, but you can change
+      them if desired.  If you have changed the location of Gollem relative to
+      Horde, either in the URL, in the filesystem or both, you must update the
+      ``fileroot`` and ``webroot`` settings to their correct values.
+
+2. Configuring Gollem
+
+   To configure Gollem, change to the ``config/`` directory of the installed
+   distribution, and make copies of all of the configuration ``dist`` files
+   without the ``dist`` suffix::
+
+      cd config/
+      for foo in *.dist; do cp $foo `basename $foo .dist`; done
+
+   Or on Windows::
+
+      copy *.dist *.
+
+   Documentation on the format and purpose of those files can be found in each
+   file.  You may edit these files if you wish to customize Gollem's
+   appearance and behavior.  With one exceptions (``backends.php``) the
+   defaults will be correct for most sites.
+
+   You must be sure to configure an appropriate backend in ``backends.php``.
+
+   You must login to Horde as a Horde Administrator to finish the
+   configuration of Gollem.  Use the Horde ``Administration`` menu item to get
+   to the administration page, and then click on the ``Configuration`` icon to
+   get the configuration page.  Select ``File Manager`` from the selection
+   list of applications.  Fill in or change any configuration values as
+   needed.  When done click on ``Generate File Manager Configuration`` to
+   generate Gollem configuration directory or file, it will not be able to
+   write the file.  In this case, go back to ``Configuration`` and choose one
+   of the other methods to create the configuration file
+   ``gollem/config/conf.php``.
+
+   Note for international users: Gollem uses GNU gettext to provide local
+   translations of text displayed by applications; the translations are found
+   in the po/ directory.  If a translation is not yet available for your
+   locale (and you wish to create one), see the ``horde/po/README`` file, or
+   if you're having trouble using a provided translation, please see the
+   `horde/docs/TRANSLATIONS`_ file for instructions.
+
+3. Securing Gollem
+
+   Review the guidelines for security contained in `horde/docs/SECURITY`_.
+
+4. Tuning Gollem (Performance)
+
+   See `horde/docs/PERFORMANCE`_.
+
+ -- Roberto C. Sanchez <roberto@familiasanchez.net>, Wed, 24 Aug 2005 17:08:55 -0400
--- gollem-1.1.1+debian0.orig/debian/watch
+++ gollem-1.1.1+debian0/debian/watch
@@ -0,0 +1,10 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 2 file
+version=2
+opts=dversionmangle=s/\+debian\d$// \
+  http://ftp.horde.org/pub/gollem/gollem-h3-([\d\.]*)\.tar\.gz
+
--- gollem-1.1.1+debian0.orig/debian/dirs
+++ gollem-1.1.1+debian0/debian/dirs
@@ -0,0 +1,2 @@
+usr/share/horde3/gollem
+etc/horde/gollem
--- gollem-1.1.1+debian0.orig/debian/docs
+++ gollem-1.1.1+debian0/debian/docs
@@ -0,0 +1,2 @@
+README
+docs/*
--- gollem-1.1.1+debian0.orig/debian/changelog
+++ gollem-1.1.1+debian0/debian/changelog
@@ -0,0 +1,85 @@
+gollem (1.1.1+debian0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload by the Security Team
+  * Fix CVE-2010-3447 (Closes: #598585)
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Sat, 23 Oct 2010 17:32:14 +0200
+
+gollem (1.1.1+debian0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Repack source package to remove embeds prototype.js (Closes: #555254) 
+  * Update to standards version 3.9.1, no further required changes. 
+  * Improve watch file because source package is now repacked. 
+  * touch conf.bak.php instead of conf.php.bak in debian/rules. 
+
+ -- Gregory Colpart <reg@debian.org>  Tue, 03 Aug 2010 02:38:11 +0200
+
+gollem (1.1-1) unstable; urgency=low
+
+  * New upstream release. 
+  * Add "Git patches" stuff in debian/rules (migration from dpatch). 
+  * Change Gregory Colpart's email address in debian/control file.
+  * Update to standards version 3.8.1, no further required changes.
+  * Add Vcs-* in debian/control.
+  * Add Homepage field.
+  * Bump debhelper compat level to 5. 
+  * Link some *.js files with libjs-scriptaculous package.
+
+ -- Gregory Colpart <reg@debian.org>  Sat, 02 May 2009 13:49:24 +0200
+
+gollem (1.0.3-2) unstable; urgency=low
+
+  * Adjust Maintainer: field
+
+ -- Gregory Colpart (evolix) <reg@evolix.fr>  Sat, 14 Jul 2007 13:54:22 +0200
+
+gollem (1.0.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove Roberto C. Sanchez from Uploaders
+  * Remove exec right for an help file in debian/rules
+
+ -- Gregory Colpart (evolix) <reg@evolix.fr>  Sat, 07 Apr 2007 22:18:02 +0200
+
+gollem (1.0.2-1) unstable; urgency=low
+
+  * New upstream release (closes: #357729).
+  * Switch maintainer to pkg-horde team.
+  * Updated standards version to 3.7.2.
+  * View CREDITS file online patch in debian/rules.
+  * Use 'binary-indep' target because 'Architecture: all' package.
+  * Clean arch directories in debian/rules. 
+
+ -- Gregory Colpart (evolix) <reg@evolix.fr>  Sun,  8 Oct 2006 23:54:17 +0200
+
+gollem (1.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Roberto C. Sanchez <roberto@familiasanchez.net>  Sat, 11 Mar 2006 12:18:03 -0500
+
+gollem (1.0-3) unstable; urgency=low
+
+  * Fixed FSF address in copyright file.
+
+ -- Roberto C. Sanchez <roberto@familiasanchez.net>  Tue,  6 Sep 2005 18:58:56 -0400
+
+gollem (1.0-2) unstable; urgency=medium
+
+  * Urgency is medium as this fixes a moderately annoying broken config and
+    should move to testing quickly.
+  * Fix "Use of undefined constant GOLLEM_BASE" error (thanks to George
+    Lengel for reporting it).
+  * Fix patches so that list is where it belongs and fix debian/rules so that
+    patches are actually applied.
+
+ -- Roberto C. Sanchez <roberto@familiasanchez.net>  Tue,  6 Sep 2005 16:23:41 -0400
+
+gollem (1.0-1) unstable; urgency=low
+
+  * Initial Release.
+  * Resolve ITP (closes: #324930)
+
+ -- Roberto C. Sanchez <roberto@familiasanchez.net>  Wed, 24 Aug 2005 17:49:50 -0400
+
--- gollem-1.1.1+debian0.orig/debian/control
+++ gollem-1.1.1+debian0/debian/control
@@ -0,0 +1,20 @@
+Source: gollem
+Section: web
+Priority: optional
+Maintainer: Horde Maintainers <pkg-horde-hackers@lists.alioth.debian.org>
+Uploaders: Gregory Colpart <reg@debian.org>
+Build-Depends: debhelper (>= 5)
+Vcs-Git: git://git.debian.org/pkg-horde/gollem.git
+Vcs-Browser: http://git.debian.org/?p=pkg-horde/gollem.git
+Standards-Version: 3.9.1
+Homepage: http://www.horde.org/gollem/
+
+Package: gollem
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, horde3
+Description: file manager component for horde framework
+ Gollem is the Horde web-based File Manager, providing the ability to fully
+ manage a hierarchical file system stored in a variety of backends such as
+ a SQL database, as part of a real filesystem, or on an FTP server.  It uses
+ the Horde's MIME_Viewer framework to identify file types, associate icons,
+ etc.
--- gollem-1.1.1+debian0.orig/debian/patches/0001-Adjust-require-in-prefs.patch
+++ gollem-1.1.1+debian0/debian/patches/0001-Adjust-require-in-prefs.patch
@@ -0,0 +1,26 @@
+From 43eac8b359ecb70af5fd6c37ec9f5d25241abadd Mon Sep 17 00:00:00 2001
+From: Gregory Colpart <reg@foulademer.gcolpart.com>
+Date: Sat, 2 May 2009 13:10:24 +0200
+Subject: [PATCH] Adjust require in prefs
+
+---
+ config/prefs.php.dist |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/config/prefs.php.dist b/config/prefs.php.dist
+index 1663644..416690c 100644
+--- a/config/prefs.php.dist
++++ b/config/prefs.php.dist
+@@ -6,7 +6,8 @@
+  */
+ 
+ // Make sure that constants are defined.
+-require_once dirname(__FILE__) . '/../lib/Gollem.php';
++@define('GOLLEM_BASE', dirname(__FILE__) . '/..');
++require_once GOLLEM_BASE . '/lib/Gollem.php';
+ 
+ $prefGroups['display'] = array(
+     'column' => _("User Interface"),
+-- 
+1.6.2.4
+
