[pkg-boinc-commits] r345 - in trunk: boinc/debian
boinc/debian/extra boinc/debian/patches kboincspy-cvs/debian
Frank S. Thomas
fst-guest at costa.debian.org
Thu Jan 19 11:18:07 UTC 2006
Author: fst-guest
Date: 2006-01-19 11:18:06 +0000 (Thu, 19 Jan 2006)
New Revision: 345
Removed:
trunk/boinc/debian/boinc-server.install
trunk/boinc/debian/boinc-server.links
trunk/boinc/debian/extra/boinc_path_config.py
trunk/boinc/debian/patches/04_sched-makefile.am.dpatch
trunk/boinc/debian/patches/05_correct-php-shebang.dpatch
trunk/boinc/debian/patches/06_remove-python-shebang.dpatch
Modified:
trunk/boinc/debian/patches/00list
trunk/boinc/debian/rules
trunk/kboincspy-cvs/debian/rules
Log:
* Removed boinc-server stuff from trunk, since we have now the experimental
branch, where the boinc-server package can evolve.
Deleted: trunk/boinc/debian/boinc-server.install
===================================================================
--- trunk/boinc/debian/boinc-server.install 2006-01-18 13:35:07 UTC (rev 344)
+++ trunk/boinc/debian/boinc-server.install 2006-01-19 11:18:06 UTC (rev 345)
@@ -1,28 +0,0 @@
-debian/tmp/usr/bin/1sec usr/lib/boinc-server/bin
-debian/tmp/usr/bin/concat usr/lib/boinc-server/bin
-debian/tmp/usr/bin/upper_case usr/lib/boinc-server/bin
-debian/tmp/usr/bin/crypt_prog usr/lib/boinc-server/bin
-debian/tmp/usr/bin/create_work usr/lib/boinc-server/bin
-debian/tmp/usr/bin/dir_hier_move usr/lib/boinc-server/bin
-debian/tmp/usr/bin/dir_hier_path usr/lib/boinc-server/bin
-debian/tmp/usr/bin/sign_executable usr/lib/boinc-server/bin
-debian/tmp/usr/bin/start usr/share/boinc-server/bin
-debian/tmp/usr/lib/BOINC/sched usr/lib/boinc-server
-db/*.sql usr/share/boinc-server/db
-html/inc usr/share/boinc-server/html
-html/languages usr/share/boinc-server/html
-html/ops usr/share/boinc-server/html
-html/project.sample usr/share/boinc-server/html
-html/user usr/share/boinc-server/html
-py/Boinc/*.py usr/lib/python2.3/site-packages/Boinc
-debian/extra/boinc_path_config.py usr/lib/python2.3/site-packages/Boinc
-tools/add usr/share/boinc-server/tools
-tools/db_query usr/share/boinc-server/tools
-tools/dbcheck_files_exist usr/share/boinc-server/tools
-tools/grep_logs usr/share/boinc-server/tools
-tools/make_project usr/share/boinc-server/tools
-tools/parse_config usr/share/boinc-server/tools
-tools/update_versions usr/share/boinc-server/tools
-tools/upgrade usr/share/boinc-server/tools
-tools/watch_tcp usr/share/boinc-server/tools
-tools/xadd usr/share/boinc-server/tools
Deleted: trunk/boinc/debian/boinc-server.links
===================================================================
--- trunk/boinc/debian/boinc-server.links 2006-01-18 13:35:07 UTC (rev 344)
+++ trunk/boinc/debian/boinc-server.links 2006-01-19 11:18:06 UTC (rev 345)
@@ -1,11 +0,0 @@
-usr/lib/boinc-server/bin/1sec usr/share/boinc-server/bin/1sec
-usr/lib/boinc-server/bin/concat usr/share/boinc-server/bin/concat
-usr/lib/boinc-server/bin/create_work usr/share/boinc-server/bin/create_work
-usr/lib/boinc-server/bin/crypt_prog usr/share/boinc-server/bin/crypt_prog
-usr/lib/boinc-server/bin/dir_hier_move usr/share/boinc-server/bin/dir_hier_move
-usr/lib/boinc-server/bin/dir_hier_path usr/share/boinc-server/bin/dir_hier_path
-usr/lib/boinc-server/bin/sign_executable usr/share/boinc-server/bin/sign_executable
-usr/lib/boinc-server/bin/upper_case usr/share/boinc-server/bin/upper_case
-usr/lib/boinc-server/sched usr/share/boinc-server/sched
-usr/share/boinc-server/bin/start usr/share/boinc-server/bin/status
-usr/share/boinc-server/bin/start usr/share/boinc-server/bin/stop
Deleted: trunk/boinc/debian/extra/boinc_path_config.py
===================================================================
--- trunk/boinc/debian/extra/boinc_path_config.py 2006-01-18 13:35:07 UTC (rev 344)
+++ trunk/boinc/debian/extra/boinc_path_config.py 2006-01-19 11:18:06 UTC (rev 345)
@@ -1,6 +0,0 @@
-# Debian specific version of py/boinc_path_config.py
-
-TOP_SOURCE_DIR = '/usr/share/boinc-server/'
-TOP_BUILD_DIR = '/usr/share/boinc-server/'
-
-from Boinc import version
Modified: trunk/boinc/debian/patches/00list
===================================================================
--- trunk/boinc/debian/patches/00list 2006-01-18 13:35:07 UTC (rev 344)
+++ trunk/boinc/debian/patches/00list 2006-01-19 11:18:06 UTC (rev 345)
@@ -1,7 +1,4 @@
01_amd64-gcc4-fixes.dpatch
02_wx2.6-configure.ac.dpatch
03_wx2.6-with-unicode.dpatch
-04_sched-makefile.am.dpatch
-05_correct-php-shebang.dpatch
-06_remove-python-shebang.dpatch
07_use-sensible-browser.dpatch
Deleted: trunk/boinc/debian/patches/04_sched-makefile.am.dpatch
===================================================================
--- trunk/boinc/debian/patches/04_sched-makefile.am.dpatch 2006-01-18 13:35:07 UTC (rev 344)
+++ trunk/boinc/debian/patches/04_sched-makefile.am.dpatch 2006-01-19 11:18:06 UTC (rev 345)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_sched-makefile.am.dpatch by Frank S. Thomas <frank at thomas-alfeld.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-
---- boinc-5.2.5.orig/sched/Makefile.am 2005-09-29 13:56:28.000000000 +0200
-+++ boinc-5.2.5/sched/Makefile.am 2005-11-18 22:01:56.000000000 +0100
-@@ -2,7 +2,8 @@
-
- include $(top_srcdir)/Makefile.incl
-
--noinst_PROGRAMS = \
-+scheddir=$(libdir)/BOINC/sched
-+sched_PROGRAMS = \
- cgi \
- feeder \
- db_dump \
Deleted: trunk/boinc/debian/patches/05_correct-php-shebang.dpatch
===================================================================
--- trunk/boinc/debian/patches/05_correct-php-shebang.dpatch 2006-01-18 13:35:07 UTC (rev 344)
+++ trunk/boinc/debian/patches/05_correct-php-shebang.dpatch 2006-01-19 11:18:06 UTC (rev 345)
@@ -1,89 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_correct-php-shebang.dpatch by Frank S. Thomas <frank at thomas-alfeld.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-
-diff -Naur boinc-5.2.5.orig/html/ops/db_update.php boinc-5.2.5/html/ops/db_update.php
---- boinc-5.2.5.orig/html/ops/db_update.php 2005-09-23 01:27:08.000000000 +0200
-+++ boinc-5.2.5/html/ops/db_update.php 2005-11-19 15:55:17.000000000 +0100
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/php
-+#! /usr/bin/php
- <?php
-
- // code for one-time database updates goes here.
-diff -Naur boinc-5.2.5.orig/html/ops/make_fake_tables.php boinc-5.2.5/html/ops/make_fake_tables.php
---- boinc-5.2.5.orig/html/ops/make_fake_tables.php 2004-02-03 00:34:31.000000000 +0100
-+++ boinc-5.2.5/html/ops/make_fake_tables.php 2005-11-19 15:55:34.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/php
-+#!/usr/bin/php
- <?php
-
- define('NUM_USERS', 200);
-diff -Naur boinc-5.2.5.orig/html/ops/migrate_tables.php boinc-5.2.5/html/ops/migrate_tables.php
---- boinc-5.2.5.orig/html/ops/migrate_tables.php 2004-06-14 22:20:05.000000000 +0200
-+++ boinc-5.2.5/html/ops/migrate_tables.php 2005-11-19 15:55:45.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/php
-+#!/usr/bin/php
- <?php
-
- // TODO: Find out what to insert for team create_times, since that value
-diff -Naur boinc-5.2.5.orig/html/ops/mungetest.php boinc-5.2.5/html/ops/mungetest.php
---- boinc-5.2.5.orig/html/ops/mungetest.php 2004-02-03 00:34:31.000000000 +0100
-+++ boinc-5.2.5/html/ops/mungetest.php 2005-11-19 15:55:51.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/php
-+#!/usr/bin/php
- <?php
-
- require_once('../inc/util.inc');
-diff -Naur boinc-5.2.5.orig/html/ops/update_forum_activities.php boinc-5.2.5/html/ops/update_forum_activities.php
---- boinc-5.2.5.orig/html/ops/update_forum_activities.php 2005-04-21 00:46:46.000000000 +0200
-+++ boinc-5.2.5/html/ops/update_forum_activities.php 2005-11-19 15:56:00.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/php
-+#!/usr/bin/php
- <?php
-
- require_once("../inc/forum.inc");
-diff -Naur boinc-5.2.5.orig/html/ops/update_profile_pages.php boinc-5.2.5/html/ops/update_profile_pages.php
---- boinc-5.2.5.orig/html/ops/update_profile_pages.php 2005-10-17 21:36:42.000000000 +0200
-+++ boinc-5.2.5/html/ops/update_profile_pages.php 2005-11-19 15:56:05.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/php
-+#!/usr/bin/php
- <?php
-
- require_once("../inc/db.inc");
-diff -Naur boinc-5.2.5.orig/html/ops/update_uotd.php boinc-5.2.5/html/ops/update_uotd.php
---- boinc-5.2.5.orig/html/ops/update_uotd.php 2004-06-09 23:42:23.000000000 +0200
-+++ boinc-5.2.5/html/ops/update_uotd.php 2005-11-19 15:56:10.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/php
-+#!/usr/bin/php
-
- <?php
-
-diff -Naur boinc-5.2.5.orig/html/ops/watchdogs.php boinc-5.2.5/html/ops/watchdogs.php
---- boinc-5.2.5.orig/html/ops/watchdogs.php 2004-06-15 21:25:58.000000000 +0200
-+++ boinc-5.2.5/html/ops/watchdogs.php 2005-11-19 15:56:17.000000000 +0100
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/php
-+#! /usr/bin/php
- <?php
-
- // General-purpose watchdog script.
-diff -Naur boinc-5.2.5.orig/html/ops/wd_nresults_changing.php boinc-5.2.5/html/ops/wd_nresults_changing.php
---- boinc-5.2.5.orig/html/ops/wd_nresults_changing.php 2004-06-15 21:25:58.000000000 +0200
-+++ boinc-5.2.5/html/ops/wd_nresults_changing.php 2005-11-19 15:56:25.000000000 +0100
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/php -q
-+#! /usr/bin/php -q
- <?php
-
- // watchdog script to ensure that the number of result records
Deleted: trunk/boinc/debian/patches/06_remove-python-shebang.dpatch
===================================================================
--- trunk/boinc/debian/patches/06_remove-python-shebang.dpatch 2006-01-18 13:35:07 UTC (rev 344)
+++ trunk/boinc/debian/patches/06_remove-python-shebang.dpatch 2006-01-19 11:18:06 UTC (rev 345)
@@ -1,44 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_remove-python-shebang.dpatch by Frank S. Thomas <frank at thomas-alfeld.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-
-diff -Naur boinc-5.2.5.orig/py/Boinc/add_util.py boinc-5.2.5/py/Boinc/add_util.py
---- boinc-5.2.5.orig/py/Boinc/add_util.py 2004-12-06 23:41:14.000000000 +0100
-+++ boinc-5.2.5/py/Boinc/add_util.py 2005-11-19 17:23:58.000000000 +0100
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- # $Id: add_util.py,v 1.5 2004/12/06 22:41:14 boincadm Exp $
-
- # add_util.py - code shared between add and xadd
-diff -Naur boinc-5.2.5.orig/py/Boinc/boincxml.py boinc-5.2.5/py/Boinc/boincxml.py
---- boinc-5.2.5.orig/py/Boinc/boincxml.py 2004-06-15 09:25:18.000000000 +0200
-+++ boinc-5.2.5/py/Boinc/boincxml.py 2005-11-19 17:23:53.000000000 +0100
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- # $Id: boincxml.py,v 1.5 2004/06/15 07:25:18 quarl Exp $
-
- # boincxml.py - xml utilities for boinc
-diff -Naur boinc-5.2.5.orig/py/Boinc/configxml.py boinc-5.2.5/py/Boinc/configxml.py
---- boinc-5.2.5.orig/py/Boinc/configxml.py 2004-01-13 07:51:17.000000000 +0100
-+++ boinc-5.2.5/py/Boinc/configxml.py 2005-11-19 17:23:50.000000000 +0100
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- # $Id: configxml.py,v 1.7 2004/01/13 06:51:17 quarl Exp $
-
- # configxml.py - module to read and parse config.xml, run_state.xml
-diff -Naur boinc-5.2.5.orig/py/Boinc/projectxml.py boinc-5.2.5/py/Boinc/projectxml.py
---- boinc-5.2.5.orig/py/Boinc/projectxml.py 2004-12-06 23:41:14.000000000 +0100
-+++ boinc-5.2.5/py/Boinc/projectxml.py 2005-11-19 17:24:11.000000000 +0100
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- # $Id: projectxml.py,v 1.2 2004/12/06 22:41:14 boincadm Exp $
-
- # projectxml.py - module to read and parse project.xml
Modified: trunk/boinc/debian/rules
===================================================================
--- trunk/boinc/debian/rules 2006-01-18 13:35:07 UTC (rev 344)
+++ trunk/boinc/debian/rules 2006-01-19 11:18:06 UTC (rev 345)
@@ -37,7 +37,7 @@
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--enable-client \
- --enable-server \
+ --disable-server \
--with-ssl \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
@@ -150,15 +150,6 @@
# The en_US po file is actually a po template, thus the corresponding
# "BOINC Manager.mo" is empty and useless.
rm -rf debian/boinc-manager/usr/share/locale/en_US/
-
-# #
-# # boinc-server
-# #
-## Fix some file permissions.
-# chmod +x debian/boinc-server/usr/share/boinc-server/html/ops/db_update.php
-# chmod +x debian/boinc-server/usr/share/boinc-server/html/ops/watchdogs.php
-# chmod +x debian/boinc-server/usr/share/boinc-server/html/ops/wd_nresults_changing.php
-# chmod +x debian/boinc-server/usr/share/boinc-server/tools/watch_tcp
binary-arch: build install-arch
dh_testdir -a
Modified: trunk/kboincspy-cvs/debian/rules
===================================================================
--- trunk/kboincspy-cvs/debian/rules 2006-01-18 13:35:07 UTC (rev 344)
+++ trunk/kboincspy-cvs/debian/rules 2006-01-19 11:18:06 UTC (rev 345)
@@ -24,4 +24,4 @@
find debian/tmp/usr/lib -maxdepth 1 -type f -name *.so -exec cp {} debian/$(cdbs_curpkg)/usr/lib \;
install/kboincspy-cvs-dev::
- find debian/tmp/usr/lib -maxdepth 1 -type l -name *.so -exec cp {} debian/$(cdbs_curpkg)/usr/lib \;
+ find debian/tmp/usr/lib -maxdepth 1 -type l -name *.so -exec cp -d {} debian/$(cdbs_curpkg)/usr/lib \;
More information about the pkg-boinc-commits
mailing list