[SCM] BOINC packaging branch, master, updated. debian/6.2.18-2-9-g6d35139
rmayorga
rmayorga at debian.org
Wed Feb 25 20:55:03 UTC 2009
The following commit has been merged in the master branch:
commit e5704c7b2691f1f80b9c1a8893b4f68fd0e6f317
Merge: 810db27ca4d3ad9ebfce1b350666e0bbe4fccc41 b7435e729ae4a70b6a294a0314c93e72c2f5432d
Author: rmayorga <rmayorga at debian.org>
Date: Wed Feb 25 14:48:01 2009 -0600
Merge branch 'debian/experimental'
conflicts:
debian/changelog
debian/control
debian/patches/001_dont_install_ca-bundle.crt.patch
debian/patches/002_remove_hardcoded_optimization.patch
debian/patches/series
diff --combined debian/changelog
index 6d9e9fe,5fcd02b..42f2df3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,62 +1,75 @@@
+ boinc (6.2.18-3) unstable; urgency=low
+
+ * Uploaded to unstable
+
+ -- Rene Mayorga <rmayorga at debian.org> Wed, 25 Feb 2009 10:04:23 -0600
+
+ boinc (6.2.18-2) experimental; urgency=low
+
+ [ Frank S. Thomas ]
+ * debian/rules: Transposed/renamed/removed targets and their prerequisites
+ so that building the package with make's parallel execution succeeds.
+ * debian/control: Removed myself from Uploaders.
+
+ [ Rene Mayorga ]
+ * debian/boinc-client.init: Detect and remove `--daemon' option
+ from etc/default/boinc-client Closes: #504467
+ * debian/control:
+ + add myself to Uploaders, and wrap long lines
+ + add ${misc:Depends} to boinc-client-dbg Depends
+ + remove `Section' from boinc-client package
+ * debian/rules:
+ + remove boinc/locale/client/ar/BOINC Manager.mo on clean target
+ this file is regenerated on build and FTBFS when the package
+ is built two times in a row
+ + remove config.guess and config.sub on clean, this will
+ prevent that auto-generated changes goes to .diff.gz
+ + remove client/scripts/Makefile, client/scripts/boinc-client
+ and sea/Makefile, to prevent that those files end on
+ .diff.gz file
+ * debian/po/ja.po added, thanks goes to Hideki Yamane, Closes: #510718
+ * debian/patches: add description, Author and some other info to all
+ patches.
+ * 005_hyphen_as_minus.patch added; Add <option> tag to some options
+ on doc/manpages/boinccmd.xml
+ * debian/manpages/update-boinc-applinks.xml, use <option> tag on --help
+ option referenced on OPTIONS section.
+ * 101_check_RSA_returned_values.patch from unstable, added
+
+ -- Rene Mayorga <rmayorga at debian.org> Sun, 11 Jan 2009 15:25:21 -0600
+
+ boinc (6.2.18-1) experimental; urgency=low
+
+ [ Frank S. Thomas ]
+ * New upstream release.
+ * debian/control:
+ - Updated Vcs-* fields since we are now using Git.
+ - wxWidgets 2.8 is now in unstable, so upgraded the build-dependency from
+ libwxgtk2.6-dev to libwxgtk2.8-dev. (closes: #461581) Also let boinc-dbg
+ suggest libwxgtk2.8-dbg instead of libwxgtk2.6-dbg.
+ * Removed compatibility symlinks for boinc_client and boinc_cmd.
+ * debian/rules:
+ - Switched to debhelper V7 (from V5) to minimize rules file. Updated
+ build-dependency and compatibility level accordingly.
+ - Regenerate the binary message catalogs for the BOINC Manager from the po
+ files in locale/client/.
+ * debian/boinc-client.init: Cosmetic changes of the status action output.
+
+ -- Frank S. Thomas <fst at debian.org> Thu, 21 Aug 2008 20:25:31 +0200
+
+boinc (6.2.14-3) unstable; urgency=low
+
+ * Add debian/patches/101_check_RSA_returned_values.patch
+ Check the returned values for RSA_public_decrypt and
+ RSA_private_encrypt functions. Change ported by upstream changeset 16883
+ (http://boinc.berkeley.edu/trac/changeset/16883) Closes: #511521
+ * debian/patches
+ 001_dont_install_ca-bundle.crt.patch and
+ 002_remove_hardcoded_optimization.patch Refreshed
+ * debian/control - add myself to uploaders
+
+ -- Rene Mayorga <rmayorga at debian.org.sv> Tue, 13 Jan 2009 14:05:38 -0600
+
boinc (6.2.14-2) unstable; urgency=low
* Updated translations for the BOINC Manager from the 6.2.16 release:
diff --combined debian/patches/001_dont_install_ca-bundle.crt.patch
index 315ccf8,538972b..958e4de
--- a/debian/patches/001_dont_install_ca-bundle.crt.patch
+++ b/debian/patches/001_dont_install_ca-bundle.crt.patch
@@@ -1,11 -1,16 +1,16 @@@
- --- boinc.orig/client/Makefile.am
- +++ boinc/client/Makefile.am
+ Description: Don't install ca-bundle.crt from BOINC, and keep the system using
+ the ca-bundle.crt provided by ca-certificates
+ Author: Frank S. Thomas <frank at thomas-alfeld.de>
+ Index: boinc-5.10.25/client/Makefile.am
+ ===================================================================
+ --- boinc-5.10.25.orig/client/Makefile.am
+ +++ boinc-5.10.25/client/Makefile.am
@@ -66,7 +66,7 @@
- boinc_client_LDADD = -L../lib -lboinc $(PTHREAD_LIBS)
+ boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS)
boinc_clientdir = $(bindir)
-boinc_client_DATA = ../curl/ca-bundle.crt
+#boinc_client_DATA = ../curl/ca-bundle.crt
switcher_SOURCES = switcher.C
- switcher_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS)
+
diff --combined debian/patches/002_remove_hardcoded_optimization.patch
index 2f73386,e4b736f..5e3a3b2
--- a/debian/patches/002_remove_hardcoded_optimization.patch
+++ b/debian/patches/002_remove_hardcoded_optimization.patch
@@@ -1,5 -1,10 +1,10 @@@
- --- boinc.orig/client/Makefile.am
- +++ boinc/client/Makefile.am
+ Author: Frank S. Thomas <frank at thomas-alfeld.de>
+ Description: remove hardcoded compiler flags from client/Makefile.am
+ Bug: #427661
+ Index: boinc-6.1.0/client/Makefile.am
+ ===================================================================
+ --- boinc-6.1.0.orig/client/Makefile.am
+ +++ boinc-6.1.0/client/Makefile.am
@@ -61,7 +61,7 @@
work_fetch.C
@@@ -7,5 -12,5 +12,5 @@@
-boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS)
+boinc_client_CPPFLAGS = $(AM_CPPFLAGS)
boinc_client_LDFLAGS = -static-libgcc
- boinc_client_LDADD = -L../lib -lboinc $(PTHREAD_LIBS)
+ boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS)
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list