r891 - in /branches/boinc/experimental/debian: boinc-server.README.Debian boinc-server.install boinc-server.links boinc-server.postinst changelog control extra/boinc_path_config.py patches/005_sched_makefile.am.patch patches/series rules

fst at users.alioth.debian.org fst at users.alioth.debian.org
Tue Apr 15 11:00:42 UTC 2008 

Author: fst
Date: Tue Apr 15 11:00:42 2008
New Revision: 891

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=891
Log:
Removed boinc-server from the experimental branch. Any boinc-server related
code should now go into the boinc-server branch.

Removed:
    branches/boinc/experimental/debian/boinc-server.README.Debian
    branches/boinc/experimental/debian/boinc-server.install
    branches/boinc/experimental/debian/boinc-server.links
    branches/boinc/experimental/debian/boinc-server.postinst
    branches/boinc/experimental/debian/extra/boinc_path_config.py
    branches/boinc/experimental/debian/patches/005_sched_makefile.am.patch
Modified:
    branches/boinc/experimental/debian/changelog
    branches/boinc/experimental/debian/control
    branches/boinc/experimental/debian/patches/series
    branches/boinc/experimental/debian/rules

Modified: branches/boinc/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/experimental/debian/changelog?rev=891&op=diff
==============================================================================
--- branches/boinc/experimental/debian/changelog (original)
+++ branches/boinc/experimental/debian/changelog Tue Apr 15 11:00:42 2008
@@ -1,4 +1,4 @@
-boinc (6.1.14-1) UNRELEASED; urgency=low
+boinc (6.1.15-1) UNRELEASED; urgency=low
 
   [ Frank S. Thomas ]
   * New upstream release.
@@ -16,28 +16,6 @@
       build-dependency on libcurl4-openssl-dev and removed the alternative
       build-dependency on libcurl3-openssl-dev which cannot satisfy this
       requirement.
-
-  +++ Changes unsuitable for the trunk branch:
-
-  * Updates for the new Python policy:
-    - Added python-support (>= 0.4.2) to Build-Depends.
-    - Replaced dh_python with dh_pysupport in debian/rules.
-  * debian/control:
-    - Added "tcsh | c-shell" to boinc-server's Depends field since
-      tools/db_query and tools/watch_tcp use /bin/csh as interpreter.
-    - Removed all php4 packages from boinc-server's Depends because php4
-      will not be supported during lenny's life cycle.
-  * debian/boinc-server.README.Debian: Added README.Debian which is at the
-    moment only a pointer to http://wiki.debian.org/BOINC/Server.
-  * debian/boinc-server.install:
-    - Added: db/init_db, sched/db_dump_spec.xml, test/uc_result,
-      test/uc_wu_nodelete, tools/cleanlogs.sh, tools/create_work_example,
-      tools/makelog.sh, tools/project.xml and tools/run_in_ops.
-      Some of them were required by the tools/make_project script.
-    - Removed: tools/add (long deprecated upstream).
-  * debian/rules:
-    - Don't fix PHP shebangs of files in html/ops/ and removed other
-      permission fixes, because they were fixed upstream.
 
  -- Frank S. Thomas <fst at debian.org>  Mon, 07 Apr 2008 17:42:13 +0200
 

Modified: branches/boinc/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/experimental/debian/control?rev=891&op=diff
==============================================================================
--- branches/boinc/experimental/debian/control (original)
+++ branches/boinc/experimental/debian/control Tue Apr 15 11:00:42 2008
@@ -81,18 +81,3 @@
  the BOINC packages. It is provided primarily to provide a backtrace
  with names in a debugger, this makes it somewhat easier to interpret
  core dumps.
-
-Package: boinc-server
-Section: net
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-mysqldb, mysql-server-5.0 | virtual-mysql-server, apache2 | httpd-cgi, php5, php5-cli, php5-mysql, tcsh | c-shell
-Description: BOINC server applications and data files
- The Berkeley Open Infrastructure for Network Computing (BOINC) is a
- software platform for distributed computing using volunteered computer
- resources. For every scientific problem its own distinct project-server
- must be provided. The users only run a common client with project-specific
- additions (if not self-compiled or available as a Linux distribution's
- package itself) being downloaded from the server.
- .
- This package contains the daemons and tools to create and run BOINC
- projects.

Modified: branches/boinc/experimental/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/experimental/debian/patches/series?rev=891&op=diff
==============================================================================
--- branches/boinc/experimental/debian/patches/series (original)
+++ branches/boinc/experimental/debian/patches/series Tue Apr 15 11:00:42 2008
@@ -2,4 +2,3 @@
 002_remove_hardcoded_optimization.patch
 003_use_sensible-browser.patch
 004_exclude_sea.patch
-005_sched_makefile.am.patch

Modified: branches/boinc/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/experimental/debian/rules?rev=891&op=diff
==============================================================================
--- branches/boinc/experimental/debian/rules (original)
+++ branches/boinc/experimental/debian/rules Tue Apr 15 11:00:42 2008
@@ -98,7 +98,7 @@
   $(TYPE_FLAGS) \
   --prefix=/usr \
   --enable-client \
-  --enable-server \
+  --disable-server \
   --enable-unicode \
   --with-ssl \
   CFLAGS="$(CFLAGS)" \
@@ -183,8 +183,6 @@
 	
 	debconf-updatepo
 
-BOINC_SERVER_DIR=debian/boinc-server/usr/share/boinc-server
-
 install: install-arch
 install-arch: build
 	dh_testdir
@@ -216,26 +214,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/
-	
-	# Install files for the boinc-server package.
-	for i in debian/boinc-server/usr/lib/boinc-server/sched/*; do \
-	  dh_link -pboinc-server \
-	    usr/lib/boinc-server/sched/`basename $$i` \
-	    usr/share/boinc-server/sched/`basename $$i`; \
-	done;
-	
-	# Remove Python shebang from Boinc module files that are not scripts.
-	sed -i -e '1 d' \
-	  $(BOINC_SERVER_DIR)/py/Boinc/add_util.py \
-	  $(BOINC_SERVER_DIR)/py/Boinc/boincxml.py \
-	  $(BOINC_SERVER_DIR)/py/Boinc/configxml.py \
-	  $(BOINC_SERVER_DIR)/py/Boinc/projectxml.py
-	
-	sed -i -e 's/boinc_path_config/Boinc.boinc_path_config/' \
-	  $(BOINC_SERVER_DIR)/py/Boinc/database.py \
-	  $(BOINC_SERVER_DIR)/py/Boinc/setup_project.py \
-	  $(BOINC_SERVER_DIR)/tools/make_project \
-	  $(BOINC_SERVER_DIR)/tools/upgrade
 
 binary-arch: build install-arch
 	dh_testdir -a
@@ -258,7 +236,6 @@
 	  debian/boinc-client/usr/share/boinc-client/udev-cpu_share \
 	  debian/boinc-client/usr/share/bug/boinc-client/script \
 	  debian/boinc-manager/usr/share/doc/boinc-manager/examples/run-boincmgr
-	dh_pysupport -a 
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a

More information about the pkg-boinc-commits mailing list