[pkg-boinc-commits] r546 - in
/branches/sarge-backports/boinc/debian: boinc-client.install
boinc-client.postinst boinc-client.postrm changelog control copyright
extra/move-boinc-dir.sh rules
fst-guest at users.alioth.debian.org
fst-guest at users.alioth.debian.org
Fri Nov 3 14:47:21 CET 2006
Author: fst-guest
Date: Fri Nov 3 14:47:20 2006
New Revision: 546
URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=546
Log:
Prepared sarge backport 5.4.11-3~bpo.1.
Modified:
branches/sarge-backports/boinc/debian/boinc-client.install
branches/sarge-backports/boinc/debian/boinc-client.postinst
branches/sarge-backports/boinc/debian/boinc-client.postrm
branches/sarge-backports/boinc/debian/changelog
branches/sarge-backports/boinc/debian/control
branches/sarge-backports/boinc/debian/copyright
branches/sarge-backports/boinc/debian/extra/move-boinc-dir.sh
branches/sarge-backports/boinc/debian/rules
Modified: branches/sarge-backports/boinc/debian/boinc-client.install
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/sarge-backports/boinc/debian/boinc-client.install?rev=546&op=diff
==============================================================================
--- branches/sarge-backports/boinc/debian/boinc-client.install (original)
+++ branches/sarge-backports/boinc/debian/boinc-client.install Fri Nov 3 14:47:20 2006
@@ -3,4 +3,5 @@
debian/conffiles/log_flags.xml etc/boinc-client
debian/conffiles/remote_hosts.cfg etc/boinc-client
debian/extra/update-boinc-applinks usr/bin
-lib/boinc_cmd usr/bin
+debian/overrides/boinc-client usr/share/lintian/overrides
+debian/tmp/usr/bin/boinc_cmd usr/bin
Modified: branches/sarge-backports/boinc/debian/boinc-client.postinst
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/sarge-backports/boinc/debian/boinc-client.postinst?rev=546&op=diff
==============================================================================
--- branches/sarge-backports/boinc/debian/boinc-client.postinst (original)
+++ branches/sarge-backports/boinc/debian/boinc-client.postinst Fri Nov 3 14:47:20 2006
@@ -3,16 +3,19 @@
set -e
+# Source the debconf shell library.
+. /usr/share/debconf/confmodule
+
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
+ ln -sf "$CONF_DIR/$1" "$BOINC_DIR/$1"
+ chown boinc:boinc "$BOINC_DIR/$1"
}
case "$1" in
@@ -35,15 +38,15 @@
# 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
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
-
+
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
Modified: branches/sarge-backports/boinc/debian/boinc-client.postrm
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/sarge-backports/boinc/debian/boinc-client.postrm?rev=546&op=diff
==============================================================================
--- branches/sarge-backports/boinc/debian/boinc-client.postrm (original)
+++ branches/sarge-backports/boinc/debian/boinc-client.postrm Fri Nov 3 14:47:20 2006
@@ -3,18 +3,31 @@
set -e
+# Source the debconf shell library.
+. /usr/share/debconf/confmodule
+
BOINC_DIR=/var/lib/boinc-client
+
+rm_boinc_dir()
+{
+ if [ -d $BOINC_DIR ]; then
+ rm -r $BOINC_DIR
+ fi
+ if getent passwd boinc >/dev/null; then
+ deluser boinc
+ fi
+ if getent group boinc >/dev/null; then
+ delgroup boinc
+ fi
+}
case "$1" in
purge)
- if [ -d $BOINC_DIR ]; then
- rm -r $BOINC_DIR
- fi
- if getent passwd boinc >/dev/null; then
- deluser boinc
- fi
- if getent group boinc >/dev/null; then
- delgroup boinc
+ db_input high boinc-client/remove_boinc_dir || true
+ db_go
+ db_get boinc-client/remove_boinc_dir || true
+ if [ "$RET" = "true" ]; then
+ rm_boinc_dir
fi
;;
Modified: branches/sarge-backports/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/sarge-backports/boinc/debian/changelog?rev=546&op=diff
==============================================================================
--- branches/sarge-backports/boinc/debian/changelog (original)
+++ branches/sarge-backports/boinc/debian/changelog Fri Nov 3 14:47:20 2006
@@ -1,3 +1,46 @@
+boinc (5.4.11-3~bpo.1) sarge-backports; urgency=low
+
+ * Rebuilt for sarge.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Tue, 12 Sep 2006 15:18:51 +0200
+
+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~bpo.1) sarge-backports; urgency=low
* Rebuilt for sarge.
Modified: branches/sarge-backports/boinc/debian/control
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/sarge-backports/boinc/debian/control?rev=546&op=diff
==============================================================================
--- branches/sarge-backports/boinc/debian/control (original)
+++ branches/sarge-backports/boinc/debian/control Fri Nov 3 14:47:20 2006
@@ -4,7 +4,8 @@
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, zlib1g-dev, libssl-dev, libcurl3-dev (>= 7.13.2) | libcurl-ssl-dev, 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
+Build-Depends: debhelper (>= 5), dpatch, po-debconf, dh-buildinfo, docbook2x, docbook-xml, autotools-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), zlib1g-dev, libssl-dev, libcurl3-dev (>= 7.13.2) | libcurl-ssl-dev, 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
Package: boinc-client
Section: net
Modified: branches/sarge-backports/boinc/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/sarge-backports/boinc/debian/copyright?rev=546&op=diff
==============================================================================
--- branches/sarge-backports/boinc/debian/copyright (original)
+++ branches/sarge-backports/boinc/debian/copyright Fri Nov 3 14:47:20 2006
@@ -939,3 +939,11 @@
4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
"UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its
own source and binary releases.
+
+
+The Debian packaging is © 2004-2006 Debian BOINC Maintainers
+<pkg-boinc-devel at lists.alioth.debian.org> and is licensed under
+the GPL.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
Modified: branches/sarge-backports/boinc/debian/extra/move-boinc-dir.sh
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/sarge-backports/boinc/debian/extra/move-boinc-dir.sh?rev=546&op=diff
==============================================================================
--- branches/sarge-backports/boinc/debian/extra/move-boinc-dir.sh (original)
+++ branches/sarge-backports/boinc/debian/extra/move-boinc-dir.sh Fri Nov 3 14:47:20 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,10 @@
# 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
# Start the BOINC core client again.
invoke-rc.d boinc-client start
Modified: branches/sarge-backports/boinc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/sarge-backports/boinc/debian/rules?rev=546&op=diff
==============================================================================
--- branches/sarge-backports/boinc/debian/rules (original)
+++ branches/sarge-backports/boinc/debian/rules Fri Nov 3 14:47:20 2006
@@ -19,13 +19,13 @@
# 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
+ 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
+ TYPE_FLAGS += --target i686-linux-gnu --program-prefix=""
endif
CFLAGS += -g -Wall
@@ -137,6 +137,8 @@
aclocal.m4 \
config.h.in \
configure
+
+ debconf-updatepo
clean-boinc-client:
dh_testdir
@@ -169,16 +171,17 @@
install -D -m644 "locale/client/$$i/BOINC Manager.mo" \
"debian/boinc-manager/usr/share/locale/$$i/LC_MESSAGES/BOINC Manager.mo"; \
fi; \
- done;
+ done;
# The en_US po file is actually a po template, thus the corresponding
- # "BOINC Manager.mo" is empty and useless.
+ # "BOINC Manager.mo" is empty and useless.
rm -rf debian/boinc-manager/usr/share/locale/en_US/
binary-arch: build install-arch
dh_testdir -a
dh_testroot
- dh_installchangelogs -a
+ dh_installchangelogs -a -k checkin_notes
dh_installdocs -a
+ dh_installdebconf -a
dh_installexamples -a
dh_installmenu -a
dh_desktop -a
More information about the pkg-boinc-commits
mailing list