gforge_*_all.deb
gforge-*_*_all.deb
fusionforge-*_*_all.deb
+.pc
src/debian/dsf-po/gl.po -text
src/debian/dsf-po/pt.po -text
src/debian/dsf-po/ru.po -text
-src/debian/patches/disable-dav.dpatch -text
-src/debian/patches/production-environment.dpatch -text
-src/debian/patches/use-jquery-from-distro.dpatch -text
-src/debian/patches/use-nusoap-from-distro.dpatch -text
-src/debian/patches/use-simplepie-from-distro.dpatch -text
-src/debian/patches/use-snoopy-from-distro.dpatch -text
+src/debian/patches/disable-dav.patch -text
+src/debian/patches/disable-tracker-reply-by-email.patch -text
+src/debian/patches/production-environment.patch -text
+src/debian/patches/series -text
+src/debian/patches/use-jquery-from-distro.patch -text
+src/debian/patches/use-nusoap-from-distro.patch -text
+src/debian/patches/use-simplepie-from-distro.patch -text
+src/debian/patches/use-snoopy-from-distro.patch -text
src/debian/po/README -text
src/debian/watch -text
src/docs/README.gettext -text
- fusionforge-5.1-1 is in sync with upstream SVN contents as of rev. 14081.
-In addition to the above, this package uses dpatch. For more
-details, install the dpatch package and consult
-/usr/share/doc/dpatch/README.source.gz.
+In addition to the above, this package uses quilt. For more details,
+install the quilt package and consult
+/usr/share/doc/quilt/README.source.
The following may provide more details on variations between the
upstream main version and Debian's packaging :
http://patch-tracker.debian.org/package/fusionforge
- -- Olivier Berger <obergix@debian.org>, Tue, 16 Aug 2011 17:14:45 +0200
+ -- Roland Mas <lolando@debian.org>, Mon, 22 Aug 2011 17:49:07 +0200
[ Roland Mas ]
* Switch dependency on PostgreSQL packages to the metapackage, as
requested by the PostgreSQL maintainer.
+ * Switch from dpatch to quilt, since the former is being deprecated by
+ its author.
- -- Roland Mas <lolando@debian.org> Mon, 22 Aug 2011 10:36:35 +0200
+ -- Roland Mas <lolando@debian.org> Mon, 22 Aug 2011 16:23:07 +0200
fusionforge (5.1-4) unstable; urgency=low
Maintainer: Roland Mas <lolando@debian.org>
Uploaders: Christian Bayle <bayle@debian.org>, Olivier Berger <obergix@debian.org>
Build-Depends-Indep: sharutils, docbook-to-man, devscripts, gettext
-Build-Depends: debhelper (>= 7), dpatch, perl, confget
+Build-Depends: debhelper (>= 7), quilt (>= 0.40), perl, confget
Standards-Version: 3.9.2
Homepage: http://fusionforge.org/
Vcs-Svn: svn://scm.fusionforge.org/scmrepos/svn/fusionforge/trunk
+++ /dev/null
-# List of patches to apply
-disable-tracker-reply-by-email
-disable-dav
-
-use-snoopy-from-distro
-use-nusoap-from-distro
-use-jquery-from-distro
-use-simplepie-from-distro
-
-production-environment
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99-unnamed.dpatch by Christian Bayle <bayle@debian.org> and/or Roland Mas <lolando@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disable-dav.dpatch by Roland Mas <lolando@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disable SVN-over-WebDAV
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' src~/plugins/scmsvn/etc/scmsvn.ini src/plugins/scmsvn/etc/scmsvn.ini
---- src~/plugins/scmsvn/etc/scmsvn.ini 2011-07-29 16:57:20.000000000 +0200
-+++ src/plugins/scmsvn/etc/scmsvn.ini 2011-08-03 14:46:57.824183223 +0200
-@@ -1,8 +1,8 @@
- [scmsvn]
-
--use_dav = yes
-+use_dav = no
- use_ssl = "$core/use_ssl"
--use_ssh = no
-+use_ssh = yes
- anonsvn_login = anonsvn
- anonsvn_password = anonsvn
- default_server = "$core/web_host"
--- /dev/null
+Author: Roland Mas <lolando@debian.org>
+Description: Disable SVN-over-WebDAV
+Index: src/plugins/scmsvn/etc/scmsvn.ini
+===================================================================
+--- src.orig/plugins/scmsvn/etc/scmsvn.ini 2011-08-03 15:14:30.181495000 +0200
++++ src/plugins/scmsvn/etc/scmsvn.ini 2011-08-22 21:08:16.804150640 +0200
+@@ -7,9 +7,9 @@
+ ; is available in installation_environment = development only.
+ plugin_status = valid
+
+-use_dav = yes
++use_dav = no
+ use_ssl = "$core/use_ssl"
+-use_ssh = no
++use_ssh = yes
+ anonsvn_login = anonsvn
+ anonsvn_password = anonsvn
+ default_server = "$core/web_host"
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disable the blurb about replying to a bug via email
-## DP: at least until this is made to work.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gforge~/common/tracker/Artifact.class.php gforge/common/tracker/Artifact.class.php
---- gforge~/common/tracker/Artifact.class.php 2010-03-17 22:26:33.000000000 +0100
-+++ gforge/common/tracker/Artifact.class.php 2010-03-21 22:15:07.000000000 +0100
-@@ -1448,10 +1448,6 @@
- "\n".util_make_url ('/tracker/?func=detail&atid='. $this->ArtifactType->getID() .
- "&aid=". $this->getID() .
- "&group_id=". $this->ArtifactType->Group->getID()) .
-- "\nOr by replying to this e-mail entering your response between the following markers: ".
-- "\n".ARTIFACT_MAIL_MARKER.
-- "\n(enter your response here, only in plain text format)".
-- "\n".ARTIFACT_MAIL_MARKER.
- "\n\n".
- $this->marker('status',$changes).
- "Status: ". $this->getStatusName() ."\n".
--- /dev/null
+Author: Roland Mas <lolando@debian.org>
+Description: Disable the blurb about replying to a bug via email
+at least until this is made to work.
+Index: src/common/tracker/Artifact.class.php
+===================================================================
+--- src.orig/common/tracker/Artifact.class.php 2011-08-22 21:07:40.557440659 +0200
++++ src/common/tracker/Artifact.class.php 2011-08-22 21:08:08.155687398 +0200
+@@ -1541,10 +1541,6 @@
+ "\n".util_make_url ('/tracker/?func=detail&atid='. $this->ArtifactType->getID() .
+ "&aid=". $this->getID() .
+ "&group_id=". $this->ArtifactType->Group->getID()) .
+- "\nOr by replying to this e-mail entering your response between the following markers: ".
+- "\n".ARTIFACT_MAIL_MARKER.
+- "\n(enter your response here, only in plain text format)".
+- "\n".ARTIFACT_MAIL_MARKER.
+ "\n\n".
+ $this->marker('status',$changes).
+ "Status: ". $this->getStatusName() ."\n".
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Default deployment is production, not development.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' src~/etc/config.ini-fhs.~1~ src/etc/config.ini-fhs.~1~
---- src~/etc/config.ini-fhs.~1~ 1970-01-01 01:00:00.000000000 +0100
-+++ src/etc/config.ini-fhs.~1~ 2011-01-14 14:29:40.000000000 +0100
-@@ -0,0 +1,7 @@
-+[core]
-+forge_name = FusionForge
-+
-+source_path = /usr/share/gforge
-+data_path = /var/lib/gforge
-+config_path = /etc/gforge
-+log_path = /var/log/gforge
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' src~/etc/config.ini.d/debug.ini src/etc/config.ini.d/debug.ini
---- src~/etc/config.ini.d/debug.ini 2011-01-14 14:28:36.000000000 +0100
-+++ src/etc/config.ini.d/debug.ini 2011-01-14 14:36:05.582901545 +0100
-@@ -1,12 +1,12 @@
- [core]
-
--; Switch to "production" to remove extra debugging
--installation_environment = development
-+; Switch to "development" or "integration" to add extra debugging
-+installation_environment = production
-
- ; fine-grained control over debugging
-
- ; enable debugging at all (overlay the page with pink box)
--sysdebug_enable = true
-+sysdebug_enable = false
-
- ; enable the PHP Error Handler (default if sysdebug_enable)
- sysdebug_phphandler = true
--- /dev/null
+Author: Roland Mas <lolando@debian.org>
+Description: Default deployment is production, not development
+Index: src/etc/config.ini.d/debug.ini
+===================================================================
+--- src.orig/etc/config.ini.d/debug.ini 2011-08-22 16:33:30.157637214 +0200
++++ src/etc/config.ini.d/debug.ini 2011-08-22 16:33:34.283860208 +0200
+@@ -1,12 +1,12 @@
+ [core]
+
+-; Switch to "production" to remove extra debugging
+-installation_environment = development
++; Switch to "development" or "integration" to add extra debugging
++installation_environment = production
+
+ ; fine-grained control over debugging
+
+ ; enable debugging at all (overlay the page with pink box)
+-sysdebug_enable = true
++sysdebug_enable = false
+
+ ; enable the PHP Error Handler (default if sysdebug_enable)
+ sysdebug_phphandler = true
--- /dev/null
+disable-tracker-reply-by-email.patch
+disable-dav.patch
+use-snoopy-from-distro.patch
+use-nusoap-from-distro.patch
+use-jquery-from-distro.patch
+use-simplepie-from-distro.patch
+production-environment.patch
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99-unnamed.dpatch by Christian Bayle <bayle@debian.org> and/or Roland Mas <lolando@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' src~/www/include/html.php src/www/include/html.php
---- src~/www/include/html.php 2011-06-22 20:31:14.000000000 +0200
-+++ src/www/include/html.php 2011-06-23 14:44:26.823525263 +0200
-@@ -360,18 +360,18 @@
- }
-
- function html_use_jquery() {
-- use_javascript('/scripts/jquery/jquery-1.4.2.min.js');
-+ use_javascript('/scripts/jquery/jquery.min.js');
- }
-
- function html_use_tooltips() {
- html_use_jquery();
-- use_javascript('/scripts/jquery-tipsy/src/javascripts/jquery.tipsy.js');
-+ use_javascript('/scripts/jquery-tipsy/jquery.tipsy.js');
- use_javascript('/js/tooltips.js');
-- use_stylesheet('/scripts/jquery-tipsy/src/stylesheets/tipsy.css');
-+ use_stylesheet('/scripts/jquery-tipsy/stylesheets/tipsy.css');
- }
-
- function html_use_storage() {
-- use_javascript('/scripts/jquery/jquery-1.4.2.min.js');
-+ html_use_jquery();
- use_javascript('/scripts/jquery-storage/jquery.Storage.js');
- }
-
--- /dev/null
+Author: Roland Mas <lolando@debian.org>
+Description: Use JQuery as provided by the libjs-jquery Debian package
+Index: src/www/include/html.php
+===================================================================
+--- src.orig/www/include/html.php 2011-07-18 13:27:58.000000000 +0200
++++ src/www/include/html.php 2011-08-22 21:10:24.521994301 +0200
+@@ -365,7 +365,7 @@
+ }
+
+ function html_use_jquery() {
+- use_javascript('/scripts/jquery/jquery-1.4.2.min.js');
++ use_javascript('/scripts/jquery/jquery.min.js');
+ }
+
+ function html_use_tooltips() {
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## use-nusoap-from-distro.dpatch by Olivier Berger <olivier.berger@it-sudparis.eu>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use the Debian nusoap from libusoap-php
-
-@DPATCH@
-
-=== modified file 'gforge/www/soap/index.php'
---- gforge/www/soap/index.php 2009-04-03 14:47:39 +0000
-+++ gforge/www/soap/index.php 2009-11-14 08:25:56 +0000
-@@ -11,7 +11,8 @@
-
- $uri = 'http://'.$sys_default_domain;
- // 1. include client and server
--require_once $gfwww.'soap/nusoap.php';
-+#require_once $gfwww.'soap/nusoap.php';
-+require_once '/usr/share/php/nusoap/nusoap.php';
- //$debug = true;
- // 2. instantiate server object
- $server = new soap_server();
-
--- /dev/null
+Author: Olivier Berger <olivier.berger@it-sudparis.eu>
+Description: Use NUSOAP as provided by the libnusoap-php Debian package
+--- src.orig/www/soap/index.php
++++ src/www/soap/index.php
+@@ -13,7 +13,8 @@
+
+ $uri = 'http://'.forge_get_config('web_host');
+ // 1. include client and server
+-require_once $gfwww.'soap/nusoap.php';
++#require_once $gfwww.'soap/nusoap.php';
++require_once '/usr/share/php/nusoap/nusoap.php';
+ //$debug = true;
+ // 2. instantiate server object
+ $server = new soap_server();
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## use-simplepie-from-distro.dpatch by Roland Mas <lolando@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' src~/common/rss/simplepie.inc src/common/rss/simplepie.inc
---- src~/common/rss/simplepie.inc 2011-05-19 14:39:45.000000000 +0200
-+++ src/common/rss/simplepie.inc 1970-01-01 01:00:00.000000000 +0100
+Author: Roland Mas <lolando@debian.org>
+Description: Use SimplePie as provided by the libphp-simplepie Debian package
+--- src.orig/common/rss/simplepie.inc
++++ /dev/null
@@ -1,13724 +0,0 @@
-<?php
-/**
-}
-
-?>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' src~/common/widget/Widget_Rss.class.php src/common/widget/Widget_Rss.class.php
---- src~/common/widget/Widget_Rss.class.php 2011-04-11 17:25:20.000000000 +0200
-+++ src/common/widget/Widget_Rss.class.php 2011-08-03 21:24:00.645883485 +0200
+--- src.orig/common/widget/Widget_Rss.class.php
++++ src/common/widget/Widget_Rss.class.php
@@ -45,7 +45,7 @@
return idn_to_unicode($param);
}
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## use-snoopy-from-distro.dpatch by Roland Mas <lolando@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use the Snoopy class as provided by the libphp-snoopy Debian package
-## DP: instead of shipping a local one.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' src~/plugins/cvstracker/bin/post.php src/plugins/cvstracker/bin/post.php
---- src~/plugins/cvstracker/bin/post.php 2010-07-16 14:09:14.000000000 +0200
-+++ src/plugins/cvstracker/bin/post.php 2010-07-16 14:15:43.000000000 +0200
-@@ -33,7 +33,7 @@
- require dirname(__FILE__).'/../../env.inc.php';
- require_once $gfcommon.'include/pre.php';
- require_once ($gfcommon.'common/include/utils.php');
--require_once ($gfplugins.'cvstracker/common/Snoopy.class.php');
-+require_once ('/usr/share/php/libphp-snoopy/Snoopy.class.php');
-
- $cvs_binary_version = get_cvs_binary_version () ;
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' src~/plugins/scmcvs/bin/aclcheck.php src/plugins/scmcvs/bin/aclcheck.php
---- src~/plugins/scmcvs/bin/aclcheck.php 2010-07-16 14:11:55.000000000 +0200
-+++ src/plugins/scmcvs/bin/aclcheck.php 2010-07-16 14:15:43.000000000 +0200
-@@ -31,7 +31,7 @@
- require_once $gfcommon. 'include/pre.php';
- require_once $gfcommon.'include/utils.php';
- require_once $gfconfig.'plugins/scmcvs/config.php';
--require_once $gfplugins.'scmcvs/common/Snoopy.class.php';
-+require_once '/usr/share/php/libphp-snoopy/Snoopy.class.php';
-
- // Input cleansing
- $env_cvsroot = (string) $_ENV['CVSROOT'];
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' src~/plugins/svntracker/bin/post.php src/plugins/svntracker/bin/post.php
---- src~/plugins/svntracker/bin/post.php 2010-07-16 14:09:14.000000000 +0200
-+++ src/plugins/svntracker/bin/post.php 2010-07-16 14:15:43.000000000 +0200
-@@ -31,7 +31,7 @@
- */
-
- require_once $gfcommon.'include/pre.php';
--require $gfplugins.'svntracker/common/Snoopy.class.php';
-+require '/usr/share/php/libphp-snoopy/Snoopy.class.php';
-
- /**
- * It returns the usage and exit program
--- /dev/null
+Author: Roland Mas <lolando@debian.org>
+Description: Use Snoopy as provided by the libphp-snoopy Debian package
+instead of shipping a local one.
+--- src.orig/plugins/cvstracker/bin/post.php
++++ src/plugins/cvstracker/bin/post.php
+@@ -32,7 +32,7 @@
+ require dirname(__FILE__).'/../../env.inc.php';
+ require_once $gfcommon.'include/pre.php';
+ require_once ($gfcommon.'common/include/utils.php');
+-require_once ($gfplugins.'cvstracker/common/Snoopy.class.php');
++require_once ('/usr/share/php/libphp-snoopy/Snoopy.class.php');
+
+ $cvs_binary_version = get_cvs_binary_version () ;
+
+--- src.orig/plugins/scmcvs/bin/aclcheck.php
++++ src/plugins/scmcvs/bin/aclcheck.php
+@@ -31,7 +31,7 @@
+ require_once $gfcommon. 'include/pre.php';
+ require_once $gfcommon.'include/utils.php';
+ require_once $gfconfig.'plugins/scmcvs/config.php';
+-require_once $gfplugins.'scmcvs/common/Snoopy.class.php';
++require_once '/usr/share/php/libphp-snoopy/Snoopy.class.php';
+
+ // Input cleansing
+ $env_cvsroot = (string) $_ENV['CVSROOT'];
+--- src.orig/plugins/svntracker/bin/post.php
++++ src/plugins/svntracker/bin/post.php
+@@ -31,7 +31,7 @@
+
+ require_once dirname(__FILE__)."/../../env.inc.php";
+ require_once $gfcommon.'include/pre.php';
+-require $gfplugins.'svntracker/common/Snoopy.class.php';
++require '/usr/share/php/libphp-snoopy/Snoopy.class.php';
+
+ /**
+ * It returns the usage and exit program
default:
@echo $(PACKAGE)
-include /usr/share/dpatch/dpatch.make
-
# The substitutions bellow can be quite tricky, so use 'debian/rules testpat' to check if it's OK
-
ENABLED_PLUGINS=$(shell sh $(CURDIR)/utils/list-enabled-plugins.sh)
PPOSTINST=$(foreach i,$(ENABLED_PLUGINS),debian/$(PACKAGE)-plugin-$i.postinst)
debian/po/%:
cat $(patsubst debian/po/%, debian/dsf-po/%, $@) | $(SED_REPLACE) > $@
-.PHONY: patch
-
-build: patch remove-binary-files debian/po/templates.pot conffiles
- dh $@
+build: remove-binary-files debian/po/templates.pot conffiles
+ dh --with quilt $@
# Build man pages from Docbook sources
cat debian/dsf-in/config.sgml | $(SED_REPLACE) > debian/$(PACKAGE)-config.sgml
# Preprocess files with DSF-Helper
perl $(CURDIR)/deb-specific/dsf-helper.pl
-
-clean: remove-binary-files unpatch
- dh $@
+clean: remove-binary-files
+ dh --with quilt $@
rm -f $(CURDIR)/debian/*.cron.d
rm -f $(CURDIR)/debian/*.dirs
install: build
- dh $@
+ dh --with quilt $@
sed \
-e 's!@PKGNAME@!${WHICH_FORGE}!g' \
binary: install
%:
- dh $@
+ dh --with quilt $@
Maintainer: Roland Mas <lolando@debian.org>
Uploaders: Christian Bayle <bayle@debian.org>, Olivier Berger <obergix@debian.org>
Build-Depends-Indep: sharutils, docbook-to-man, devscripts, gettext
-Build-Depends: debhelper (>= 7), dpatch, perl, confget
+Build-Depends: debhelper (>= 7), quilt (>= 0.40), perl, confget
Standards-Version: 3.9.2
Homepage: http://fusionforge.org/
Vcs-Svn: svn://scm.fusionforge.org/scmrepos/svn/fusionforge/trunk
}
function html_use_storage() {
- use_javascript('/scripts/jquery/jquery-1.4.2.min.js');
+ html_use_jquery();
use_javascript('/scripts/jquery-storage/jquery.Storage.js');
}
projects / fusionforge / fusionforge.git / commitdiff