[SCM] SETI at home packaging branch, graphics, updated. debian/6.97_svn1409-1-30-g099d1b5

[Guo Yixuan]

The following commit has been merged in the graphics branch:
commit 099d1b55dda068195ed377e05fcc6ea69ae3464f
Merge: 662d29209a0a5cd095100d744cc4d38f60c3f67e 608757e9cee00ed8a1c3f038829ab16b51c63e3c
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Wed Nov 7 20:06:48 2012 +0800

    Merge branch 'master' into graphics
    
    Conflicts:
    	debian/README.source

diff --combined debian/README.source
index d61c4df,4891d32..c5d5bc2
--- a/debian/README.source
+++ b/debian/README.source
@@@ -39,11 -39,8 +39,17 @@@ Repackaged upstream source
   The latest .orig.tar.gz tarball can always be retrieved, using this
   script, by invoking the get-orig-source target of debian/rules.
  
+ quilt configuration:
+  To keep it simple, this is recommended for ~/.quiltrc when editing debian/patches:
+ 
+  QUILT_PATCHES="debian/patches"
+  QUILT_NO_DIFF_TIMESTAMPS=1
++
 +About graphics:
 + There're 2 flavors now: boinc-app-seti and boinc-app-seti-graphics.
 + Main difference in building process can be summarized as:
 + 1. Build seti with --enable-graphics, which generate 2 binaries.
 + 2. Put both into package boinc-app-seti-graphics, and put the
 +    no-graphics one in boinc-app-seti.
 + 3. Mark boinc-app-seti and boinc-app-seti-graphics as in conflict with
 +    each other.
diff --combined debian/changelog
index 10df16c,9d4a73a..eb28176
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,27 +1,27 @@@
+ boinc-app-seti (7.00~svn1708-1) UNRELEASED; urgency=low
+ 
+   * New upstream version
+ 
+  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 05 Nov 2012 14:48:54 +0100
+ 
+ boinc-app-seti (7.00~svn1704-1) UNRELEASED; urgency=low
+ 
+   * New upstream version.
+ 
+  -- Guo Yixuan <culu.gyx at gmail.com>  Sat, 03 Nov 2012 00:02:38 +0800
+ 
+ boinc-app-seti (7.00~svn1703-1) UNRELEASED; urgency=low
+ 
+   * New upstream version 
+ 
+  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 02 Nov 2012 12:52:08 +0100
+ 
+ boinc-app-seti (6.97~svn1409-2) UNRELEASED; urgency=low
+ 
+   * Reorganize debian/patches.
+ 
+  -- Guo Yixuan <culu.gyx at gmail.com>  Sun, 23 Sep 2012 22:53:02 +0800
+ 
  boinc-app-seti (6.97~svn1409-1) unstable; urgency=low
  
    [Eric J. Korpela]
@@@ -10,7 -34,6 +34,7 @@@
      - sah_v7 branch becomes trunk.
      - new feature: autocorrelation.
      - re-enabled 003_dont_use_own_jpeglib.patch, and refreshed some patches.
 +  * New package: boinc-app-seti-graphics provide a visualizer for seti.
  
    [Steffen Moeller]
    * debian/control: boinc-app-seti suggests boinc-manager
@@@ -137,6 -160,33 +161,33 @@@ boinc-app-seti (5.13+cvs20060510-7.1) u
  
   -- Ying-Chun Liu (PaulLiu) <paulliu at debian.org>  Mon, 14 May 2012 23:58:40 +0800
  
+ boinc-app-seti (5.13+cvs20060510-7) unstable; urgency=low
+ 
+   * debian/control:
+     - Add myself to uploaders
+     - Use Standards-Version 3.8.4 (No changes needed)
+     - Bump boinc-dev B-D to 6.10.17+dfsg-3 
+   * Includes Ilya Barygin <barygin at gmail.com> patchs to fix a FTBFS
+     coming since the last upgrade of boinc-dev, thanks for the 
+     patches! (Closes: #556817) 
+   * debian/rules: 
+     - Delete configure to prevent ship the modified file
+     - Use `clean' instead of `distclean', dist-clean fails to clean the package.
+     - Remove some auto-generated files that are not cleaned on `clean' target
+   * Switch to dpkg-source 3.0 (quilt) format
+     - Remove quilt from debian/rules and from B-D
+     - Remove README.source
+ 
+  -- Rene Mayorga <rmayorga at debian.org>  Thu, 25 Mar 2010 19:50:29 -0600
+ 
+ boinc-app-seti (5.13+cvs20060510-6) unstable; urgency=low
+ 
+   * debian/control:
+     - Bumped Standards-Version from 3.8.0 to 3.8.1, no changes required.
+     - Removed myself from Uploaders.
+ 
+  -- Frank S. Thomas <fst at debian.org>  Wed, 18 Mar 2009 15:58:52 +0100
+ 
  boinc-app-seti (5.13+cvs20060510-5) unstable; urgency=low
  
    [ Frank S. Thomas ]

-- 
SETI at home packaging