The following commit has been merged in the master branch:
commit 6768962e969d3dff32ae152daf1fc5e6cd63da26
Merge: 2995d146ddd26d479740a7b6934f7ad349139730 
52f7db19dd7aa2223cd5a851ad00aa57d69eb66f
Author: James Vega <[email protected]>
Date:   Sat Jan 1 14:00:05 2011 -0500

    Merge remote branch 'origin/master'

diff --combined debian/changelog
index 8eed35a,f07f924..bab8d4d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,6 +1,6 @@@
  devscripts (2.10.70) UNRELEASED; urgency=low
  
+   [ James Vega ]
    * debuild:
      + Properly quote shell variable when parsing options.  (Closes: #556248)
      + Don't treat “-nc” as implying binary only build.  (Closes: #607303)
@@@ -7,13 -8,16 +8,19 @@@
        binary independent packages.
    * pts-subscribe: Handle “--until 0” the same as “--forever”.  (Closes:
      #604740)
 -  * uscan: Update documentation to use “.+” instead of “.*” in groupings.
 -    Thanks to Ben Finney for the patch.  (Closes: #606060)
 +  * uscan:
 +    + Update documentation to use “.+” instead of “.*” in groupings.  Thanks
 +      to Ben Finney for the patch.  (Closes: #606060)
 +    + Add “target” element to --dehs' XML, specifying the name of the
 +      downloaded file.  (Closes: #598514)
    * debcheckout: Use the correct prototype for set_destdir.  (Closes: #606053)
  
+   [ Christoph Berg ]
+   * debcheckout: For debian-dir-only repositories, also retrieve the source
+     package, unpack it, and move the missing files over. Add a new option
+     --source (DEBCHECKOUT_SOURCE) to control this behavior. (Closes: #535767)
+   * Makefiles: Fix parallelization for use with make -j N.
+ 
   -- James Vega <[email protected]>  Thu, 02 Dec 2010 20:27:34 -0500
  
  devscripts (2.10.69) unstable; urgency=low

-- 
Git repository for devscripts


-- 
To unsubscribe, send mail to [email protected].

Reply via email to