[SCM] BOINC packaging branch, master, updated. debian/6.4.5-1-13-g32cd32c

rmayorga rmayorga at debian.org
Sat May 23 20:09:31 UTC 2009


The following commit has been merged in the master branch:
commit 32cd32c53deaa0cb031079f4a37d4418f12deaef
Merge: 6a287b019b668b478caa058a6e3c6e55a62158d4 f58dd217b1a5285a59644bc7224f62e5a6bb43b0
Author: rmayorga <rmayorga at debian.org>
Date:   Sat May 23 14:08:14 2009 -0600

    Merge branch 'debian/experimental'
    
    Conflicts:
    	debian/changelog
    	debian/patches/001_dont_install_ca-bundle.crt.patch

diff --combined debian/changelog
index 1d9c889,810246a..6890aac
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,44 +1,53 @@@
+ boinc (6.4.5-2) experimental; urgency=low
+ 
+   * Include a patch picked from Upstream SVN
+   to avoid FTBFSs whith gcc 4.4 (Closes: #526666)
+ 
+  -- Rene Mayorga <rmayorga at debian.org>  Sat, 23 May 2009 13:29:17 -0600
+ 
+ boinc (6.4.5-1) experimental; urgency=low
+ 
+   * New upstream version
+   * debian/patches:
+     + 001_dont_install_ca-bundle.crt.patch refreshed
+     + 002_remove_hardcoded_optimization.patch refreshed
+     + 003_use_sensible-browser.patch
+     + 004_exclude_sea.patch removed
+     + 006_correct_catalog_path.patch added 
+   * debian/boinc-dev.install; upstream now calls `boinc' instead
+     of `BOINC' the include/ dir
+   * debian/boinc-dev.links; make BOINC point to boinc, this
+     will save those who still point to the wrong PATH
+   * debian/copyright: 
+     + Update upstream license from LGPL-2.1 to LGPL-3
+     + update the file name on : api/textfont.[ch], client/stream.cpp,
+       clientgui/wizardex.cpp
+     + update copyright years on html/inc/geoip.inc and correct license
+     + add copyright and license info for samples/glut/Roman.stroke, 
+       client/install-sh, samples/glut/win32_util.c, 
+       samples/glut/win32_x11.[ch], samples/glut/stroke.h,
+       samples/glut/glut.h, samples/jpeglib/*
+   * debian/rules:
+     + don't install .mo files manually
+     + correct .mo files perms
+     + copy sea/*png file to clientgui/res and remove they on clean target
+     + download export-boinc from git instead svn, 
+       use an ugly wget since git is not able to it by itself
+     + delete empty locale dirs
+   * debian/boinc-manager.install: usr/share/locale/* files added
+   * debian/control, set standards-version to 3.8.1 ( no changes needed )
+ 
+  -- Rene Mayorga <rmayorga at debian.org>  Sat, 23 May 2009 13:29:08 -0600
+ 
 +boinc (6.2.18-4) unstable; urgency=low
 +
 +  * remove unused var from init.d script
 +    thanks for the report and patch goes to Paul Saunders.
 +    (Closes: #520091)
 +  * debian/control: use standards-version 3.8.1 ( no changes needed )
 +
 + -- Rene Mayorga <rmayorga at debian.org>  Sat, 21 Mar 2009 13:44:13 -0600
 +
  boinc (6.2.18-3) unstable; urgency=low
  
    * Uploaded to unstable
@@@ -66,19 -98,6 +107,19 @@@ boinc (6.2.18-1) experimental; urgency=
  
   -- 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 958e4de,da3331e..e9f0cd9
--- a/debian/patches/001_dont_install_ca-bundle.crt.patch
+++ b/debian/patches/001_dont_install_ca-bundle.crt.patch
@@@ -1,16 -1,14 +1,12 @@@
  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.orig/client/Makefile.am
+ +++ boinc/client/Makefile.am
+ @@ -67,7 +67,7 @@
   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_SOURCES = switcher.cpp
 - 

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list