r12546 - packages/trunk/libclaw/debian

[Bruno Fuddl-guestquot; Fuddl" Kleinert]

Author: fuddl-guest
Date: 2011-07-20 11:55:25 +0000 (Wed, 20 Jul 2011)
New Revision: 12546

Modified:
   packages/trunk/libclaw/debian/changelog
   packages/trunk/libclaw/debian/control
   packages/trunk/libclaw/debian/rules
Log:
Prepare for libjpeg transition

Build-depend on libjpeg-dev instead of libjpeg62-dev. Same for
libclaw-graphic-dev.

Don't remove a java script file in usr/share/doc/libclaw/html as it's
apperently not installed. The failed rm command rendered the package FTBFS.
Hopefully I didn't break anything else ;)


Modified: packages/trunk/libclaw/debian/changelog
===================================================================
--- packages/trunk/libclaw/debian/changelog	2011-07-19 23:16:57 UTC (rev 12545)
+++ packages/trunk/libclaw/debian/changelog	2011-07-20 11:55:25 UTC (rev 12546)
@@ -1,3 +1,16 @@
+libclaw (1.6.1-5) unstable; urgency=low
+
+  * Team upload.
+  * Prepare for libjpeg8 transition. Build-depend on libjpeg-dev instead of
+    libjpeg62-dev. Make libclaw-graphic-dev depend on libjpeg-dev instead of
+    libjpeg62-dev. (Closes: #629960)
+  * Comment out removal of
+    $(CURDIR)/debian/tmp/usr/share/doc/libclaw1/html/jquery.js in
+    debian/rules as it's apperently not installed there at all and lead to a
+    FTBFS.
+
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Wed, 20 Jul 2011 13:45:24 +0200
+
 libclaw (1.6.1-4) unstable; urgency=low
 
   [ Julien Jorge ]

Modified: packages/trunk/libclaw/debian/control
===================================================================
--- packages/trunk/libclaw/debian/control	2011-07-19 23:16:57 UTC (rev 12545)
+++ packages/trunk/libclaw/debian/control	2011-07-20 11:55:25 UTC (rev 12546)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Julien Jorge <julien.jorge at gamned.org>, Barry deFreese <bdefreese at debian.org>
 Build-Depends: quilt, docbook-to-man, debhelper (>= 5), cmake (>= 2.8),
- libjpeg62-dev (>=6b), libpng12-dev (>= 1.2.8), doxygen (>= 1.5),
+ libjpeg-dev, libpng12-dev (>= 1.2.8), doxygen (>= 1.5),
  gettext (>= 0.17)
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/libclaw/
@@ -143,7 +143,7 @@
 Section: libdevel
 Architecture: any
 Depends: libclaw-dev (= ${binary:Version}),
- libclaw-graphic1 (= ${binary:Version}), libjpeg62-dev (>=6b),
+ libclaw-graphic1 (= ${binary:Version}), libjpeg-dev,
  libpng12-dev (>= 1.2.8), ${misc:Depends}
 Homepage: http://libclaw.sourceforge.net/
 Description: Set of classes for image manipulation (development files)

Modified: packages/trunk/libclaw/debian/rules
===================================================================
--- packages/trunk/libclaw/debian/rules	2011-07-19 23:16:57 UTC (rev 12545)
+++ packages/trunk/libclaw/debian/rules	2011-07-20 11:55:25 UTC (rev 12546)
@@ -49,7 +49,7 @@
 	find . -name "*-static.a" | while read f; do \
 	  mv $$f `echo $$f | sed s/-static//`; \
 	done
-	rm $(CURDIR)/debian/tmp/usr/share/doc/libclaw1/html/jquery.js
+	#rm $(CURDIR)/debian/tmp/usr/share/doc/libclaw1/html/jquery.js
 	ln -s /usr/share/javascript/jquery/jquery.js \
 	  $(CURDIR)/debian/tmp/usr/share/doc/libclaw1/html/jquery.js
 	docbook-to-man debian/claw-config.man.sgml > debian/claw-config.1