The following commit has been merged in the master branch:
commit 9e79153f3dace2ef76777fc484bf9997f133f0f2
Merge: 563f6ae2376c852c22d5a960ff1a4547ac33973b 
a7500e84a96ad7e5196f4b179931447d7025fa5b
Author: James Vega <james...@debian.org>
Date:   Sun Mar 20 13:17:55 2011 -0400

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
        debian/changelog
    
    Signed-off-by: James Vega <james...@debian.org>

diff --combined debian/changelog
index 2a92fe4,90fd139..a896f47
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,13 +1,18 @@@
  devscripts (2.10.72) UNRELEASED; urgency=low
  
+   [ James Vega ]
    * debuild: Use 3-argument form of open to suppress warnings about unused
      symbols.  (Closes: #606054)
 +  * Cleanup Recommends to avoid pulling in as many packages by default.  The
 +    remaining Recommends are relevant to the more commonly used scripts or
 +    functionality.  Relationships removed from Recommends were either added to
 +    Suggests if it makes sense to call some attention to them or were removed
 +    from debian/control completely.  (Closes: #605102, #610310, LP: #485264)
  
+   [ Ron Lee ]
+   * cowpoke: add a --return option that copies the build results back to a
+     directory somewhere.  (Closes: #614268)
+ 
   -- James Vega <james...@debian.org>  Wed, 02 Mar 2011 00:07:34 -0500
  
  devscripts (2.10.71) unstable; urgency=low

-- 
Git repository for devscripts


-- 
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.

Reply via email to