[Pkg-sdl-commits] [SCM] Debian packaging of SDL 1.3 branch, master, updated. debian/1.3.0_20111204-1-12-g3c9996a

Sat Jul 21 23:35:29 UTC 2012

The following commit has been merged in the master branch:
commit 3c9996a0e30b21315e1ae4c405e96dc00ebfde0d
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Jul 22 00:35:09 2012 +0100

    Homogenise libsdl1.2 and libsdl2, port fixes/enhancements from 1.2 to 2, etc

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 8646078..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
-    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
-        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
-                export QUILT_PATCHES=debian/patches
-        fi
-    done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
-    quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
-    quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches.  Then, for every file that will be modified by this patch,
-run:
-
-    quilt add <file>
-
-before editing those files.  You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly.  After editing the files, run:
-
-    quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
-    quilt import -P <patch> /path/to/patch
-    quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches.  The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
-    quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
diff --git a/debian/changelog b/debian/changelog
index 19976f0..8187bc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+libsdl2 (2.0~20120220c-2) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Updating maintainers/permissions:
+      - Add myself and Felix Geyer
+      - Set "DM-Upload-Allowed: yes"
+    - Update Build-Depends:
+      - Remove a few obsolete items
+      - Add items added lately to libsdl1.2, such as libts (touch screen)
+        support
+    - Add "libsdl2-dbg", analog to libsdl1.2-dbg
+    - Change "XC-Package-Type: udeb" to "Package-Type"
+  * debian/compat: set level 9
+  * debian/source/format: Set to "3.0 (quilt)"
+    - Remove README.source, not needed with new format
+  * debian/sdl2-config.1: Fix typo, "progams"->"programs"
+
+ -- Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>  Sun, 22 Jul 2012 00:11:06 +0100
+
 libsdl2 (2.0~20120220c-1) experimental; urgency=low
 
   * Upstream version was renamed to 2.0 (Closes: #669367).
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index ac8587f..bfd9558 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,22 @@ Source: libsdl2
 Priority: optional
 Section: libs
 Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
-Uploaders: Barry deFreese <bdefreese at debian.org>, Sam Hocevar <sho at debian.org>
+Uploaders: Barry deFreese <bdefreese at debian.org>,
+           Sam Hocevar <sho at debian.org>,
+           Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>,
+           Felix Geyer <debfx-pkg at fobos.de>
+DM-Upload-Allowed: yes
 Standards-Version: 3.9.3
-Build-Depends: dpkg (>= 1.13.2),
-               debhelper (>= 8.1.3~),
-               quilt,
+Build-Depends: debhelper (>= 9~),
+               dh-autoreconf,
+               dpkg-dev (>= 1.16.1~),
+               nasm [any-i386],
                libx11-dev,
                libxext-dev,
                libxt-dev,
+               libxv-dev,
                x11proto-core-dev,
+               libts-dev [linux-any],
                libaudiofile-dev,
                libpulse-dev,
                libgl1-mesa-dev,
@@ -38,7 +45,7 @@ Description: Simple DirectMedia Layer
  drivers and OSS, ALSA, NAS and PulseAudio sound drivers.
 
 Package: libsdl2-2.0-0-udeb
-XC-Package-Type: udeb
+Package-Type: udeb
 Architecture: any
 Section: debian-installer
 Priority: extra
@@ -55,6 +62,7 @@ Section: libdevel
 Depends: ${misc:Depends},
          libsdl2-2.0-0 (= ${binary:Version}),
          libx11-dev,
+         libts-dev [linux-any],
          libglu1-mesa-dev,
          libasound2-dev [linux-any],
          libpulse-dev,
@@ -71,3 +79,16 @@ Description: Simple DirectMedia Layer development files
  .
  This package contains the files needed to compile and link programs which
  use SDL.
+
+Package: libsdl2-dbg
+Architecture: any
+Multi-Arch: same
+Priority: extra
+Section: debug
+Depends: ${misc:Depends},
+         libsdl2 (= ${binary:Version}),
+Description: Simple DirectMedia Layer debug files
+ SDL is a library that allows programs portable low level access to a video
+ framebuffer, audio output, mouse, and keyboard.
+ .
+ This package contains the debug symbols for the SDL library.
diff --git a/debian/sdl2-config.1 b/debian/sdl2-config.1
index 0872a26..c4f4106 100644
--- a/debian/sdl2-config.1
+++ b/debian/sdl2-config.1
@@ -11,7 +11,7 @@ sdl2-config \- script to get information about the installed version of SDL
 .SH DESCRIPTION
 .B sdl2-config
 is a tool that is used to configure and determine the compiler and linker
-flags that should be used to compile and link progams, libraries, and
+flags that should be used to compile and link programs, libraries, and
 plugins that use SDL.  It is also used internally by the m4 macros that are
 included with SDL.
 .SH OPTIONS
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)

-- 
Debian packaging of SDL 1.3

