[Pkg-sdl-commits] [libsdl1.2] 01/01: Imported Debian patch 1.2.15+dfsg1-2

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to annotated tag debian/1.2.15+dfsg1-2
in repository libsdl1.2.

commit 0a054125cf1f2c0eef94f8139db20e63904c93cc
Author: Manuel A. Fernandez Montecelo <mafm at debian.org>
Date:   Sun Feb 21 17:46:19 2016 +0000

    Imported Debian patch 1.2.15+dfsg1-2
---
 debian/changelog            | 8 ++++++++
 debian/control              | 1 -
 debian/gbp.conf             | 7 -------
 debian/source/local-options | 3 ---
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ed43e5..a2897d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libsdl1.2 (1.2.15+dfsg1-2) unstable; urgency=medium
+
+  * d/control: remove "Multi-Arch: no" from -dev package, despite what
+    lintian says there's an error processing the field (#768353) and the
+    package got rejected
+
+ -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Sun, 21 Feb 2016 17:46:19 +0000
+
 libsdl1.2 (1.2.15+dfsg1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 33f69d0..afe79f8 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,6 @@ Description: Simple DirectMedia Layer
 
 Package: libsdl1.2-dev
 Architecture: any
-Multi-Arch: no
 Section: libdevel
 Depends: ${misc:Depends},
          libsdl1.2debian (= ${binary:Version}),
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 7cf9468..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-pristine-tar = True
-sign-tags = True
-
-[import-orig]
-filter = [ 'src/stdlib/SDL_qsort.c' ]
-filter-pristine-tar = True
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index fca7c0d..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,3 +0,0 @@
-unapply-patches
-abort-on-upstream-changes
-tar-ignore = "debian/gbp.conf"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl1.2.git