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

[Samuel Hocevar]

Author: sho
Date: 2006-08-13 17:28:10 +0000 (Sun, 13 Aug 2006)
New Revision: 89

Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/rules
Log:
libsdl1.2 (1.2.11-3) unstable; urgency=low

  * debian/rules:
    + Factored the udeb rules.


Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2006-08-13 17:03:55 UTC (rev 88)
+++ unstable/libsdl1.2/debian/changelog	2006-08-13 17:28:10 UTC (rev 89)
@@ -1,10 +1,13 @@
 libsdl1.2 (1.2.11-3) unstable; urgency=low
 
+  * debian/rules:
+    + Factored the udeb rules.
+
   * debian/patches/017_x11_keytounicode.diff:
     + New patch. Export X11_KeyToUnicode() to legacy applications, but warn
       about such usage to stderr (Closes: #376560).
 
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sun, 13 Aug 2006 11:02:14 +0200
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sun, 13 Aug 2006 19:03:51 +0200
 
 libsdl1.2 (1.2.11-2) unstable; urgency=low
 

Modified: unstable/libsdl1.2/debian/rules
===================================================================
--- unstable/libsdl1.2/debian/rules	2006-08-13 17:03:55 UTC (rev 88)
+++ unstable/libsdl1.2/debian/rules	2006-08-13 17:28:10 UTC (rev 89)
@@ -32,7 +32,7 @@
 		 --disable-audio --disable-audio-arts --disable-audio-esd \
 		 --disable-audio-oss --disable-audio-nas --disable-audio-alsa
 
-SOUNDS = arts esd oss nas
+FLAVOURS = arts esd oss nas
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   confflags += --build $(DEB_HOST_GNU_TYPE)
@@ -65,7 +65,7 @@
 
 # Only build ALSA support on Linux targets
 ifeq ($(DEB_BUILD_ARCH_OS),linux)
-  SOUNDS += alsa
+  FLAVOURS += alsa
   LIBASOUND2-DEV = libasound2-dev
   no_libasound =
 else
@@ -78,31 +78,31 @@
 	dh_testdir
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	touch configure # Fix timestamp
-	for sound in all $(SOUNDS); do \
-	    if ( [ "$$sound" = "all" ] ); then \
+	for dir in all $(FLAVOURS) udeb; do \
+	    if ( [ "$$dir" = "all" ] ); then \
 	        SWITCHES="$(all_confflags)"; \
+	    elif ( [ "$$dir" = "udeb" ] ); then \
+	        SWITCHES="$(udeb_confflags)"; \
 	    else \
 	        SWITCHES=""; \
-	        for switch in $(SOUNDS); do \
-	            if ( [ "$$sound" = "$$switch" ] ); then \
+	        for switch in $(FLAVOURS); do \
+	            if ( [ "$$dir" = "$$switch" ] ); then \
 	                SWITCHES="$$SWITCHES --enable-$$switch"; \
 	            else \
 	                SWITCHES="$$SWITCHES --disable-$$switch"; \
 	            fi; \
 	        done; \
 	    fi; \
-	    mkdir -p builddir/$$sound; \
-	    (cd builddir/$$sound; ../../configure $(confflags) $$SWITCHES); \
+	    mkdir -p builddir/$$dir; \
+	    (cd builddir/$$dir; ../../configure $(confflags) $$SWITCHES); \
 	done
-	mkdir -p builddir/udeb
-	(cd builddir/udeb; ../../configure $(confflags) $(udeb_confflags))
 	touch configure-stamp
 
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	for sound in all $(SOUNDS) udeb; do \
-	    $(MAKE) -C builddir/$$sound || exit 1; \
+	for dir in all $(FLAVOURS) udeb; do \
+	    $(MAKE) -C builddir/$$dir || exit 1; \
 	done
 	touch build-stamp
 
@@ -139,19 +139,17 @@
 	dh_installman -plibsdl1.2-dev debian/sdl-config.1
 	dh_installchangelogs
 	dh_install --sourcedir=debian/tmp
-	for sound in $(SOUNDS); do \
-	    dh_install --sourcedir=builddir/$$sound/ -plibsdl1.2debian-$$sound build/.libs/*.so.* usr/lib/; \
+	for dir in $(FLAVOURS) udeb; do \
+	    dh_install --sourcedir=builddir/$$dir/ -plibsdl1.2debian-$$dir build/.libs/*.so.* usr/lib/; \
 	done
-	dh_install --sourcedir=builddir/udeb/ -plibsdl1.2debian-udeb build/.libs/*.so.* usr/lib/
 	rm -rf debian/libsdl1.2debian/usr/include
 	rm -rf debian/libsdl1.2-dev/usr/share/doc/libsdl1.2-dev/docs/man3
 	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs
-	for sound in all $(SOUNDS); do echo "libSDL-1.2 0 libsdl1.2debian $$SHLIBVER" > debian/libsdl1.2debian-$$sound/DEBIAN/shlibs; done
 	mkdir -p debian/libsdl1.2debian-udeb/DEBIAN
-	echo "libSDL-1.2 0 libsdl1.2debian $$SHLIBVER" > debian/libsdl1.2debian-udeb/DEBIAN/shlibs
+	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)