diff -Nru golang-github-glacjay-goini-0.0~git20141123/debian/changelog golang-github-glacjay-goini-0.0~git20150730/debian/changelog
--- golang-github-glacjay-goini-0.0~git20141123/debian/changelog	2015-06-29 19:58:00.000000000 +0000
+++ golang-github-glacjay-goini-0.0~git20150730/debian/changelog	2015-08-05 07:51:55.000000000 +0000
@@ -1,3 +1,10 @@
+golang-github-glacjay-goini (0.0~git20150730-1) unstable; urgency=medium
+
+  * Import new upstream version to fix section ordering bugs.
+  * Remove debian/patches related to trying to workaround the above.
+
+ -- Tim Potter <tpot@hp.com>  Wed, 05 Aug 2015 13:16:00 +1000
+
 golang-github-glacjay-goini (0.0~git20141123-1) unstable; urgency=medium
 
   * Initial release (Closes: #784402)
diff -Nru golang-github-glacjay-goini-0.0~git20141123/.gitignore golang-github-glacjay-goini-0.0~git20150730/.gitignore
--- golang-github-glacjay-goini-0.0~git20141123/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ golang-github-glacjay-goini-0.0~git20150730/.gitignore	2015-08-05 03:18:53.000000000 +0000
@@ -0,0 +1,8 @@
+.*.swp
+
+*.[689]
+[689].out
+
+_obj
+_test
+_testmain.go
diff -Nru golang-github-glacjay-goini-0.0~git20141123/ini.go golang-github-glacjay-goini-0.0~git20150730/ini.go
--- golang-github-glacjay-goini-0.0~git20141123/ini.go	2015-05-06 04:46:50.000000000 +0000
+++ golang-github-glacjay-goini-0.0~git20150730/ini.go	2015-08-05 03:18:53.000000000 +0000
@@ -244,10 +244,15 @@
 
 func (dict Dict) format() *bytes.Buffer {
 	var buffer bytes.Buffer
+	for key, val := range dict[""] {
+		buffer.WriteString(fmt.Sprintf("%s = %s\n", key, val))
+	}
+	buffer.WriteString("\n")
 	for section, vals := range dict {
-		if section != "" {
-			buffer.WriteString(fmt.Sprintf("[%s]\n", section))
+		if section == "" {
+			continue
 		}
+		buffer.WriteString(fmt.Sprintf("[%s]\n", section))
 		for key, val := range vals {
 			buffer.WriteString(fmt.Sprintf("%s = %s\n", key, val))
 		}
diff -Nru golang-github-glacjay-goini-0.0~git20141123/ini_test.go golang-github-glacjay-goini-0.0~git20150730/ini_test.go
--- golang-github-glacjay-goini-0.0~git20141123/ini_test.go	2015-05-06 04:46:50.000000000 +0000
+++ golang-github-glacjay-goini-0.0~git20150730/ini_test.go	2015-08-05 03:18:53.000000000 +0000
@@ -3,20 +3,8 @@
 import (
 	"io/ioutil"
 	"testing"
-)
-
-const (
-	exampleStr = `key1 = true
-
-[section1]
-key1 = value2
-key2 = 5
-key3 = 1.3
-
-[section2]
-key1 = 5
-
-`
+	"strings"
+	"bufio"
 )
 
 var (
@@ -163,7 +151,29 @@
 	d.SetInt("section1", "key2", 5)
 	d.SetDouble("section1", "key3", 1.3)
 	d.SetDouble("section2", "key1", 5.0)
-	if d.String() != exampleStr {
-		t.Errorf("Dict cannot be stringified as expected.")
+	reader := strings.NewReader(d.String())
+	d2, err := LoadReader(bufio.NewReader(reader))
+	if err != nil {
+		t.Error("Example: load error:", err)
+	}
+	b, found := d2.GetBool("", "key1")
+	if !found || !b {
+		t.Errorf("Stringify failed for key1")
+	}
+	s, found := d2.GetString("section1", "key1")
+	if !found || s != "value2" {
+	        t.Error("Stringify failed for section1, key1")
+	}
+	i, found := d2.GetInt("section1", "key2")
+	if !found || i != 5 {
+	        t.Error("Stringify failed for section1, key2")
+	}
+	db, found := d2.GetDouble("section1", "key3")
+	if !found || db != 1.3 {
+	        t.Error("Stringify failed for section1, key3")
+	}
+	db, found = d2.GetDouble("section2", "key1")
+	if !found || db != 5.0 {
+	        t.Error("Stringify failed for section2, key1")
 	}
 }
diff -Nru golang-github-glacjay-goini-0.0~git20141123/README.md golang-github-glacjay-goini-0.0~git20150730/README.md
--- golang-github-glacjay-goini-0.0~git20141123/README.md	1970-01-01 00:00:00.000000000 +0000
+++ golang-github-glacjay-goini-0.0~git20150730/README.md	2015-08-05 03:18:53.000000000 +0000
@@ -0,0 +1,5 @@
+# goini
+INI file parser in go.
+
+# See Also
+For real apps, you can use [TOML](https://github.com/BurntSushi/toml) instead, which is a better INI format :-)