[clanlib] 29/40: Prepare for libjpeg8 transition

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository clanlib.

commit a418e66493df2b141777177f1ba7e08c72f30f6f
Author: Bruno "Fuddl" Kleinert <fuddl at debian.org>
Date:   Wed Jul 13 14:01:21 2011 +0000

    Prepare for libjpeg8 transition
    
    Build-depend on libjpeg-dev and make libclanlib-dev depend on libjpeg-dev
    
    Add 300_log_h.diff from the previous debian revision to subversion. It seemed to
    me as if someone forgot to put that patch into trunk.
---
 debian/changelog              | 10 ++++++++++
 debian/control                |  4 ++--
 debian/patches/300_log_h.diff | 12 ++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 218bf01..8fb2fcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+clanlib (1.0~svn3827-3) unstable; urgency=low
+
+  * Team upload.
+  * Prepare for libjpeg8 transition. Thanks to Bill Allombert to point this
+    out! (Closes: #633548)
+    * No longer build-depend on libjpeg62-deb but libjpeg-dev
+    * libclanlib-dev no longer recommends libjpeg62-dev but libjpeg-dev
+
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Wed, 13 Jul 2011 13:44:07 +0200
+
 clanlib (1.0~svn3827-2) unstable; urgency=low
 
   [ Barry deFreese ]
diff --git a/debian/control b/debian/control
index ecb9b59..b6cc897 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Sam Hocevar <sho at debian.org>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 5.0), quilt, autoconf, automake, libtool, bzip2, libesd0-dev, libfreetype6-dev, libglu1-mesa-dev | libgl-dev, libjpeg62-dev, libmikmod2-dev, libpng12-dev, libvorbis-dev (>= 1.0.0-3), libxt-dev, libxxf86vm-dev, pkg-config, zlib1g-dev, libxmu-dev, libxi-dev, libsdl1.2-dev, libsdl-gfx1.2-dev, xsltproc, libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386]
+Build-Depends: debhelper (>= 5.0), quilt, autoconf, automake, libtool, bzip2, libesd0-dev, libfreetype6-dev, libglu1-mesa-dev | libgl-dev, libjpeg-dev, libmikmod2-dev, libpng12-dev, libvorbis-dev (>= 1.0.0-3), libxt-dev, libxxf86vm-dev, pkg-config, zlib1g-dev, libxmu-dev, libxi-dev, libsdl1.2-dev, libsdl-gfx1.2-dev, xsltproc, libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386]
 Build-Conflicts: libutahglx-dev
 Standards-Version: 3.8.3
 Homepage: http://www.clanlib.org/
@@ -53,7 +53,7 @@ Package: libclanlib-dev
 Section: libdevel
 Architecture: any
 Depends: libclanapp-1.0 (= ${binary:Version}), libclansdl-1.0 (= ${binary:Version}), ${misc:Depends}
-Recommends: libfreetype6-dev, libglu1-mesa-dev | xlibmesa-dev | libgl-dev, libjpeg62-dev, libmikmod2-dev, libpng12-0-dev, libvorbis-dev
+Recommends: libfreetype6-dev, libglu1-mesa-dev | xlibmesa-dev | libgl-dev, libjpeg-dev, libmikmod2-dev, libpng12-0-dev, libvorbis-dev
 Conflicts: clanlib0-common, libutahglx-dev, clanlib2 (<< 0.6.1-1-3), clanlib-dev
 Provides: clanlib-dev
 Replaces: clanlib-dev
diff --git a/debian/patches/300_log_h.diff b/debian/patches/300_log_h.diff
new file mode 100644
index 0000000..760cf70
--- /dev/null
+++ b/debian/patches/300_log_h.diff
@@ -0,0 +1,12 @@
+Index: clanlib-1.0~svn3827/Sources/API/Makefile.am
+===================================================================
+--- clanlib-1.0~svn3827.orig/Sources/API/Makefile.am	2009-09-23 22:05:10.000000000 -0400
++++ clanlib-1.0~svn3827/Sources/API/Makefile.am	2009-09-23 22:05:47.000000000 -0400
+@@ -244,7 +244,6 @@
+ 	Core/System/system.h \
+ 	Core/System/thread.h \
+ 	Core/System/cl_assert.h \
+-	Core/System/log.h \
+ 	Core/System/cl_library.h \
+ 	Core/System/clonable.h \
+ 	Core/System/lazycopyptr.h \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/clanlib.git