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

[Aurelien Jarno]

Author: aurel32
Date: 2007-03-05 21:01:40 +0000 (Mon, 05 Mar 2007)
New Revision: 124

Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/control
   unstable/libsdl1.2/debian/rules
Log:
Simplify a bit debian/control and debian/rules



Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2007-03-05 20:56:57 UTC (rev 123)
+++ unstable/libsdl1.2/debian/changelog	2007-03-05 21:01:40 UTC (rev 124)
@@ -2,9 +2,12 @@
 
   [ Aurelien Jarno ]
   * debian/control:
-    + Make the package binNMU safe. 
+    + Make the package binNMU safe.
+    + Use architectures in the depends line instead of variables.
+  * debian/rules:
+    + Remove the variables in the dh_gencontrol call.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Mon,  5 Mar 2007 21:56:36 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon,  5 Mar 2007 22:00:25 +0100
 
 libsdl1.2 (1.2.11-8) unstable; urgency=high
 

Modified: unstable/libsdl1.2/debian/control
===================================================================
--- unstable/libsdl1.2/debian/control	2007-03-05 20:56:57 UTC (rev 123)
+++ unstable/libsdl1.2/debian/control	2007-03-05 21:01:40 UTC (rev 124)
@@ -120,7 +120,7 @@
 Architecture: any
 Section: libdevel
 Depends: libsdl1.2debian (= ${binary:Version}), libx11-dev, libglu1-xorg-dev | libglu-dev
-Recommends: libxt-dev, libxext-dev, ${libsvga1-dev}, ${libasound2-dev}, libaa1-dev, libaudio-dev, libartsc0-dev, libesd0-dev, libdirectfb-dev (>= 0.9.22), ${libusbhid-dev}, libcaca-dev, libcucul-dev
+Recommends: libxt-dev, libxext-dev, libsvga1-dev [amd64 i386], libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libaa1-dev, libaudio-dev, libartsc0-dev, libesd0-dev, libdirectfb-dev (>= 0.9.22), libusbhid-dev [kfreebsd-i386 kfreebsd-amd64], 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	2007-03-05 20:56:57 UTC (rev 123)
+++ unstable/libsdl1.2/debian/rules	2007-03-05 21:01:40 UTC (rev 124)
@@ -51,14 +51,9 @@
 # Only build SVGA support on linux-x86 and linux-amd64
 ifneq (,$(findstring $(DEB_BUILD_ARCH),amd64 i386))
   all_confflags += --enable-video-svga
-  LIBSVGA1-DEV = libsvga1-dev
 else
   all_confflags += --disable-video-svga
 endif
-# Only depends on libusbhid-dev on GNU/kFreeBSD
-ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
-  LIBUSBHID-DEV = libusbhid-dev
-endif
 # Only use NASM routines on x86 CPUs
 ifeq ($(DEB_BUILD_ARCH_CPU),i386)
   confflags += --enable-nasm
@@ -67,10 +62,8 @@
 # Only build ALSA support on Linux targets
 ifeq ($(DEB_BUILD_ARCH_OS),linux)
   FLAVOURS += alsa
-  LIBASOUND2-DEV = libasound2-dev
   no_libasound =
 else
-  LIBASOUND2-DEV =
   no_libasound = -Nlibsdl1.2debian-alsa
 endif
 
@@ -155,7 +148,7 @@
 	for dir in all $(FLAVOURS) udeb; do echo "libSDL-1.2 0 libsdl1.2debian $$SHLIBVER" > debian/libsdl1.2debian-$$dir/DEBIAN/shlibs; done
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol $(no_libasound) -- -Vlibsvga1-dev=$(LIBSVGA1-DEV) -Vlibasound2-dev=$(LIBASOUND2-DEV) -Vlibusbhid-dev=$(LIBUSBHID-DEV)
+	dh_gencontrol $(no_libasound) 
 	dh_md5sums
 	dh_builddeb $(no_libasound)