Small refactorings, test multiline description.

debian/format.go

@@ -119,12 +119,12 @@ func (c *ControlFileReader) ReadStanza() (Stanza, error) {
 			_, lastFieldMultiline = multilineFields[lastField]
 			if lastFieldMultiline {
 				stanza[lastField] = parts[1]
+				if parts[1] != "" {
+					stanza[lastField] += "\n"
+				}
 			} else {
 				stanza[lastField] = strings.TrimSpace(parts[1])
 			}
-			if lastFieldMultiline && stanza[lastField] != "" {
-				stanza[lastField] += "\n"
-			}
 		}
 	}
 	if err := c.scanner.Err(); err != nil {

debian/format_test.go

@@ -42,7 +42,8 @@ Homepage: http://gregkh.github.com/bti/
 Package-List:
  bti deb net extra
 Directory: pool/main/b/bti
-Priority: source
+Description: This is cool
+ Multiline description
 Section: net