[Pkg-sdl-commits] [SCM] Debian packaging of SDL 1.3 branch, master, updated. debian/1.3.0_20111204-1-19-g76b49b1

Fri Aug 3 12:20:17 UTC 2012

The following commit has been merged in the master branch:
commit ad42a523c4b7440f8e0d876ee85a28cb0c3562fc
Author: Felix Geyer <fgeyer at debian.org>
Date:   Fri Aug 3 12:33:18 2012 +0200

    Simplify debian/rules by using dh(1).

diff --git a/debian/changelog b/debian/changelog
index 6cd7e45..b817065 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libsdl2 (2.0~20120220c-2) UNRELEASED; urgency=low
 
+  [ Manuel A. Fernandez Montecelo ]
   * debian/control:
     - Updating maintainers/permissions:
       - Add myself and Felix Geyer
@@ -26,6 +27,9 @@ libsdl2 (2.0~20120220c-2) UNRELEASED; urgency=low
     - Complete revamp and detailed research about copyright and licenses used,
       it's very messy and it's still possibly incomplete
 
+  [ Felix Geyer ]
+  * Simplify debian/rules by using dh(1).
+
  -- Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>  Sun, 22 Jul 2012 02:46:35 +0100
 
 libsdl2 (2.0~20120220c-1) experimental; urgency=low
diff --git a/debian/docs b/debian/docs
index b8b2c7e..c7f9629 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,4 +1,4 @@
-BUGS 
-CREDITS 
-README 
+BUGS
+CREDITS
+README
 README-SDL.txt
diff --git a/debian/libsdl2-dev.install b/debian/libsdl2-dev.install
index bd6f4fa..2fc3aa4 100644
--- a/debian/libsdl2-dev.install
+++ b/debian/libsdl2-dev.install
@@ -4,4 +4,3 @@ usr/lib/*/*.so
 usr/lib/*/pkgconfig
 usr/bin/sdl2-config
 usr/share/aclocal/*
-usr/share/man/man3/*
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 373036b..0be0743 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,59 +1,24 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+SHLIBVER = 2.0~20120220c
 
-MAKE=make
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
-# Support multiple makes at once based on number of processors
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-else
-NJOBS := 1
-endif
-
-export SHLIBVER=2.0~20120220b-1
-
-DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_OS	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-export DEB_HOST_GNU_TYPE
-export DEB_BUILD_GNU_TYPE
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-confflags = --prefix=/usr
-confflags += --disable-rpath --enable-sdl-dlopen --disable-loadso \
-	     --disable-video-ggi --disable-video-svga --disable-video-aalib \
-	     --disable-nas --disable-esd --disable-arts \
-	     --disable-alsa-shared --disable-pulseaudio-shared \
-	     --disable-x11-shared \
-	     --enable-video-directfb
+confflags = --disable-rpath --enable-sdl-dlopen --disable-loadso \
+            --disable-video-ggi --disable-video-svga --disable-video-aalib \
+            --disable-nas --disable-esd --disable-arts \
+            --disable-alsa-shared --disable-pulseaudio-shared \
+            --disable-x11-shared \
+            --enable-video-directfb
 all_confflags = --enable-video-caca
 udeb_confflags = --enable-video-directfb \
-		 --disable-video-x11 \
-		 --disable-dga --disable-video-photon \
-		 --disable-video-fbcon --disable-video-ps2gs \
-		 --disable-video-opengl --disable-video-xbios \
-		 --disable-video-gem --disable-video-caca \
-		 --disable-audio \
-		 --disable-oss --disable-alsa --disable-pulseaudio
-confflags += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += --build $(DEB_HOST_GNU_TYPE)
-else
-  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-# Support for DEB_BUILD_OPTIONS
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-  confflags += --enable-debug
-else
-  confflags += --disable-debug
-endif
+                 --disable-video-x11 \
+                 --disable-dga --disable-video-photon \
+                 --disable-video-fbcon --disable-video-ps2gs \
+                 --disable-video-opengl --disable-video-xbios \
+                 --disable-video-gem --disable-video-caca \
+                 --disable-audio \
+                 --disable-oss --disable-alsa --disable-pulseaudio
 
 # Only use NASM routines on x86 CPUs
 ifeq ($(DEB_HOST_ARCH_CPU),i386)
@@ -63,85 +28,40 @@ endif
 # Don't use PlayStation 3 Cell driver on powerpc
 ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
   confflags += --enable-video-ps3=no \
-	       --disable-altivec
+               --disable-altivec
 endif
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	touch configure # Fix timestamp
-	for dir in all udeb; do \
-	    if ( [ "$$dir" = "all" ] ); then \
-	        SWITCHES="$(all_confflags)"; \
-	    elif ( [ "$$dir" = "udeb" ] ); then \
-	        SWITCHES="$(udeb_confflags)"; \
-	    else \
-	        SWITCHES=""; \
-	    fi; \
-	    mkdir -p builddir/$$dir; \
-	    (cd builddir/$$dir; ../../configure $(confflags) $$SWITCHES); \
-	done
-	touch configure-stamp
+%:
+	dh $@ --parallel
 
-build: build-stamp
-build-arch: build
-build-indep: build
-build-stamp: configure-stamp
-	dh_testdir
-	for dir in all udeb; do \
-	    $(MAKE) -j $(NJOBS) -C builddir/$$dir || exit 1; \
-	done
-	touch build-stamp
+override_dh_auto_configure:
+	dh_auto_configure -Bbuilddir/all -- $(confflags) $(all_confflags)
+	dh_auto_configure -Bbuilddir/udeb -- $(confflags) $(udeb_confflags)
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -Rf builddir
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	rm -rf .pc
-	rm -f build-stamp configure-stamp
-	dh_clean
+override_dh_auto_build:
+	dh_auto_build -Bbuilddir/all
+	dh_auto_build -Bbuilddir/udeb
+	tar czf debian/examples.tar.gz test
 
-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) -C builddir/all install DESTDIR=`pwd`/debian/tmp
+override_dh_auto_install:
+	dh_auto_install -Bbuilddir/all
+	dh_auto_install -Bbuilddir/udeb --destdir=debian/tmp-udeb
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+override_dh_auto_clean:
+	dh_auto_clean -Bbuilddir/all
+	dh_auto_clean -Bbuilddir/udeb
+	rm -f debian/examples.tar.gz
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs -A BUGS CREDITS README README-SDL.txt
-	dh_installexamples -plibsdl2-dev test
-	rm debian/libsdl2-dev/usr/share/doc/libsdl2-dev/examples/test/COPYING
-	cd debian/libsdl2-dev/usr/share/doc/libsdl2-dev/examples; \
-	  tar cf examples.tar test; \
-	  rm -rf test
-	#mkdir -p debian/libsdl2-dev/usr/share/man/man3
-	#cd debian/libsdl2-dev/usr/share/doc/libsdl2-dev/docs; \
-	#  mv man3/* ../../../man/man3/; rmdir man3
-	dh_installman -plibsdl2-dev debian/sdl2-config.1
-	dh_installchangelogs
-	dh_install --sourcedir=debian/tmp
-	sed -i -e "s/^dependency_libs=.*/dependency_libs=''/" debian/libsdl2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libSDL2.la
-	dh_install --sourcedir=builddir/udeb/ -plibsdl2-2.0-0-udeb build/.libs/*.so.* usr/lib/$(DEB_HOST_MULTIARCH)/;
-	rm -rf debian/libsdl2-2.0-0/usr/include
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs -V"libsdl2-2.0-0 (>= $(SHLIBVER))" --add-udeb=libsdl2-2.0-0-udeb
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+override_dh_install:
+	dh_install -plibsdl2-2.0-0-udeb --sourcedir=debian/tmp-udeb
+	dh_install --remaining-packages --fail-missing -XlibSDL2.la
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+override_dh_installexamples:
+	dh_installexamples -plibsdl2-dev debian/examples.tar.gz
+	dh_installexamples --remaining-packages
+
+override_dh_strip:
+	dh_strip --dbg-package=libsdl2-dbg
+
+override_dh_makeshlibs:
+	dh_makeshlibs -V"libsdl2-2.0-0 (>= $(SHLIBVER))" --add-udeb=libsdl2-2.0-0-udeb

-- 
Debian packaging of SDL 1.3

