4 files changed, 34 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog
index eadefd4..cf6bd14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sdl-kitchensink (0.0.7-2) unstable; urgency=medium
+
+  * Indent lists in extended descriptions
+  * Put libsdl-kitchensink0 in section libs
+  * Mark libsdl-kitchensink{0,-dev} Multi-Arch: same
+  * Add uversionmangle to remove -alpha from upstream tags
+  * Add debian/gbp.conf
+
+ -- Didier Raboud <odyx@debian.org>  Wed, 25 Oct 2017 10:32:38 +0200
+
 sdl-kitchensink (0.0.7-1) unstable; urgency=medium
 
   * Initial release. (Closes: #878673)
diff --git a/debian/control b/debian/control
index 325ca0c..7f5980a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: sdl-kitchensink
-Section: devel
+Section: libs
 Priority: optional
 Maintainer: Didier Raboud <odyx@debian.org> 
 Build-Depends:
@@ -23,33 +23,35 @@ Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/sdl-kitchensink.git
 
 Package: libsdl-kitchensink0
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: FFmpeg and SDL2 based library for audio and video playback
  It provides FFmpeg-based audio and video playback for SDL which features:
- - Decoding video & audio via FFmpeg
- - Dumping video data on SDL_textures
- - Dumping audio data in the usual mono/stereo interleaved formats
- - Automatic audio and video conversion to SDL2 friendly formats
- - Synchronizing video & audio to clock
- - Seeking forwards and backwards
- - Bitmap & libass subtitle support
+  - Decoding video & audio via FFmpeg
+  - Dumping video data on SDL_textures
+  - Dumping audio data in the usual mono/stereo interleaved formats
+  - Automatic audio and video conversion to SDL2 friendly formats
+  - Synchronizing video & audio to clock
+  - Seeking forwards and backwards
+  - Bitmap & libass subtitle support
  .
  This package contains the shared library.
  
 Package: libsdl-kitchensink-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends:
  libsdl-kitchensink0 (= ${binary:Version}),
  ${misc:Depends}
 Description: FFmpeg and SDL2 based library for audio and video playback - Development files
  It provides FFmpeg-based audio and video playback for SDL which features:
- - Decoding video & audio via FFmpeg
- - Dumping video data on SDL_textures
- - Dumping audio data in the usual mono/stereo interleaved formats
- - Automatic audio and video conversion to SDL2 friendly formats
- - Synchronizing video & audio to clock
- - Seeking forwards and backwards
- - Bitmap & libass subtitle support
+  - Decoding video & audio via FFmpeg
+  - Dumping video data on SDL_textures
+  - Dumping audio data in the usual mono/stereo interleaved formats
+  - Automatic audio and video conversion to SDL2 friendly formats
+  - Synchronizing video & audio to clock
+  - Seeking forwards and backwards
+  - Bitmap & libass subtitle support
  .
  This package contains the development files.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..9961e33
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,6 @@
+[DEFAULT]
+upstream-branch = upstream/latest
+debian-branch = debian/master
+[dch]
+meta = true
+
diff --git a/debian/watch b/debian/watch
index 471d9cf..f06af64 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/sdl-kitchensink-$1\.tar\.gz/ \
+opts=uversionmangle=s/(\d)[_\.\-\+]?alpha$/$1/,filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/sdl-kitchensink-$1\.tar\.gz/ \
   https://github.com/katajakasa/SDL_kitchensink/tags .*/v?(\d\S+)\.tar\.gz