r557 - in /branches/experimental/boinc/debian: ./ extra/ patches/
po/
fst-guest at users.alioth.debian.org
fst-guest at users.alioth.debian.org
Tue Dec 19 16:23:34 CET 2006
Author: fst-guest
Date: Tue Dec 19 16:23:33 2006
New Revision: 557
URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=557
Log:
* Merged with 5.4.11-4.
* Updated libcurl B-D to 7.15.5 and removed backporting compats for sarge, since sarge's libcurl version is too old for BOINC.
* Older changes I can't remember now, please have a look at the changelog. Sorry!
Added:
branches/experimental/boinc/debian/extra/run-boincmgr (with props)
branches/experimental/boinc/debian/po/fr.po
Modified:
branches/experimental/boinc/debian/boinc-client.postinst
branches/experimental/boinc/debian/boinc-client.postrm
branches/experimental/boinc/debian/boinc-client.templates
branches/experimental/boinc/debian/boinc-manager.install
branches/experimental/boinc/debian/changelog
branches/experimental/boinc/debian/control
branches/experimental/boinc/debian/extra/move-boinc-dir.sh
branches/experimental/boinc/debian/patches/00list
branches/experimental/boinc/debian/patches/07_use-sensible-browser.dpatch
branches/experimental/boinc/debian/po/templates.pot
branches/experimental/boinc/debian/rules
Modified: branches/experimental/boinc/debian/boinc-client.postinst
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-client.postinst?rev=557&op=diff
==============================================================================
--- branches/experimental/boinc/debian/boinc-client.postinst (original)
+++ branches/experimental/boinc/debian/boinc-client.postinst Tue Dec 19 16:23:33 2006
@@ -42,6 +42,15 @@
mv_conffile global_prefs_override.xml
mv_conffile gui_rpc_auth.cfg
mv_conffile remote_hosts.cfg
+
+ # Make a symlink to ca-certificates certs file. BOINC's original file
+ # is in curl/ca-bundle.crt (which is not in our tarball, because the
+ # export-boinc script removes the curl dir).
+ CA_FILE=/etc/ssl/certs/ca-certificates.crt
+ CA_LINK="$BOINC_DIR/ca-bundle.crt"
+ if [ ! -e $CA_LINK -a -f $CA_FILE ]; then
+ ln -sf $CA_FILE $CA_LINK
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: branches/experimental/boinc/debian/boinc-client.postrm
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-client.postrm?rev=557&op=diff
==============================================================================
--- branches/experimental/boinc/debian/boinc-client.postrm (original)
+++ branches/experimental/boinc/debian/boinc-client.postrm Tue Dec 19 16:23:33 2006
@@ -8,7 +8,7 @@
BOINC_DIR=/var/lib/boinc-client
-remove_boinc_dir_and_user()
+rm_boinc_dir()
{
if [ -d $BOINC_DIR ]; then
rm -r $BOINC_DIR
@@ -27,7 +27,7 @@
db_go
db_get boinc-client/remove_boinc_dir || true
if [ "$RET" = "true" ]; then
- remove_boinc_dir_and_user
+ rm_boinc_dir
fi
;;
Modified: branches/experimental/boinc/debian/boinc-client.templates
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-client.templates?rev=557&op=diff
==============================================================================
--- branches/experimental/boinc/debian/boinc-client.templates (original)
+++ branches/experimental/boinc/debian/boinc-client.templates Tue Dec 19 16:23:33 2006
@@ -1,6 +1,10 @@
Template: boinc-client/remove_boinc_dir
Type: boolean
Default: false
+# HINT: The wording of this template is similar to the wording of the
+# dbconfig-common/purge template. Please have a look at the translation for
+# the dbconfig-common/purge template first before translating this template,
+# thanks.
_Description: Do you want to remove the BOINC data directory?
The BOINC data directory /var/lib/boinc-client contains the information to
which projects the BOINC core client is attached, the work unit cache and
Modified: branches/experimental/boinc/debian/boinc-manager.install
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-manager.install?rev=557&op=diff
==============================================================================
--- branches/experimental/boinc/debian/boinc-manager.install (original)
+++ branches/experimental/boinc/debian/boinc-manager.install Tue Dec 19 16:23:33 2006
@@ -1,3 +1,4 @@
clientgui/boincmgr usr/bin
+debian/extra/run-boincmgr usr/bin
debian/icons/boincmgr-*.xpm usr/share/pixmaps
debian/boinc-manager.desktop usr/share/applications
Modified: branches/experimental/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/changelog?rev=557&op=diff
==============================================================================
--- branches/experimental/boinc/debian/changelog (original)
+++ branches/experimental/boinc/debian/changelog Tue Dec 19 16:23:33 2006
@@ -1,4 +1,4 @@
-boinc (5.6.1-1) experimental; urgency=low
+boinc (5.8.0-1) experimental; urgency=low
* NOT RELEASED YET
@@ -13,20 +13,17 @@
+++ Changes suitable for the trunk branch:
+ * debian/control:
+ - Bumped versioned Build-Depends on libcurl3-openssl-dev to >= 7.15.5
+ which is required for the bandwith-throttling feature. Also removed the
+ alternative on libcurl-ssl-dev, because this was only added to aid
+ backporting BOINC to sarge, but sarge has only libcurl3-dev/7.13.2.
+ - Added XS-Vcs-Browser field to the source stanza.
+ * debian/rules:
+ - Since backporting to sarge is not possible any more, also removed the
+ compatibility code for sarge's dpkg-architecture.
* debian/patches/:
- Updated 07_use-sensible-browser.dpatch for the new release.
- * debian/control:
- - Reordered Build-Depends: First list all packages that are needed for the
- Debian packaging, then list all packages that are needed to compile the
- upstream source.
- - Added po-debconf to Build-Depends.
- * debian/rules:
- - When using the configure option --target also append --program-prefix=""
- to avaoid that programs are prefixed with "i686-pc-linux-gnu-".
- - Install the checkin_notes file as upstream changelog.
- * Use debconf to ask whether the BOINC data directory should be removed
- while purging the boinc-client package. The wording for the template
- was taken from the dbconfig-common/purge template.
* Don't install some headers manually into the boinc-dev package because
they are now handled and installed by the upstream makefiles.
* Added debian/boinc-client.preinst which removes the obsolete conffile
@@ -34,8 +31,61 @@
* Added debian/boinc-client.NEWS which informs the user that the conffile
/etc/boinc-client/log_flags.xml is now obsolete and is superseded by the
new conffile /etc/boinc-client/cc_config.xml.
-
- -- Frank S. Thomas <frank at thomas-alfeld.de> Sat, 2 Sep 2006 15:58:04 +0200
+ * Added /usr/bin/run-boincmgr shell script to the boinc-manager package.
+ This script sources /etc/default/boinc-client and changes into $BOINC_DIR
+ before starting boincmgr so that the BOINC Manager can read the password
+ from $BOINC_DIR/gui_rpc_auth.cfg. See Ubuntu bug #48768 for more details.
+ * Added ca-certificates to boinc-client's Depends and create the
+ ca-bundle.crt symlink (which points to /etc/ssl/certs/ca-certificates) in
+ the BOINC data directory in boinc-client.postinst.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Tue, 19 Dec 2006 16:15:30 +0100
+
+boinc (5.4.11-4) unstable; urgency=low
+
+ [ Debconf translations ]
+ * Added German (de.po) by Matthias Julius <mdeb at julius-net.net>.
+ (closes: #400228)
+ * Added Czech (cs.po) by Jakub Kasparec <mr.k at centrum.cz>. (closes: #401923)
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Wed, 6 Dec 2006 23:07:26 +0100
+
+boinc (5.4.11-3) unstable; urgency=low
+
+ [ Frank S. Thomas ]
+ * clientgui/ValidateEmailAddress.cpp: Use a much simpler regex to validate
+ e-mail addresses. This also allows addresses that contain '+' in their
+ local-part. This regex is also used in BOINC's PHP function
+ is_valid_email_address() in html/inc/email.inc. (closes: #393948)
+
+ [ Debconf translations ]
+ * Added French (fr.po) by Cyril Brulebois
+ <cyril.brulebois at enst-bretagne.fr>. (closes: #393499)
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Sun, 22 Oct 2006 17:58:01 +0200
+
+boinc (5.4.11-2) unstable; urgency=low
+
+ [ Frank S. Thomas ]
+ * Use debconf to ask whether the default BOINC data directory
+ /var/lib/boinc-client should be removed while purging the boinc-client
+ package. The wording of the template was taken from the
+ dbconfig-common/purge template.
+ * debian/control:
+ - Added po-debconf to Build-Depends because debconf-updatepo is called in
+ the clean target of debian/rules.
+ - Added XS-Vcs-Svn field to the source stanza.
+ - Changed order of Build-Depends: List packages that are needed for the
+ packaging first, then list packages that are needed to compile the
+ upstream source.
+ * debian/rules:
+ - When using the --target configure option also append --program-prefix=""
+ to avoid that programs are prefixed with "i686-pc-linux-gnu-".
+ - Install the checkin_notes file as upstream changelog.
+ * debian/copyright:
+ - Added copyright note about the Debian packaging.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Fri, 6 Oct 2006 10:35:17 +0200
boinc (5.4.11-1) unstable; urgency=low
Modified: branches/experimental/boinc/debian/control
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/control?rev=557&op=diff
==============================================================================
--- branches/experimental/boinc/debian/control (original)
+++ branches/experimental/boinc/debian/control Tue Dec 19 16:23:33 2006
@@ -4,12 +4,14 @@
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>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), dpatch, python-support (>= 0.4.2), po-debconf, dh-buildinfo, docbook2x, docbook-xml, autotools-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), libmysqlclient15-dev, zlib1g-dev, libssl-dev, libcurl3-openssl-dev (>= 7.13.2) | libcurl-ssl-dev, freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.6-dev
+Build-Depends: debhelper (>= 5), dpatch, python-support (>= 0.4.2), po-debconf, dh-buildinfo, docbook2x, docbook-xml, autotools-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), libmysqlclient15-dev, zlib1g-dev, libssl-dev, libcurl3-openssl-dev (>= 7.15.5), freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.6-dev
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-boinc/trunk/boinc
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc
Package: boinc-client
Section: net
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3), adduser, lsb-base (>= 3.0-6)
+Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3), adduser, lsb-base (>= 3.0-6), ca-certificates
Suggests: boinc-app-seti, boinc-manager | kboincspy
Description: core client for the BOINC distributed computing infrastructure
The Berkeley Open Infrastructure for Network Computing (BOINC) is a
Modified: branches/experimental/boinc/debian/extra/move-boinc-dir.sh
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/extra/move-boinc-dir.sh?rev=557&op=diff
==============================================================================
--- branches/experimental/boinc/debian/extra/move-boinc-dir.sh (original)
+++ branches/experimental/boinc/debian/extra/move-boinc-dir.sh Tue Dec 19 16:23:33 2006
@@ -26,13 +26,13 @@
BOINC_DIR=/var/lib/boinc-client
CONF_DIR=/etc/boinc-client
-move_configfile_and_symlink()
+mv_conffile()
{
- if [ ! -L $BOINC_DIR/$1 -a -f $BOINC_DIR/$1 ]; then
- mv -f $BOINC_DIR/$1 $CONF_DIR/$1
+ if [ ! -L "$BOINC_DIR/$1" -a -f "$BOINC_DIR/$1" ]; then
+ mv -f "$BOINC_DIR/$1" "$CONF_DIR/$1"
fi
- ln -sf $CONF_DIR/$1 $BOINC_DIR/$1
- chown boinc:boinc $BOINC_DIR/$1 || true
+ ln -sf "$CONF_DIR/$1" "$BOINC_DIR/$1"
+ chown boinc:boinc "$BOINC_DIR/$1" || true
}
# Stop the BOINC core client.
@@ -48,10 +48,16 @@
# Move old configuration files to /etc/boinc-client/ and
# create symlinks for the BOINC core client.
-move_configfile_and_symlink global_prefs_override.xml
-move_configfile_and_symlink gui_rpc_auth.cfg
-move_configfile_and_symlink log_flags.xml
-move_configfile_and_symlink remote_hosts.cfg
+mv_conffile global_prefs_override.xml
+mv_conffile gui_rpc_auth.cfg
+mv_conffile log_flags.xml
+mv_conffile remote_hosts.cfg
+
+CA_FILE=/etc/ssl/certs/ca-certificates.crt
+CA_LINK="$BOINC_DIR/ca-bundle.crt"
+if [ ! -e $CA_LINK -a -f $CA_FILE ]; then
+ ln -sf $CA_FILE $CA_LINK
+fi
# Start the BOINC core client again.
invoke-rc.d boinc-client start
Added: branches/experimental/boinc/debian/extra/run-boincmgr
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/extra/run-boincmgr?rev=557&op=file
==============================================================================
--- branches/experimental/boinc/debian/extra/run-boincmgr (added)
+++ branches/experimental/boinc/debian/extra/run-boincmgr Tue Dec 19 16:23:33 2006
@@ -1,0 +1,14 @@
+#!/bin/sh
+
+# Source the configuration file for the boinc-client init script.
+if [ -e /etc/default/boinc-client ]; then
+ . /etc/default/boinc-client
+fi
+
+# If $BOINC_DIR is empty or if it isn't a directory, set it to the default
+# BOINC data directory.
+if [ -z "$BOINC_DIR" -o ! -d "$BOINC_DIR" ]; then
+ BOINC_DIR=/var/lib/boinc-client
+fi
+
+cd $BOINC_DIR && exec boincmgr "$@"
Propchange: branches/experimental/boinc/debian/extra/run-boincmgr
------------------------------------------------------------------------------
svn:executable = *
Modified: branches/experimental/boinc/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/00list?rev=557&op=diff
==============================================================================
--- branches/experimental/boinc/debian/patches/00list (original)
+++ branches/experimental/boinc/debian/patches/00list Tue Dec 19 16:23:33 2006
@@ -1,5 +1,6 @@
#01_amd64-disable-platform-reset.dpatch
+#03_wx2.6-with-unicode.dpatch
04_sched-makefile.am.dpatch
07_use-sensible-browser.dpatch
-08_boinc-path-config.dpatch
+#08_boinc-path-config.dpatch
10_exclude-sea.dpatch
Modified: branches/experimental/boinc/debian/patches/07_use-sensible-browser.dpatch
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/07_use-sensible-browser.dpatch?rev=557&op=diff
==============================================================================
--- branches/experimental/boinc/debian/patches/07_use-sensible-browser.dpatch (original)
+++ branches/experimental/boinc/debian/patches/07_use-sensible-browser.dpatch Tue Dec 19 16:23:33 2006
@@ -8,28 +8,15 @@
## DP: we don't loose functionality here.
@DPATCH@
-diff -urNad boinc-5.5.12~/clientgui/hyperlink.cpp boinc-5.5.12/clientgui/hyperlink.cpp
---- boinc-5.5.12~/clientgui/hyperlink.cpp 2006-07-22 02:58:19.000000000 +0200
-+++ boinc-5.5.12/clientgui/hyperlink.cpp 2006-08-12 11:36:06.000000000 +0200
-@@ -213,20 +213,7 @@
- // variable.
- // 2. Try to find something to use.
+--- boinc-5.7.4.orig/clientgui/hyperlink.cpp 2006-10-27 12:26:55.000000000 +0200
++++ boinc-5.7.4/clientgui/hyperlink.cpp 2006-11-17 15:59:10.000000000 +0100
+@@ -171,7 +171,8 @@
+ }
-- cmd = ::wxGetenv(wxT("BROWSER"));
-- if(cmd.IsEmpty()) {
-- fprintf(stderr, "User defined browser not found...\n");
-- if ( wxFile::Exists(wxT("/usr/bin/firefox"))) {
-- fprintf(stderr, "Firefox found...\n");
-- cmd = wxT("/usr/bin/firefox");
-- } else if (wxFile::Exists(wxT("/usr/bin/konqueror"))) {
-- fprintf(stderr, "Konqueror found...\n");
-- cmd = wxT("/usr/bin/konqueror");
-- } else if (wxFile::Exists(wxT("/usr/bin/mozilla"))) {
-- fprintf(stderr, "Mozilla found...\n");
-- cmd = wxT("/usr/bin/mozilla");
-- }
-- }
-+ cmd = wxT("sensible-browser");
+ void wxHyperLink::ExecuteLink (const wxString &strLink) {
+- if (!wxLaunchDefaultBrowser(strLink)) {
++ wxString cmd = wxT("sensible-browser ") + strLink;
++ if (!::wxExecute(cmd, wxEXEC_ASYNC)) {
+ wxString strDialogTitle = wxEmptyString;
+ wxString strDialogMessage = wxEmptyString;
- cmd += wxT(" ") + strLink;
- if (!::wxExecute(cmd, wxEXEC_ASYNC)) {
Added: branches/experimental/boinc/debian/po/fr.po
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/po/fr.po?rev=557&op=file
==============================================================================
--- branches/experimental/boinc/debian/po/fr.po (added)
+++ branches/experimental/boinc/debian/po/fr.po Tue Dec 19 16:23:33 2006
@@ -1,0 +1,62 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the boinc package.
+# Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: boinc_5.4.11-2\n"
+"Report-Msgid-Bugs-To: pkg-boinc-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-11-27 18:06+0100\n"
+"PO-Revision-Date: 2006-10-11 21:49+0200\n"
+"Last-Translator: Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>\n"
+"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#. HINT: The wording of this template is similar to the wording of the
+#. dbconfig-common/purge template. Please have a look at the translation for
+#. the dbconfig-common/purge template first before translating this template,
+#. thanks.
+#: ../boinc-client.templates:1001
+msgid "Do you want to remove the BOINC data directory?"
+msgstr "Faut-il supprimer le répertoire des données de BOINC ?"
+
+#. Type: boolean
+#. Description
+#. HINT: The wording of this template is similar to the wording of the
+#. dbconfig-common/purge template. Please have a look at the translation for
+#. the dbconfig-common/purge template first before translating this template,
+#. thanks.
+#: ../boinc-client.templates:1001
+msgid ""
+"The BOINC data directory /var/lib/boinc-client contains the information to "
+"which projects the BOINC core client is attached, the work unit cache and "
+"several other data. If you no longer need this data, this is your chance to "
+"remove them."
+msgstr ""
+"Le répertoire des données de BOINC (/var/lib/boinc-client) contient les "
+"informations sur les projets auxquels le client BOINC de base est attaché, "
+"le cache de l'unité de travail et de nombreuses autres informations. Si vous "
+"n'avez plus besoin de ces données, vous pouvez le supprimer."
+
+#. Type: boolean
+#. Description
+#. HINT: The wording of this template is similar to the wording of the
+#. dbconfig-common/purge template. Please have a look at the translation for
+#. the dbconfig-common/purge template first before translating this template,
+#. thanks.
+#: ../boinc-client.templates:1001
+msgid ""
+"If no longer have need of the data being stored in the BOINC data directory, "
+"you should choose this option. If you want to hold this data for another "
+"time, or if you would rather handle this process manually, you should refuse "
+"this option."
+msgstr ""
+"Choisissez cette option si vous n'avez plus besoin des informations stockées "
+"dans le répertoire des données de BOINC. Ne la choisissez pas si vous voulez "
+"conserver ces informations pour plus tard ou si vous voulez effectuer la "
+"maintenance vous-même."
Modified: branches/experimental/boinc/debian/po/templates.pot
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/po/templates.pot?rev=557&op=diff
==============================================================================
--- branches/experimental/boinc/debian/po/templates.pot (original)
+++ branches/experimental/boinc/debian/po/templates.pot Tue Dec 19 16:23:33 2006
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: pkg-boinc-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-02 12:10+0200\n"
+"POT-Creation-Date: 2006-11-27 18:06+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,12 +18,20 @@
#. Type: boolean
#. Description
+#. HINT: The wording of this template is similar to the wording of the
+#. dbconfig-common/purge template. Please have a look at the translation for
+#. the dbconfig-common/purge template first before translating this template,
+#. thanks.
#: ../boinc-client.templates:1001
msgid "Do you want to remove the BOINC data directory?"
msgstr ""
#. Type: boolean
#. Description
+#. HINT: The wording of this template is similar to the wording of the
+#. dbconfig-common/purge template. Please have a look at the translation for
+#. the dbconfig-common/purge template first before translating this template,
+#. thanks.
#: ../boinc-client.templates:1001
msgid ""
"The BOINC data directory /var/lib/boinc-client contains the information to "
@@ -34,6 +42,10 @@
#. Type: boolean
#. Description
+#. HINT: The wording of this template is similar to the wording of the
+#. dbconfig-common/purge template. Please have a look at the translation for
+#. the dbconfig-common/purge template first before translating this template,
+#. thanks.
#: ../boinc-client.templates:1001
msgid ""
"If no longer have need of the data being stored in the BOINC data directory, "
Modified: branches/experimental/boinc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/rules?rev=557&op=diff
==============================================================================
--- branches/experimental/boinc/debian/rules (original)
+++ branches/experimental/boinc/debian/rules Tue Dec 19 16:23:33 2006
@@ -19,12 +19,6 @@
# download any application or work units, so we use --target i686-linux-gnu
# to override it on i386 hosts.
ifeq ($(DEB_HOST_GNU_TYPE), i486-linux-gnu)
- TYPE_FLAGS += --target i686-linux-gnu --program-prefix=""
-endif
-
-# This is the same as above, but only for compatibility with sarge's version
-# of dpkg-architecture.
-ifeq ($(DEB_HOST_GNU_TYPE), i386-linux)
TYPE_FLAGS += --target i686-linux-gnu --program-prefix=""
endif
@@ -191,6 +185,7 @@
# Fix some file permissions.
chmod +x \
$(BOINC_SERVER_DIR)/html/ops/db_update.php \
+ $(BOINC_SERVER_DIR)/html/ops/mass_email_script.php \
$(BOINC_SERVER_DIR)/html/ops/watchdogs.php \
$(BOINC_SERVER_DIR)/html/ops/wd_nresults_changing.php \
$(BOINC_SERVER_DIR)/tools/watch_tcp
@@ -203,9 +198,6 @@
# Fix PHP shebang for executable PHP scripts.
sed -i -e '1 s/\/usr\/local\/bin\/php/\/usr\/bin\/php/' \
$(BOINC_SERVER_DIR)/html/ops/db_update.php \
- $(BOINC_SERVER_DIR)/html/ops/make_fake_tables.php \
- $(BOINC_SERVER_DIR)/html/ops/migrate_tables.php \
- $(BOINC_SERVER_DIR)/html/ops/mungetest.php \
$(BOINC_SERVER_DIR)/html/ops/update_forum_activities.php \
$(BOINC_SERVER_DIR)/html/ops/update_profile_pages.php \
$(BOINC_SERVER_DIR)/html/ops/update_uotd.php \
More information about the pkg-boinc-commits
mailing list