[spatialite-gui] 02/04: Imported Debian patch 1.7.1-5~trusty2

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch ubuntu/trusty
in repository spatialite-gui.

commit 3d66f0b05cbdfa5622fe7ea407a0564e74d04a12
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Sat Nov 22 21:32:26 2014 +0100

    Imported Debian patch 1.7.1-5~trusty2
---
 .gitignore       | 2 --
 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 debian/gbp.conf  | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f1b60ec..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-#Ignore quilt files
-.pc
diff --git a/debian/changelog b/debian/changelog
index a4d4f39..b9a1b94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+spatialite-gui (1.7.1-5~trusty2) trusty; urgency=medium
+
+  * Trusty build, fixing issues with wxwidgets 3  
+
+ -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Sat, 22 Nov 2014 21:32:26 +0100
+
 spatialite-gui (1.7.1-5) unstable; urgency=medium
 
   [ Ross Gammon ]
diff --git a/debian/control b/debian/control
index 7cc9d6f..cc168e9 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 9~),
                libxml2-dev
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/spatialite-gui.git
-Vcs-Git: git://anonscm.debian.org/pkg-grass/spatialite-gui.git -b ubuntu/trusty
+Vcs-Git: git://anonscm.debian.org/pkg-grass/spatialite-gui.git
 Homepage: https://www.gaia-gis.it/fossil/spatialite_gui/
 
 Package: spatialite-gui
diff --git a/debian/gbp.conf b/debian/gbp.conf
index d7546f3..21d0417 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -6,7 +6,7 @@ upstream-branch = upstream
 
 # The default name for the Debian branch is "master".
 # Change it if the name is different (for instance, "debian/unstable").
-debian-branch = ubuntu/trusty
+debian-branch = master
 
 # git-import-orig uses the following names for the upstream tags.
 # Change the value if you are not using git-import-orig

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite-gui.git