[pkg-boinc-commits] r475 - in branches/experimental/boinc/debian: . patches

Frank S. Thomas fst-guest at costa.debian.org
Sat Jul 8 21:32:32 UTC 2006


Author: fst-guest
Date: 2006-07-08 21:32:30 +0000 (Sat, 08 Jul 2006)
New Revision: 475

Added:
   branches/experimental/boinc/debian/pycompat
Removed:
   branches/experimental/boinc/debian/patches/02_wx2.6-configure.ac.dpatch
   branches/experimental/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
   branches/experimental/boinc/debian/watch
Modified:
   branches/experimental/boinc/debian/boinc-server.install
   branches/experimental/boinc/debian/changelog
   branches/experimental/boinc/debian/control
   branches/experimental/boinc/debian/patches/00list
   branches/experimental/boinc/debian/patches/07_use-sensible-browser.dpatch
   branches/experimental/boinc/debian/rules
Log:
Partial merge with current trunk and updated to the new Python policy.


Modified: branches/experimental/boinc/debian/boinc-server.install
===================================================================
--- branches/experimental/boinc/debian/boinc-server.install	2006-07-02 22:37:00 UTC (rev 474)
+++ branches/experimental/boinc/debian/boinc-server.install	2006-07-08 21:32:30 UTC (rev 475)
@@ -14,8 +14,8 @@
 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
+py/Boinc/*.py                       usr/share/python-support/python-boinc
+debian/extra/boinc_path_config.py   usr/share/python-support/python-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

Modified: branches/experimental/boinc/debian/changelog
===================================================================
--- branches/experimental/boinc/debian/changelog	2006-07-02 22:37:00 UTC (rev 474)
+++ branches/experimental/boinc/debian/changelog	2006-07-08 21:32:30 UTC (rev 475)
@@ -1,14 +1,59 @@
-boinc (5.4.3-1exp1) experimental; urgency=low
+boinc (5.4.10-2) UNRELEASED; urgency=low
 
+  * NOT RELEASED YET
+
   [ Frank S. Thomas ]
-  * Synchronized with pkg-boinc/trunk/boinc, revision 399.
-  * Added the update-boinc-applinks tool that creates symlinks to "anonymous"
-    BOINC applications and their app_info.xml files in a given data directory.
-    The "anonymous" applications and their app_info.xml files are provided
-    by boinc-app-* packages (e.g.: boinc-app-seti).
+  * Added conffile /etc/boinc-client/log_flags.xml which can be used to turn
+    on/off logging and debugging messages. For a detailed list of messages
+    that can be turned on/off, see http://boinc.berkeley.edu/client_msgs.php
+    Note that this file was renamed to cc_config.xml in BOINC (>= 5.5.2).
 
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Thu, 23 Mar 2006 11:10:59 +0100
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Tue, 20 Jun 2006 22:38:01 +0200
 
+boinc (5.4.10-1) unstable; urgency=low
+
+  [ Frank S. Thomas ]
+  * New upstream release.
+    - Display Account Manager names correctly in BOINC Manager. This fixes
+      Ubuntu bug #48246.
+  * debian/control: 
+    - Really bumped the Standards-Version to 3.7.2.
+  * Added the boinc_gl.h header to the boinc-dev package. This file is needed
+    to compile SETI at home's graphics component.
+  * Added a hint to use "update-alternatives --set x-www-browser [...]" to
+    manually set the x-www-browser alternative to boinc-manager's
+    README.Debian. See Ubuntu bug #48766 for more details.
+  * Use /usr/bin/python as interpreter for update-boinc-applinks instead of
+    /usr/bin/python2.4 and make boinc-client depend on "python (>= 2.3)" to
+    avoid the unnecessary strict dependency on Python 2.4.
+  * Made debian/rules compatible with sarge's version of dpkg-architecture and
+    added libcurl-ssl-dev as alternative for the libcurl3-openssl-dev build
+    dependency. These changes aid in backporting BOINC to sarge. Thanks to
+    Robert Millan for the patch. (closes: #373089)
+  * debian/boinc-client.postinst:
+    - Make sure that the group boinc exists before trying to create the user
+      boinc. Thanks to Christoph Martin for the report. (closes: #372950)
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Sat, 17 Jun 2006 21:09:15 +0200
+
+boinc (5.4.9-1) unstable; urgency=low
+
+  [ Frank S. Thomas ]
+  * New upstream release.
+    - Really fix the connection to a remote machine bug. (closes: #360143)
+    - Fix another FTBFS bug with G++ 4.1, thanks again to Martin Michlmayr.
+      (closes: #358650)
+  * Removed watch file because upstream stopped providing nightly tarballs.
+  * debian/control:
+    - Bumped Standards-Version from 3.6.2 to 3.7.2, no changes required.
+  * debian/patches/:
+    - Removed 02_wx2.6-configure.ac.dpatch and 03_wx2.6-with-unicode.dpatch,
+      both were included upstream.
+    - Updated 07_use-sensible-browser.dpatch to use sensible-browser only,
+      because upstream's attempt to start a browser fails miserably.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Sat,  6 May 2006 16:41:01 +0200
+
 boinc (5.4.3-1) unstable; urgency=low
 
   [ Frank S. Thomas ]
@@ -29,8 +74,13 @@
   * Clarified and expanded the explanation of the -no_gui_rpc option in
     boinc_client's manpage based on Steffen's suggestion. Thanks to
     David Coe for the report. (closes: #362257)
+  * Added the update-boinc-applinks tool that creates (or removes) symlinks to
+    "anonymous" BOINC applications and their app_info.xml files in a given
+    data directory. The "anonymous" applications and their app_info.xml files
+    are provided by boinc-app-* packages (e.g. boinc-app-seti). Note that
+    currently there are no boinc-app-* packages in the Debian archive.
 
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Thu, 13 Apr 2006 16:33:57 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Sun, 16 Apr 2006 00:29:41 +0200
 
 boinc (5.2.15-3) unstable; urgency=low
 

Modified: branches/experimental/boinc/debian/control
===================================================================
--- branches/experimental/boinc/debian/control	2006-07-02 22:37:00 UTC (rev 474)
+++ branches/experimental/boinc/debian/control	2006-07-08 21:32:30 UTC (rev 475)
@@ -3,13 +3,14 @@
 Priority: optional
 Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <steffen_moeller at gmx.de>, Frank S. Thomas <frank at thomas-alfeld.de>, Christoph Martin <christoph.martin at uni-mainz.de>, Greg Norris <adric at debian.org>
-Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 5), dpatch, python, libmysqlclient15-dev, zlib1g-dev, libssl-dev, libcurl3-openssl-dev (>= 7.13.2), freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.6-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), autotools-dev, docbook2x, docbook-xml, dh-buildinfo
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5.0.37.2), dpatch, python, python-support (>= 0.3), libmysqlclient15-dev, zlib1g-dev, libssl-dev, libcurl3-openssl-dev (>= 7.13.2), freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.6-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), autotools-dev, docbook2x, docbook-xml, dh-buildinfo
+XS-Python-Version: all
 
 Package: boinc-client
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, adduser, lsb-base (>= 3.0-6)
+Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3), adduser, lsb-base (>= 3.0-6)
 Suggests: boinc-manager | kboincspy
 Description: core client for the BOINC distributed computing infrastructure
  The Berkeley Open Infrastructure for Network Computing (BOINC) is a
@@ -58,7 +59,8 @@
 Package: boinc-server
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python2.3-mysqldb, mysql-server-5.0 | virtual-mysql-server, apache2 | httpd-cgi, php4 | php5, php4-cli | php5-cli, php4-mysql | php5-mysql
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-mysqldb, mysql-server-5.0 | virtual-mysql-server, apache2 | httpd-cgi, php4 | php5, php4-cli | php5-cli, php4-mysql | php5-mysql
+XB-Python-Version: ${python:Versions}
 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

Modified: branches/experimental/boinc/debian/patches/00list
===================================================================
--- branches/experimental/boinc/debian/patches/00list	2006-07-02 22:37:00 UTC (rev 474)
+++ branches/experimental/boinc/debian/patches/00list	2006-07-08 21:32:30 UTC (rev 475)
@@ -1,5 +1,3 @@
-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

Deleted: branches/experimental/boinc/debian/patches/02_wx2.6-configure.ac.dpatch
===================================================================
--- branches/experimental/boinc/debian/patches/02_wx2.6-configure.ac.dpatch	2006-07-02 22:37:00 UTC (rev 474)
+++ branches/experimental/boinc/debian/patches/02_wx2.6-configure.ac.dpatch	2006-07-08 21:32:30 UTC (rev 475)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_wx2.6-configure.ac.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.2a.orig/configure.ac	2005-10-17 22:09:53.000000000 +0200
-+++ boinc-5.2.2a/configure.ac	2005-10-19 13:54:05.000000000 +0200
-@@ -473,20 +473,10 @@
- AM_OPTIONS_WXCONFIG
- 
- dnl check for wxWidgets
--
--if test "${enable_client_release}" = yes ; then
--   echo 'Portable client-build: checking for  *static* wx-libs ...'
--    if test "${enable_debug}" = yes ; then
--        AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --unicode=no --debug=yes)
--    else
--        AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --unicode=no --debug=no)
--    fi
-+if test "${enable_debug}" = yes ; then
-+    AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=no --unicode=yes --debug=yes)
- else
--    if test "${enable_debug}" = yes ; then
--        AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --unicode=no --debug=yes)
--    else
--        AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --unicode=no --debug=no)
--    fi
-+    AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=no --unicode=yes --debug=no)
- fi
- 
- 

Deleted: branches/experimental/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
===================================================================
--- branches/experimental/boinc/debian/patches/03_wx2.6-with-unicode.dpatch	2006-07-02 22:37:00 UTC (rev 474)
+++ branches/experimental/boinc/debian/patches/03_wx2.6-with-unicode.dpatch	2006-07-08 21:32:30 UTC (rev 475)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_wx2.6-with-unicode.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 -urNad boinc-5.4.1~/clientgui/BOINCGUIApp.cpp boinc-5.4.1/clientgui/BOINCGUIApp.cpp
---- boinc-5.4.1~/clientgui/BOINCGUIApp.cpp	2006-03-29 06:12:28.000000000 +0200
-+++ boinc-5.4.1/clientgui/BOINCGUIApp.cpp	2006-04-13 08:24:54.000000000 +0200
-@@ -847,7 +847,7 @@
-             RPC_CLIENT rpc;
-             if (!rpc.init("localhost")) {
-                 m_pDocument->m_pNetworkConnection->GetLocalPassword(strPassword);
--                rpc.authorize(strPassword.c_str());
-+                rpc.authorize((const char*)strPassword.mb_str());
-                 if (wxProcess::Exists(m_lBOINCCoreProcessId)) {
-                     rpc.quit();
-                     for (iCount = 0; iCount <= 10; iCount++) {

Modified: branches/experimental/boinc/debian/patches/07_use-sensible-browser.dpatch
===================================================================
--- branches/experimental/boinc/debian/patches/07_use-sensible-browser.dpatch	2006-07-02 22:37:00 UTC (rev 474)
+++ branches/experimental/boinc/debian/patches/07_use-sensible-browser.dpatch	2006-07-08 21:32:30 UTC (rev 475)
@@ -8,13 +8,43 @@
 ## DP: we don't loose functionality here.
 
 @DPATCH@
-diff -urNad boinc-5.4.1~/clientgui/hyperlink.cpp boinc-5.4.1/clientgui/hyperlink.cpp
---- boinc-5.4.1~/clientgui/hyperlink.cpp	2006-03-09 11:21:07.000000000 +0100
-+++ boinc-5.4.1/clientgui/hyperlink.cpp	2006-04-13 08:12:19.000000000 +0200
-@@ -196,45 +196,9 @@
+diff -urNad boinc-5.4.9~/clientgui/hyperlink.cpp boinc-5.4.9/clientgui/hyperlink.cpp
+--- boinc-5.4.9~/clientgui/hyperlink.cpp	2006-03-09 11:21:07.000000000 +0100
++++ boinc-5.4.9/clientgui/hyperlink.cpp	2006-05-06 16:10:25.000000000 +0200
+@@ -166,77 +166,9 @@
+ // private functions
  
- #if defined(__WXGTK__) || defined(__WXMOTIF__)
-     if (!mime_type_found) {
+ void wxHyperLink::ExecuteLink (const wxString &strLink) {
+-    wxString cmd;
+-    wxString strMimeType = wxEmptyString;
+-    bool mime_type_found = false;
+-
+-    if      (strLink.StartsWith(wxT("http://")))
+-        strMimeType = wxT("text/html");
+-    else if (strLink.StartsWith(wxT("ftp://")))
+-        strMimeType = wxT("text/html");
+-    else if (strLink.StartsWith(wxT("mailto:")))
+-        strMimeType = wxT("message/rfc822");
+-    else
+-        return;
+-
+-    wxFileType* ft = wxTheMimeTypesManager->GetFileTypeFromMimeType(strMimeType);
+-    if (ft) {
+-        if (ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(strLink))) {
+-#ifdef __WXMAC__
+-            cmd.Replace(wxT("<"), wxEmptyString);
+-            cmd.Prepend(wxT("open ")); 
+-#else
+-            cmd.Replace(wxT("file://"), wxEmptyString);
+-#endif
+-            mime_type_found = true;
+-            ::wxExecute(cmd);
+-        }
+-        delete ft;
+-    }
+-
+-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+-    if (!mime_type_found) {
 -        cmd = ::wxGetenv(wxT("BROWSER"));
 -        if(cmd.IsEmpty()) {
 -            wxString strDialogTitle = wxEmptyString;
@@ -54,9 +84,11 @@
 -            cmd += wxT(" ") + strLink;
 -			::wxExecute(cmd,wxEXEC_ASYNC);
 -        }
-+        cmd = wxT("sensible-browser");
-+        cmd += wxT(" ") + strLink;
-+        ::wxExecute(cmd,wxEXEC_ASYNC);
-     }
- #endif
+-    }
+-#endif
++    wxString cmd = wxT("sensible-browser");
++    cmd += wxT(" ") + strLink;
++    ::wxExecute(cmd,wxEXEC_ASYNC);
  }
+ 
+ const char *BOINC_RCSID_d587835b7e="$Id: hyperlink.cpp,v 1.11 2006/03/09 10:21:07 rwalton Exp $";

Added: branches/experimental/boinc/debian/pycompat
===================================================================
--- branches/experimental/boinc/debian/pycompat	2006-07-02 22:37:00 UTC (rev 474)
+++ branches/experimental/boinc/debian/pycompat	2006-07-08 21:32:30 UTC (rev 475)
@@ -0,0 +1 @@
+2

Modified: branches/experimental/boinc/debian/rules
===================================================================
--- branches/experimental/boinc/debian/rules	2006-07-02 22:37:00 UTC (rev 474)
+++ branches/experimental/boinc/debian/rules	2006-07-08 21:32:30 UTC (rev 475)
@@ -183,10 +183,11 @@
 	    usr/share/boinc-server/sched/`basename $$i`; \
 	done;
 # 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
+	SRV_PREFIX=debian/boinc-server/usr/share/boinc-server
+	chmod +x $(SRV_PREFIX)/html/ops/db_update.php
+	chmod +x $(SRV_PREFIX)/html/ops/watchdogs.php
+	chmod +x $(SRV_PREFIX)/html/ops/wd_nresults_changing.php
+	chmod +x $(SRV_PREFIX)/tools/watch_tcp
 
 binary-arch: build install-arch
 	dh_testdir -a
@@ -202,6 +203,7 @@
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
+	dh_pysupport -a 
 	dh_python -a
 	dh_installdeb -a
 	dh_shlibdeps -a

Deleted: branches/experimental/boinc/debian/watch
===================================================================
--- branches/experimental/boinc/debian/watch	2006-07-02 22:37:00 UTC (rev 474)
+++ branches/experimental/boinc/debian/watch	2006-07-08 21:32:30 UTC (rev 475)
@@ -1,2 +0,0 @@
-version=3
-http://boinc.berkeley.edu/source/nightly/boinc-cvs-([0-9-]+)\.tar\.gz




More information about the pkg-boinc-commits mailing list