[Pkg-sdl-commits] r105 - unstable/libsdl1.2/debian

[Samuel Hocevar]

Author: sho
Date: 2006-10-30 09:30:46 +0100 (Mon, 30 Oct 2006)
New Revision: 105

Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/control
   unstable/libsdl1.2/debian/rules
Log:
libsdl1.2 (1.2.11-6) unstable; urgency=high

  * debian/rules:
    + Empty libSDL.la's dependency_libs (Closes: #396063).
  * debian/control:
    + Only recommend -dev packages, because they are not required for
      dynamic linking.
    + Add libcaca-dev and libcucul-dev to the -dev package's Recommends.

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 30 Oct 2006 08:05:00 +0100


Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2006-10-24 07:09:02 UTC (rev 104)
+++ unstable/libsdl1.2/debian/changelog	2006-10-30 08:30:46 UTC (rev 105)
@@ -1,3 +1,21 @@
+libsdl1.2 (1.2.11-6) unstable; urgency=high
+
+  * debian/rules:
+    + Empty libSDL.la's dependency_libs (Closes: #396063).
+  * debian/control:
+    + Only recommend -dev packages, because they are not required for
+      dynamic linking.
+    + Add libcaca-dev and libcucul-dev to the -dev package's Recommends.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 30 Oct 2006 08:05:00 +0100
+
+libsdl1.2 (1.2.11-5) unstable; urgency=low
+
+  * debian/rules:
+    + Install manpages in the correct location (Closes: #386558).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Tue, 24 Oct 2006 11:39:12 +0200
+
 libsdl1.2 (1.2.11-4) unstable; urgency=low
 
   * debian/rules:

Modified: unstable/libsdl1.2/debian/control
===================================================================
--- unstable/libsdl1.2/debian/control	2006-10-24 07:09:02 UTC (rev 104)
+++ unstable/libsdl1.2/debian/control	2006-10-30 08:30:46 UTC (rev 105)
@@ -118,7 +118,8 @@
 Package: libsdl1.2-dev
 Architecture: any
 Section: libdevel
-Depends: libsdl1.2debian (= ${Source-Version}), libxt-dev, libxext-dev, libglu1-xorg-dev | libglu-dev, ${libsvga1-dev}, ${libasound2-dev}, libaa1-dev, libaudio-dev, libartsc0-dev, libesd0-dev, libdirectfb-dev (>= 0.9.22), ${libusbhid-dev}
+Depends: libsdl1.2debian (= ${Source-Version})
+Recommends: libxt-dev, libxext-dev, libglu1-xorg-dev | libglu-dev, ${libsvga1-dev}, ${libasound2-dev}, libaa1-dev, libaudio-dev, libartsc0-dev, libesd0-dev, libdirectfb-dev (>= 0.9.22), ${libusbhid-dev}, libcaca-dev, libcucul-dev
 Replaces: libsdl-dev, libsdl0.11-dev, libsdl1.0-dev, libsdl1.1-dev
 Conflicts: xlibs-pic (<< 4.1.0-10), libsdl-dev, libsdl0.11-dev, libsdl0.11, libsdl1.0-dev, libsdl1.1-dev
 Provides: libsdl-dev

Modified: unstable/libsdl1.2/debian/rules
===================================================================
--- unstable/libsdl1.2/debian/rules	2006-10-24 07:09:02 UTC (rev 104)
+++ unstable/libsdl1.2/debian/rules	2006-10-30 08:30:46 UTC (rev 105)
@@ -55,7 +55,7 @@
 else
   all_confflags += --disable-video-svga
 endif
-# Only depends on libusbhid-dev on GNU/kFreeBSd
+# Only depends on libusbhid-dev on GNU/kFreeBSD
 ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
   LIBUSBHID-DEV = libusbhid-dev
 endif
@@ -133,13 +133,16 @@
 	dh_installdocs -A BUGS CREDITS README README-SDL.txt
 	dh_installexamples -plibsdl1.2-dev test
 	rm debian/libsdl1.2-dev/usr/share/doc/libsdl1.2-dev/examples/test/COPYING
-#	rm debian/libsdl1.2-dev/usr/share/doc/libsdl1.2-dev/examples/test/.cvsignore
 	cd debian/libsdl1.2-dev/usr/share/doc/libsdl1.2-dev/examples; \
-	tar cf examples.tar test; \
-	rm -rf test
+	  tar cf examples.tar test; \
+	  rm -rf test
+	mkdir -p debian/libsdl1.2-dev/usr/share/man/man3
+	cd debian/libsdl1.2-dev/usr/share/doc/libsdl1.2-dev/docs; \
+	  mv man3/* ../../../man/man3/; rmdir man3
 	dh_installman -plibsdl1.2-dev debian/sdl-config.1
 	dh_installchangelogs
 	dh_install --sourcedir=debian/tmp
+	sed -i -e "s/^dependency_libs=.*/dependency_libs=''/" debian/libsdl1.2-dev/usr/lib/libSDL.la
 	for dir in $(FLAVOURS) udeb; do \
 	    dh_install --sourcedir=builddir/$$dir/ -plibsdl1.2debian-$$dir build/.libs/*.so.* usr/lib/; \
 	done