[evolvis-commits] r11803: Merge Branch_4_5 changes on trunk for debian packaging↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 18:25:26 CET 2011
Author: mirabilos
Date: 2011-02-24 18:25:26 +0100 (Thu, 24 Feb 2011)
New Revision: 11803
Added:
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/patches/
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/patches/00list
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/patches/01_fix_cvsroot_lockdir.dpatch
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/changelog
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/control
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/cron.d
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/dirs
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/postinst
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/prerm
trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/rules
Log:
Merge Branch_4_5 changes on trunk for debian packaging
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/changelog 2011-02-24 17:25:24 UTC (rev 11802)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/changelog 2011-02-24 17:25:26 UTC (rev 11803)
@@ -1,3 +1,22 @@
+gforge-plugin-scmcvs (4.5.14-4) unstable; urgency=low
+
+ * [Roland] Removed cvs.$hostname virtualhosts from Apache configuration,
+ since they weren't used for anything (closes: #375345).
+
+ -- Roland Mas <lolando at debian.org> Fri, 18 Aug 2006 13:47:50 +0200
+
+gforge-plugin-scmcvs (4.5.14-3) unstable; urgency=low
+
+ * [Roland] Upload to unstable (closes: #374385).
+
+ -- Roland Mas <lolando at debian.org> Sat, 22 Jul 2006 16:59:07 +0200
+
+gforge-plugin-scmcvs (4.5.14-2) experimental; urgency=low
+
+ * [Roland] Made the cron jobs silent (closes: #374385).
+
+ -- Roland Mas <lolando at debian.org> Mon, 19 Jun 2006 16:22:09 +0200
+
gforge-plugin-scmcvs (4.5.14-1) experimental; urgency=low
* [Roland] Updated for Gforge 4.5.14.
@@ -4,6 +23,31 @@
-- Roland Mas <lolando at debian.org> Mon, 5 Jun 2006 18:20:32 +0200
+gforge-plugin-scmcvs (4.5.6-1) unstable; urgency=low
+
+ * New Upstream version
+
+ -- Christian Bayle <bayle at debian.org> Sun, 29 Jan 2006 20:09:50 +0100
+
+gforge-plugin-scmcvs (4.5.3-5) stable; urgency=low
+
+ * New Upstream version, compile for sarge
+
+ -- Christian Bayle <bayle at debian.org> Tue, 6 Dec 2005 22:13:46 +0100
+
+gforge-plugin-scmcvs (4.5.3-4) stable; urgency=low
+
+ * [olivier] Add hooks for dpatch
+ * [olivier] Corrected problem with cvsroot in cvs_update.pl
+
+ -- Christian Bayle <bayle at debian.org> Sun, 13 Nov 2005 18:26:26 +0100
+
+gforge-plugin-scmcvs (4.5-3) unstable; urgency=low
+
+ * [Christian] New version in the branch
+
+ -- Christian Bayle <bayle at debian.org> Tue, 6 Sep 2005 00:58:53 +0200
+
gforge-plugin-scmcvs (4.5-1) unstable; urgency=low
* [Roland] Remove .arch-ids directories at build time, too.
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/control
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/control 2011-02-24 17:25:24 UTC (rev 11802)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/control 2011-02-24 17:25:26 UTC (rev 11803)
@@ -3,7 +3,7 @@
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-scmcvs
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/cron.d
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/cron.d 2011-02-24 17:25:24 UTC (rev 11802)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/cron.d 2011-02-24 17:25:26 UTC (rev 11803)
@@ -3,7 +3,7 @@
#
# Tarballs
-5 2 * * * root [ -x /usr/lib/gforge/plugins/scmcvs/cronjobs/tarballs.php ] && php -d include_path=/etc/gforge:/usr/share/gforge/:/usr/share/gforge/www/include /usr/lib/gforge/plugins/scmcvs/cronjobs/tarballs.php
+5 2 * * * root [ -x /usr/lib/gforge/plugins/scmcvs/cronjobs/tarballs.php ] && php -d include_path=/etc/gforge:/usr/share/gforge/:/usr/share/gforge/www/include /usr/lib/gforge/plugins/scmcvs/cronjobs/tarballs.php > /dev/null 2>&1
# Snapshots
35 2 * * * root [ -x /usr/lib/gforge/plugins/scmcvs/bin/snapshots.sh ] && /usr/lib/gforge/plugins/scmcvs/bin/snapshots.sh generate
@@ -12,4 +12,4 @@
5 * * * * root [ -x /usr/lib/gforge/plugins/scmcvs/bin/cvs_dump.pl ] && su -s /bin/sh gforge -c /usr/lib/gforge/plugins/scmcvs/bin/cvs_dump.pl && [ -x /usr/lib/gforge/plugins/scmcvs/bin/cvs_update.pl ] && /usr/lib/gforge/plugins/scmcvs/bin/cvs_update.pl
# CVS add/commit Statistics
-45 4 * * * root [ -x /usr/lib/gforge/plugins/scmcvs/bin/stats_cvs.pl ] && /usr/lib/gforge/plugins/scmcvs/bin/stats_cvs.pl
+45 4 * * * root [ -x /usr/lib/gforge/plugins/scmcvs/bin/stats_cvs.pl ] && /usr/lib/gforge/plugins/scmcvs/bin/stats_cvs.pl > /dev/null 2>&1
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/dirs
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/dirs 2011-02-24 17:25:24 UTC (rev 11802)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/dirs 2011-02-24 17:25:26 UTC (rev 11803)
@@ -2,7 +2,6 @@
etc
etc/gforge
etc/gforge/httpd.d
-etc/gforge/httpd.secrets.d
etc/gforge/plugins
etc/gforge/plugins/scmcvs
usr
@@ -13,12 +12,14 @@
usr/lib/gforge/plugins/scmcvs
usr/lib/gforge/plugins/scmcvs/bin
usr/lib/gforge/plugins/scmcvs/cgi-bin
-usr/lib/gforge/plugins/scmcvs/common
+usr/lib/gforge/plugins/scmcvs/include
+usr/lib/gforge/plugins/scmcvs/lib
usr/lib/gforge/plugins/scmcvs/cronjobs
-usr/lib/gforge/plugins/scmcvs/lib
usr/lib/gforge/cgi-bin/plugins/scmcvs
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/scmcvs
Added: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/patches/00list
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/patches/00list (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/patches/00list 2011-02-24 17:25:26 UTC (rev 11803)
@@ -0,0 +1,2 @@
+# List of patches to apply
+#01_fix_cvsroot_lockdir.dpatch
Added: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/patches/01_fix_cvsroot_lockdir.dpatch
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/patches/01_fix_cvsroot_lockdir.dpatch (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/patches/01_fix_cvsroot_lockdir.dpatch 2011-02-24 17:25:26 UTC (rev 11803)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix_cvsroot_lockdir.dpatch by <ofourdan at gforge.aec>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Transiciel patches for Topcased/GForge
+
+ at DPATCH@
+
+diff -Naur gforge-plugin-scmcvs-4.5.3/bin/cvs_update.pl gforge-plugin-scmcvs-4.5.3-3-fix/bin/cvs_update.pl
+--- gforge-plugin-scmcvs-4.5.3/bin/cvs_update.pl 2005-11-16 11:52:32.200846424 +0100
++++ gforge-plugin-scmcvs-4.5.3-3-fix/bin/cvs_update.pl 2005-11-16 11:54:05.135718176 +0100
+@@ -37,7 +37,7 @@
+ # This 50000 is really dirty until I change this file completly
+ $cvs_gid = $group_id + $anoncvs_uid_add;
+ $cvs_dir = "$cvs_root/$group_name";
+-
++print "cvs_root=$cvs_root, cvs_dir=$cvs_dir\n";
+ $userlist =~ tr/A-Z/a-z/;
+
+ #$group_exists = (-d $grpdir_prefix/$group_name);
+@@ -121,7 +121,7 @@
+ if($verbose) { print("Enable pserver for $group_name:\t$userlist in $cvs_dir/CVSROOT/writers \n"); }
+ open (CONFIG,">$cvs_dir/CVSROOT/config");
+ print CONFIG "SystemAuth=yes\n";
+- print CONFIG "LockDir=/cvsroot/cvs-locks/$group_name\n";
++ print CONFIG "LockDir=$cvs_root/cvs-locks/$group_name\n";
+ close CONFIG;
+ } else {
+ # turn off pserver writers
+@@ -132,7 +132,7 @@
+ if($verbose) { print("Disable pserver for $group_name\n"); }
+ open (CONFIG,">$cvs_dir/CVSROOT/config");
+ print CONFIG "SystemAuth=no\n";
+- print CONFIG "LockDir=/cvsroot/cvs-locks/$group_name\n";
++ print CONFIG "LockDir=$cvs_root/cvs-locks/$group_name\n";
+ close CONFIG;
+ }
+
Property changes on: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/patches/01_fix_cvsroot_lockdir.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/postinst
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/postinst 2011-02-24 17:25:24 UTC (rev 11802)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/postinst 2011-02-24 17:25:26 UTC (rev 11803)
@@ -28,16 +28,16 @@
/usr/sbin/gforge-config
# Prepare database
- /usr/lib/gforge/plugins/scmcvs/bin/db-upgrade.pl
- /usr/lib/gforge/bin/register-plugin scmcvs "CVS"
+ su -s /bin/sh gforge -c /usr/lib/gforge/plugins/scmcvs/bin/db-upgrade.pl
+ su -s /bin/sh gforge -c '/usr/lib/gforge/bin/register-plugin scmcvs "CVS"'
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
# Setup our CVS
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/prerm
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/prerm 2011-02-24 17:25:24 UTC (rev 11802)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/prerm 2011-02-24 17:25:26 UTC (rev 11803)
@@ -24,11 +24,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
/usr/lib/gforge/plugins/scmcvs/bin/db-delete.pl
Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/rules
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/rules 2011-02-24 17:25:24 UTC (rev 11802)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/debian/rules 2011-02-24 17:25:26 UTC (rev 11803)
@@ -9,6 +9,7 @@
export DH_COMPAT=4
export PLUGIN=scmcvs
+include /usr/share/dpatch/dpatch.make
configure: configure-stamp
configure-stamp:
@@ -16,13 +17,12 @@
# Add here commands to configure the package.
touch configure-stamp
-build: build-stamp
-
-build-stamp: configure-stamp
+build: configure-stamp build-stamp
+build-stamp: patch-stamp
dh_testdir
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -37,21 +37,19 @@
dh_installdirs
cp -r bin/* $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/bin/
- #ln -sf /usr/lib/gforge/plugins/$(PLUGIN)/bin/cvssh $(DESTDIR)/bin/
- 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/
- #cp -r cgi-bin/* $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/cgi-bin/
cp cgi-bin/cvsweb $(DESTDIR)/usr/lib/gforge/bin/
chmod 0755 $(DESTDIR)/usr/lib/gforge/bin/cvsweb
- cp -r etc/* $(DESTDIR)/etc/gforge/
+ cp -r etc/httpd.d $(DESTDIR)/usr/share/gforge/etc/
+ rm $(DESTDIR)/usr/share/gforge/etc/httpd.d/30virtualcvs
+ rm $(DESTDIR)/usr/share/gforge/etc/httpd.d/31virtualcvs.ssl
+ 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
More information about the evolvis-commits
mailing list