[Pkg-sdl-commits] [SCM] Debian packaging of SDL2 branch, master, updated. debian/1.3.0_20111204-1-45-g9989127

Sun Jan 20 01:59:07 UTC 2013

The following commit has been merged in the master branch:
commit d6b17f3e23c26c1de935f679361f74c875a59510
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sat Jan 19 19:30:40 2013 +0000

    Rename the package back to libsdl2, without the appended 2.0 (lintian warns about SONAME mismatch)

diff --git a/debian/changelog b/debian/changelog
index 0cd2f2f..81a0c19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,7 @@
-libsdl2.0 (2.0.0~20130103-1) UNRELEASED; urgency=low
+libsdl2 (2.0.0~20130103-1) UNRELEASED; urgency=low
 
   [ Manuel A. Fernandez Montecelo ]
   * debian/control:
-    - Rename packages to libsdl2.0, it will be more clear if there are versions
-      with minor releases in the near future
     - Updating maintainers/permissions:
       - Add myself and Felix Geyer
       - Set "DM-Upload-Allowed: yes"
@@ -11,17 +9,17 @@ libsdl2.0 (2.0.0~20130103-1) UNRELEASED; urgency=low
       - Remove a few obsolete items
       - Add items added lately to libsdl1.2, such as libts (touch screen)
         support
-    - Add "libsdl2.0-dbg", analog to libsdl1.2-dbg
+    - 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"
-  * debian/libsdl2.0-dev.install:
+  * debian/libsdl2-dev.install:
     - Remove "usr/lib/*/*.la", discouraged
     - Add man pages: "usr/share/man/man3/*"
-  * debian/libsdl2.0-dev.manpages: add file to install local "sdl2-config.1"
-  * debian/libsdl2.0-dev.doc-base: add doc-base registration
+  * debian/libsdl2-dev.manpages: add file to install local "sdl2-config.1"
+  * debian/libsdl2-dev.doc-base: add doc-base registration
   * debian/sources: Removed, possible obsolete file from long ago?
   * debian/copyright:
     - Upstream updated to zlib/libpng
diff --git a/debian/control b/debian/control
index 25bc71a..267d8ae 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: libsdl2.0
+Source: libsdl2
 Priority: optional
 Section: libs
 Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
@@ -29,7 +29,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-sdl/packages/libsdl2.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-sdl/packages/libsdl2.git
 Homepage: http://www.libsdl.org/
 
-Package: libsdl2.0-2.0-0
+Package: libsdl2-2.0-0
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -43,7 +43,7 @@ Description: Simple DirectMedia Layer
  This version of SDL is compiled with X11, caca and DirectFB graphics
  drivers and OSS, ALSA, NAS and PulseAudio sound drivers.
 
-Package: libsdl2.0-2.0-0-udeb
+Package: libsdl2-2.0-0-udeb
 Package-Type: udeb
 Architecture: any
 Section: debian-installer
@@ -55,11 +55,11 @@ Description: Simple DirectMedia Layer (with directfb graphics and no sound)
  .
  This version of SDL is compiled with directfb graphics and no sound.
 
-Package: libsdl2.0-dev
+Package: libsdl2-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libsdl2.0-2.0-0 (= ${binary:Version}),
+         libsdl2-2.0-0 (= ${binary:Version}),
          libx11-dev,
          libts-dev [linux-any],
          libglu1-mesa-dev,
@@ -79,13 +79,13 @@ Description: Simple DirectMedia Layer development files
  This package contains the files needed to compile and link programs which
  use SDL.
 
-Package: libsdl2.0-dbg
+Package: libsdl2-dbg
 Architecture: any
 Multi-Arch: same
 Priority: extra
 Section: debug
 Depends: ${misc:Depends},
-         libsdl2.0-2.0-0 (= ${binary:Version}),
+         libsdl2-2.0-0 (= ${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.
diff --git a/debian/libsdl2.0-2.0-0-udeb.install b/debian/libsdl2-2.0-0-udeb.install
similarity index 100%
rename from debian/libsdl2.0-2.0-0-udeb.install
rename to debian/libsdl2-2.0-0-udeb.install
diff --git a/debian/libsdl2.0-2.0-0.install b/debian/libsdl2-2.0-0.install
similarity index 100%
rename from debian/libsdl2.0-2.0-0.install
rename to debian/libsdl2-2.0-0.install
diff --git a/debian/libsdl2.0-dev.doc-base b/debian/libsdl2-dev.doc-base
similarity index 79%
rename from debian/libsdl2.0-dev.doc-base
rename to debian/libsdl2-dev.doc-base
index 30db545..0c5bf04 100644
--- a/debian/libsdl2.0-dev.doc-base
+++ b/debian/libsdl2-dev.doc-base
@@ -1,4 +1,4 @@
-Document: libsdl2.0-dev
+Document: libsdl2-dev
 Title: SDL Documentation
 Author: Sam Lantinga <slouken at libsdl.org>
 Abstract: The SDL library is designed to make it easy to write games that
@@ -10,5 +10,5 @@ Abstract: The SDL library is designed to make it easy to write games that
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libsdl2.0-dev/docs/index.html
-Files: /usr/share/doc/libsdl2.0-dev/docs/html/*.html
+Index: /usr/share/doc/libsdl2-dev/docs/index.html
+Files: /usr/share/doc/libsdl2-dev/docs/html/*.html
diff --git a/debian/libsdl2.0-dev.install b/debian/libsdl2-dev.install
similarity index 100%
rename from debian/libsdl2.0-dev.install
rename to debian/libsdl2-dev.install
diff --git a/debian/libsdl2.0-dev.manpages b/debian/libsdl2-dev.manpages
similarity index 100%
rename from debian/libsdl2.0-dev.manpages
rename to debian/libsdl2-dev.manpages
diff --git a/debian/rules b/debian/rules
index a454727..04458ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,15 +53,15 @@ override_dh_auto_clean:
 	rm -f debian/examples.tar.gz
 
 override_dh_install:
-	dh_install -plibsdl2.0-2.0-0-udeb --sourcedir=debian/tmp-udeb
+	dh_install -plibsdl2-2.0-0-udeb --sourcedir=debian/tmp-udeb
 	dh_install --remaining-packages --fail-missing -XlibSDL2.la
 
 override_dh_installexamples:
-	dh_installexamples -plibsdl2.0-dev debian/examples.tar.gz
+	dh_installexamples -plibsdl2-dev debian/examples.tar.gz
 	dh_installexamples --remaining-packages
 
 override_dh_strip:
-	dh_strip --dbg-package=libsdl2.0-dbg
+	dh_strip --dbg-package=libsdl2-dbg
 
 override_dh_makeshlibs:
-	dh_makeshlibs -V"libsdl2.0-2.0-0 (>= $(SHLIBVER))" --add-udeb=libsdl2.0-2.0-0-udeb
+	dh_makeshlibs -V"libsdl2-2.0-0 (>= $(SHLIBVER))" --add-udeb=libsdl2-2.0-0-udeb

-- 
Debian packaging of SDL2

