[boinc] 02/02: BOINC Server parts shall appear in unstable.

[Steffen Möller]

This is an automated email from the git hooks/post-receive script.

moeller pushed a commit to branch master
in repository boinc.

commit 1ac9ffdb6bc8d10c39f75e514ef727f196e2ae48
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Thu Nov 28 18:26:18 2013 +0100

    BOINC Server parts shall appear in unstable.
---
 debian/changelog                       |  4 +-
 debian/control.in                      | 82 +++++++++++++++++-----------------
 debian/patches/series                  |  2 +-
 debian/patches/server_status_php.patch |  2 +-
 4 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ff505d..4fb7e55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-boinc (7.2.33+dfsg-1exp1) experimental; urgency=low
+boinc (7.2.33+dfsg-2) UNRELEASED; urgency=low
 
-  * Upload to experimental.
+  * Moved BOINC server work from experimental into unstable.
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 25 Nov 2013 18:03:56 +0100
 
diff --git a/debian/control.in b/debian/control.in
index 5d686e1..930d421 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -229,47 +229,47 @@ Package: boinc
 @ .
 @ This package contains dynamic libraries that are needed for applications
 @ which utilizes the BOINC infrastructure and the boinc-client itself.
-%
-%Package: boinc-server-maker
-%Architecture: any
-%Provides: boinc-server
-%Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ${perl:Depends},
-% python, python-mysqldb,
-% mysql-server-5.5 | virtual-mysql-server, apache2 | httpd-cgi,
-% php5, php5-cli, php5-mysql,
-% tcsh, openssl, adduser, libfcgi0ldbl
-%Recommends: libapache2-mod-php5, php5-gd, uuid-runtime, apache2-utils
-%Suggests: boinc-app-examples, boinc-cgi-stripchart
-%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.
-%
-%Package: boinc-app-examples
-%Architecture: any
-%Depends: ${shlibs:Depends}, ${misc:Depends}
-%Recommends: boinc-server-maker
-%Description: example binaries for BOINC servers
-% 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 extends the boinc-server-maker package. It features a
-% series of small applications that a newly installed environment may
-% decide to use for testing purposes. Having them separated has the neat
-% side effect that those binaries may be retrieved more easily for foreign
-% platforms to feed the local servers with.
-% .
-% The package also features the wrapper application, which is likely
+@
+ at Package: boinc-server-maker
+ at Architecture: any
+ at Provides: boinc-server
+ at Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ${perl:Depends},
+@ python, python-mysqldb,
+@ mysql-server-5.5 | virtual-mysql-server, apache2 | httpd-cgi,
+@ php5, php5-cli, php5-mysql,
+@ tcsh, openssl, adduser, libfcgi0ldbl
+ at Recommends: libapache2-mod-php5, php5-gd, uuid-runtime, apache2-utils
+ at Suggests: boinc-app-examples, boinc-cgi-stripchart
+ at 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.
+@
+ at Package: boinc-app-examples
+ at Architecture: any
+ at Depends: ${shlibs:Depends}, ${misc:Depends}
+ at Recommends: boinc-server-maker
+ at Description: example binaries for BOINC servers
+@ 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 extends the boinc-server-maker package. It features a
+@ series of small applications that a newly installed environment may
+@ decide to use for testing purposes. Having them separated has the neat
+@ side effect that those binaries may be retrieved more easily for foreign
+@ platforms to feed the local servers with.
+@ .
+@ The package also features the wrapper application, which is likely
 % to find its audience also in real projects.
 @
 @Package: boinc-dbg
diff --git a/debian/patches/series b/debian/patches/series
index 185a037..90b1342 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # patches to get Debian going
-db_interface_use.patch
 make_project_overcomes_Apache24_security.patch
 libnotify-0.7.patch
 # undisputed patches above
@@ -75,3 +74,4 @@ gui_urls_xml_added_to_Makefile.patch
 file_upload_handler_in_sched_linking.patch
 disable_silent_rules.patch
 server_status_php.patch
+#db_interface_use.patch
diff --git a/debian/patches/server_status_php.patch b/debian/patches/server_status_php.patch
index bb5004f..66837ed 100644
--- a/debian/patches/server_status_php.patch
+++ b/debian/patches/server_status_php.patch
@@ -2,7 +2,7 @@ Index: boinc/html/user/server_status.php
 ===================================================================
 --- boinc.orig/html/user/server_status.php
 +++ boinc/html/user/server_status.php
-@@ -196,7 +196,12 @@
+@@ -207,7 +207,12 @@
  }
  $uldl_pid = parse_element($config_vars,"<uldl_pid>");
  if ($uldl_pid == "") {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git