diff -u clang-2.7/debian/changelog clang-2.7/debian/changelog
--- clang-2.7/debian/changelog
+++ clang-2.7/debian/changelog
@@ -1,3 +1,11 @@
+clang (2.7-0ubuntu3) maverick; urgency=low
+
+  * debian/patches/0002-Dont-forward-any--g-options-to-gcc.patch: Take
+    patch from upstream r110111 to fix “duplicate .debug_line sections”
+    error with clang -g.  (LP: #599485)
+
+ -- Anders Kaseorg <andersk@mit.edu>  Fri, 06 Aug 2010 02:01:10 -0400
+
 clang (2.7-0ubuntu2) maverick; urgency=low
 
   * Build-depend on the versioned llvm-2.7 packages.
only in patch2:
unchanged:
--- clang-2.7.orig/debian/patches/0002-Dont-forward-any--g-options-to-gcc.patch
+++ clang-2.7/debian/patches/0002-Dont-forward-any--g-options-to-gcc.patch
@@ -0,0 +1,21 @@
+Description: Driver: Don't forward any -g options to GCC, when using it to drive the assembler
+Origin: upstream, http://llvm.org/viewvc/llvm-project?view=rev&revision=110111
+Author: Daniel Dunbar <daniel@zuster.org>
+Bug: http://llvm.org/bugs/show_bug.cgi?id=6218
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/clang/+bug/599485
+Last-Update: 2010-08-05
+
+--- a/tools/clang/lib/Driver/Tools.cpp	(revision 110110)
++++ b/tools/clang/lib/Driver/Tools.cpp	(revision 110111)
+@@ -1600,6 +1600,11 @@
+          it = Args.begin(), ie = Args.end(); it != ie; ++it) {
+     Arg *A = *it;
+     if (A->getOption().hasForwardToGCC()) {
++      // Don't forward any -g arguments to assembly steps.
++      if (isa<AssembleJobAction>(JA) &&
++          A->getOption().matches(options::OPT_g_Group))
++        continue;
++
+       // It is unfortunate that we have to claim here, as this means
+       // we will basically never report anything interesting for
+       // platforms using a generic gcc, even if we are just using gcc