[evolvis-commits] r11804: Merging Branch_4_5 changes on trunk for debian packaging↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 18:25:27 CET 2011
Author: mirabilos
Date: 2011-02-24 18:25:27 +0100 (Thu, 24 Feb 2011)
New Revision: 11804
Added:
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/patches/
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/patches/00list
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/patches/disable-dav.dpatch
Removed:
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/README.Debian
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/copyright
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/changelog
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/control
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/dirs
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/postinst
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/prerm
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/rules
Log:
Merging Branch_4_5 changes on trunk for debian packaging
Deleted: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/README.Debian
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/README.Debian 2011-02-24 17:25:26 UTC (rev 11803)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/README.Debian 2011-02-24 17:25:27 UTC (rev 11804)
@@ -1,8 +0,0 @@
-gforge-plugin-scmsvn for Debian
--------------------------------
-
-This plugin holds the Subversion stuff. It is the second step towards
-choice of SCM systems, the first being that CVS has already been
-pluginified.
-
- -- Roland Mas <lolando at debian.org>, Sun Mar 14 15:56:15 2004
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/changelog 2011-02-24 17:25:26 UTC (rev 11803)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/changelog 2011-02-24 17:25:27 UTC (rev 11804)
@@ -1,3 +1,25 @@
+gforge-plugin-scmsvn (4.5.14-4) unstable; urgency=low
+
+ * [Roland] Depend on python-subversion rather than python2.3-subversion
+ to follow the new Python policy (closes: #383381).
+
+ -- Roland Mas <lolando at debian.org> Fri, 18 Aug 2006 19:37:51 +0200
+
+gforge-plugin-scmsvn (4.5.14-3) unstable; urgency=low
+
+ * [Roland] Made repositories actually not-accessible when the anonymous
+ SCM option is disabled (closes: #376513).
+ * [Roland] Started using dpatch. First patch: disable-dav, to switch
+ SVN over to SSH (for developers) and svnserve (for anonymous).
+
+ -- Roland Mas <lolando at debian.org> Sun, 23 Jul 2006 15:07:33 +0200
+
+gforge-plugin-scmsvn (4.5.14-2) unstable; urgency=low
+
+ * [Roland] Upload to unstable.
+
+ -- Roland Mas <lolando at debian.org> Sat, 22 Jul 2006 17:04:44 +0200
+
gforge-plugin-scmsvn (4.5.14-1) experimental; urgency=low
* [Roland] Updated for Gforge 4.5.14.
@@ -4,6 +26,36 @@
-- Roland Mas <lolando at debian.org> Tue, 6 Jun 2006 21:28:44 +0200
+gforge-plugin-scmsvn (4.5.6-1) unstable; urgency=low
+
+ * New Upstream version
+
+ -- Christian Bayle <bayle at debian.org> Sun, 29 Jan 2006 20:10:40 +0100
+
+gforge-plugin-scmsvn (4.5.3-5) stable; urgency=low
+
+ * New Upstream version, compile for sarge
+
+ -- Christian Bayle <bayle at debian.org> Tue, 6 Dec 2005 22:14:05 +0100
+
+gforge-plugin-scmsvn (4.5.3-4) stable; urgency=low
+
+ * New Upstream version, compile for sarge
+
+ -- Christian Bayle <bayle at debian.org> Wed, 16 Nov 2005 19:10:12 +0100
+
+gforge-plugin-scmsvn (4.5.3-3) stable; urgency=low
+
+ * New Upstream version, compile for sarge
+
+ -- Christian Bayle <bayle at debian.org> Sun, 13 Nov 2005 18:26:45 +0100
+
+gforge-plugin-scmsvn (4.5-3) unstable; urgency=low
+
+ * [Christian] New version in the branch
+
+ -- Christian Bayle <bayle at debian.org> Tue, 6 Sep 2005 00:57:06 +0200
+
gforge-plugin-scmsvn (4.5-1) unstable; urgency=low
* [Roland] Ported to Gforge 4.5.
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/control
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/control 2011-02-24 17:25:26 UTC (rev 11803)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/control 2011-02-24 17:25:27 UTC (rev 11804)
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Roland Mas <lolando at debian.org>
Uploaders: Christian Bayle <bayle at debian.org>
-Build-Depends: debhelper (>> 4.0.0)
+Build-Depends: debhelper (>> 4.0.0), dpatch
Standards-Version: 3.7.2
Package: gforge-plugin-scmsvn
Architecture: all
-Depends: gforge-common, gforge-db-postgresql | gforge-db, gforge-web-apache | gforge-web, subversion, subversion-tools, viewcvs, python2.3-subversion, python (>= 2.3), php4-cli
+Depends: gforge-common, gforge-db-postgresql | gforge-db, gforge-web-apache | gforge-web, subversion, subversion-tools, viewcvs, python-subversion, python (>= 2.3), php4-cli
Description: subversion plugin for GForge
This plug-in contains the Subversion subsystem of Gforge. It allows
each Gforge project to have its own Subversion repository, and gives
Deleted: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/copyright
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/copyright 2011-02-24 17:25:26 UTC (rev 11803)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/copyright 2011-02-24 17:25:27 UTC (rev 11804)
@@ -1,29 +0,0 @@
-This package was debianized by Roland Mas <lolando at debian.org> on
-Sun, 14 Mar 2004 15:52:43 +0100.
-
-It was downloaded from <http://gforge.org/>
-
-Upstream Author: Roland Mas <lolando at debian.org>, but the code is
-derived from Gforge code, which was itself a derivative of the
-Sourceforge code, which was copyright VA Linux Systems. Also, part of
-it was refined by same Roland Mas <roland at gnurandal.com> under
-contract for Gforge Group, LLC.
-
-Copyright:
-
- 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; version 2 dated June, 1991.
-
- 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., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/dirs
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/dirs 2011-02-24 17:25:26 UTC (rev 11803)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/dirs 2011-02-24 17:25:27 UTC (rev 11804)
@@ -2,7 +2,6 @@
etc
etc/gforge
etc/gforge/httpd.d
-etc/gforge/httpd.secrets.d
etc/gforge/plugins
etc/gforge/plugins/scmsvn
etc/gforge/plugins/scmsvn/viewcvs/templates
@@ -15,13 +14,15 @@
usr/lib/gforge/plugins/scmsvn
usr/lib/gforge/plugins/scmsvn/bin
usr/lib/gforge/plugins/scmsvn/cgi-bin
-usr/lib/gforge/plugins/scmsvn/common
-usr/lib/gforge/plugins/scmsvn/common/languages
+usr/lib/gforge/plugins/scmsvn/include
+usr/lib/gforge/plugins/scmsvn/include/languages
usr/lib/gforge/plugins/scmsvn/lib
usr/lib/gforge/plugins/scmsvn/cronjobs
usr/lib/gforge/cgi-bin/plugins/scmsvn
usr/share
usr/share/gforge
+usr/share/gforge/etc
+usr/share/gforge/etc/httpd.d
usr/share/gforge/www
usr/share/gforge/www/plugins
usr/share/gforge/www/plugins/scmsvn
Added: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/patches/00list
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/patches/00list (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/patches/00list 2011-02-24 17:25:27 UTC (rev 11804)
@@ -0,0 +1,2 @@
+disable-dav
+#repo-owner
Added: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/patches/disable-dav.dpatch
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/patches/disable-dav.dpatch (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/patches/disable-dav.dpatch 2011-02-24 17:25:27 UTC (rev 11804)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## disable-dav.dpatch by Roland Mas <lolando at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gforge-plugin-scmsvn~/etc/plugins/scmsvn/config.php gforge-plugin-scmsvn/etc/plugins/scmsvn/config.php
+--- gforge-plugin-scmsvn~/etc/plugins/scmsvn/config.php 2005-07-30 12:26:44.000000000 +0200
++++ gforge-plugin-scmsvn/etc/plugins/scmsvn/config.php 2006-07-23 14:33:53.000000000 +0200
+@@ -3,10 +3,10 @@
+ //$default_svn_server = $GLOBALS['sys_default_domain'] ;
+ $default_svn_server = "svn." . $GLOBALS['sys_default_domain'] ;
+ //$default_svn_server = $GLOBALS['sys_scm_host'];
+-$use_ssh = false;
+-$use_dav = true;
++$use_ssh = true;
++$use_dav = false;
+ $use_ssl = true;
+-$svn_root = 'svn';
++$svn_root = 'svnroot';
+ $enabled_by_default = 0 ;
+
+ $svn_bin = "/usr/bin/svn";
Property changes on: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/patches/disable-dav.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/postinst
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/postinst 2011-02-24 17:25:26 UTC (rev 11803)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/postinst 2011-02-24 17:25:27 UTC (rev 11804)
@@ -28,16 +28,16 @@
/usr/sbin/gforge-config
# Prepare database
- /usr/lib/gforge/plugins/scmsvn/bin/db-upgrade.pl
- /usr/lib/gforge/bin/register-plugin scmsvn "Subversion"
+ su -s /bin/sh gforge -c /usr/lib/gforge/plugins/scmsvn/bin/db-upgrade.pl
+ su -s /bin/sh gforge -c '/usr/lib/gforge/bin/register-plugin scmsvn "Subversion"'
test -f /etc/default/apache2 && . /etc/default/apache2
if [ "$NO_START" != "0" ]; then
if [ -x /usr/sbin/apache ]; then
- /usr/sbin/invoke-rc.d apache reload > /dev/null 2>&1
+ /usr/sbin/invoke-rc.d --quiet apache reload
fi
else
if [ -x /usr/sbin/apache2 ]; then
- /usr/sbin/invoke-rc.d apache2 reload > /dev/null 2>&1
+ /usr/sbin/invoke-rc.d --quiet apache2 reload
fi
fi
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/prerm
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/prerm 2011-02-24 17:25:26 UTC (rev 11803)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/prerm 2011-02-24 17:25:27 UTC (rev 11804)
@@ -25,11 +25,11 @@
test -f /etc/default/apache2 && . /etc/default/apache2
if [ "$NO_START" != "0" ]; then
if [ -x /usr/sbin/apache ]; then
- /usr/sbin/invoke-rc.d apache reload > /dev/null 2>&1
+ /usr/sbin/invoke-rc.d --quiet apache reload
fi
else
if [ -x /usr/sbin/apache2 ]; then
- /usr/sbin/invoke-rc.d apache2 reload > /dev/null 2>&1
+ /usr/sbin/invoke-rc.d --quiet apache2 reload
fi
fi
;;
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/rules
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/rules 2011-02-24 17:25:26 UTC (rev 11803)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmsvn/debian/rules 2011-02-24 17:25:27 UTC (rev 11804)
@@ -10,6 +10,9 @@
export PLUGIN=scmsvn
+PACKAGE=gforge-plugin-scmsvn
+include /usr/share/dpatch/dpatch.make
+
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -18,11 +21,11 @@
build: build-stamp
-build-stamp: configure-stamp
+build-stamp: configure-stamp patch
dh_testdir
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -37,23 +40,18 @@
dh_installdirs
cp -r bin/* $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/bin/
- #ln -sf /usr/lib/gforge/plugins/$(PLUGIN)/bin/svnsh $(DESTDIR)/bin/
- # Removed svnsh that should be scmsh in gforge-common package
- cp -r common/* $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/common/
+ cp -r include/* $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/include/
+ cp -r lib/* $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/lib/
cp -r cronjobs/* $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/cronjobs/
chmod 0755 $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/cronjobs/*
- #cp -r cgi-bin/* $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/cgi-bin/
cp cgi-bin/viewcvs.cgi $(DESTDIR)/usr/lib/gforge/bin/
chmod 0755 $(DESTDIR)/usr/lib/gforge/bin/viewcvs.cgi
- cp -r etc/* $(DESTDIR)/etc/gforge/
+ cp -r etc/httpd.d $(DESTDIR)/usr/share/gforge/etc/
+ cp -r etc/plugins $(DESTDIR)/etc/gforge/
cp -r www/* $(DESTDIR)/usr/share/gforge/www/plugins/$(PLUGIN)/
- # install -m 0644 httpd.conf $(DESTDIR)/etc/gforge/httpd.conf.d/50$(PLUGIN)
- # install -m 0600 httpd.secrets $(DESTDIR)/etc/gforge/httpd.secrets.d/50$(PLUGIN)
find $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/bin/ -type f | xargs chmod 0755
- find $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/common/ -type f | xargs chmod 0644
- # find $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/lib/ -type f | xargs chmod 0644
- # find $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/cgi-bin/ -type f | xargs chmod 0755
- # find $(DESTDIR)/etc/gforge/plugins/$(PLUGIN)/ -type f | xargs chmod 0644
+ find $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/include/ -type f | xargs chmod 0644
+ find $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/lib/ -type f | xargs chmod 0644
find $(DESTDIR)/usr/share/gforge/www/plugins/$(PLUGIN)/ -type f | xargs chmod 0644
# clean CVS/baz dir
find $(DESTDIR)/ -type d -name CVS -or -name .arch-ids | xargs rm -rf
@@ -94,4 +92,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
More information about the evolvis-commits
mailing list