[SCM] directfb/experimental: Use dh's --builddir and multi-archify packages
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sat Dec 31 10:53:08 UTC 2016
The following commit has been merged in the experimental branch:
commit 31b21496a30386bfabca3ec5f8c25a1f90e02c04
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sat Dec 31 11:08:59 2016 +0100
Use dh's --builddir and multi-archify packages
diff --git a/debian/control b/debian/control
index 1fdcf8d..82fe592 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Priority: optional
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
Uploaders: Sebastian Ramacher <sramacher at debian.org>
Build-Depends: debhelper (>= 10),
+ dh-exec,
pkg-config,
libfreetype6-dev,
libjpeg-dev,
diff --git a/debian/libdirectfb-1.4-0.install b/debian/libdirectfb-1.4-0.install
old mode 100644
new mode 100755
index 755a417..bcf1e43
--- a/debian/libdirectfb-1.4-0.install
+++ b/debian/libdirectfb-1.4-0.install
@@ -1,13 +1,17 @@
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_default.so
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-usr/lib/directfb-*/systems/libdirectfb_devmem.so
-usr/lib/directfb-*/wm/libdirectfbwm_default.so
-usr/lib/directfb-*/wm/libdirectfbwm_unique.so
-usr/lib/libdirect-*.so.*
-usr/lib/libdirectfb-*.so.*
-usr/lib/libfusion-*.so.*
-usr/lib/libuniquewm-*.so.*
+#! /usr/bin/dh-exec
+usr/lib/*/directfb-*/*drivers/*.so
+usr/lib/*/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_default.so
+usr/lib/*/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
+usr/lib/*/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
+usr/lib/*/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
+usr/lib/*/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
+[linux] usr/lib/*/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
+usr/lib/*/directfb-*/systems/libdirectfb_devmem.so
+[linux] usr/lib/*/directfb-*/systems/libdirectfb_fbdev.so
+usr/lib/*/directfb-*/wm/libdirectfbwm_default.so
+usr/lib/*/directfb-*/wm/libdirectfbwm_unique.so
+usr/lib/*/libdirect-*.so.*
+usr/lib/*/libdirectfb-*.so.*
+usr/lib/*/libfusion-*.so.*
+usr/lib/*/libuniquewm-*.so.*
usr/share/directfb-*/cursor.dat
diff --git a/debian/libdirectfb-1.4-0.install.amd64 b/debian/libdirectfb-1.4-0.install.amd64
deleted file mode 100644
index 9790850..0000000
--- a/debian/libdirectfb-1.4-0.install.amd64
+++ /dev/null
@@ -1,44 +0,0 @@
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ati128.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_cyber5k.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ep9x.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_gl.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_i810.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_i830.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_mach64.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_matrox.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_neomagic.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nsc.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nvidia.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_pxa3xx.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_radeon.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_savage.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_sis315.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_tdfx.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_unichrome.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_vmware.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_joystick.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_keyboard.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_linux_input.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_lirc.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_mutouch.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_penmount.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_ps2mouse.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_serialmouse.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_sonypi.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_wm97xx_ts.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_zytronic.so
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_default.so
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
-usr/lib/directfb-*/systems/libdirectfb_devmem.so
-usr/lib/directfb-*/systems/libdirectfb_fbdev.so
-usr/lib/directfb-*/wm/libdirectfbwm_default.so
-usr/lib/directfb-*/wm/libdirectfbwm_unique.so
-usr/lib/libdirect-*.so.*
-usr/lib/libdirectfb-*.so.*
-usr/lib/libfusion-*.so.*
-usr/lib/libuniquewm-*.so.*
-usr/share/directfb-*/cursor.dat
diff --git a/debian/libdirectfb-1.4-0.install.armel b/debian/libdirectfb-1.4-0.install.armel
deleted file mode 100644
index 9f16f6b..0000000
--- a/debian/libdirectfb-1.4-0.install.armel
+++ /dev/null
@@ -1,43 +0,0 @@
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ati128.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_cyber5k.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_davinci.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ep9x.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_gl.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_mach64.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_matrox.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nsc.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nvidia.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_omap.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_pxa3xx.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_radeon.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_sis315.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_tdfx.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_vmware.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_joystick.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_keyboard.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_linux_input.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_lirc.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_mutouch.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_penmount.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_ps2mouse.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_serialmouse.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_sonypi.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_ucb1x00_ts.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_wm97xx_ts.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_zytronic.so
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_default.so
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
-usr/lib/directfb-*/systems/libdirectfb_devmem.so
-usr/lib/directfb-*/systems/libdirectfb_fbdev.so
-usr/lib/directfb-*/wm/libdirectfbwm_default.so
-usr/lib/directfb-*/wm/libdirectfbwm_unique.so
-usr/lib/libdavinci_c64x.so.*
-usr/lib/libdirect-*.so.*
-usr/lib/libdirectfb-*.so.*
-usr/lib/libfusion-*.so.*
-usr/lib/libuniquewm-*.so.*
-usr/share/directfb-*/cursor.dat
diff --git a/debian/libdirectfb-1.4-0.install.i386 b/debian/libdirectfb-1.4-0.install.i386
deleted file mode 100644
index 9790850..0000000
--- a/debian/libdirectfb-1.4-0.install.i386
+++ /dev/null
@@ -1,44 +0,0 @@
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ati128.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_cyber5k.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ep9x.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_gl.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_i810.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_i830.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_mach64.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_matrox.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_neomagic.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nsc.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nvidia.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_pxa3xx.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_radeon.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_savage.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_sis315.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_tdfx.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_unichrome.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_vmware.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_joystick.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_keyboard.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_linux_input.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_lirc.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_mutouch.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_penmount.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_ps2mouse.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_serialmouse.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_sonypi.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_wm97xx_ts.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_zytronic.so
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_default.so
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
-usr/lib/directfb-*/systems/libdirectfb_devmem.so
-usr/lib/directfb-*/systems/libdirectfb_fbdev.so
-usr/lib/directfb-*/wm/libdirectfbwm_default.so
-usr/lib/directfb-*/wm/libdirectfbwm_unique.so
-usr/lib/libdirect-*.so.*
-usr/lib/libdirectfb-*.so.*
-usr/lib/libfusion-*.so.*
-usr/lib/libuniquewm-*.so.*
-usr/share/directfb-*/cursor.dat
diff --git a/debian/libdirectfb-1.4-0.install.linux b/debian/libdirectfb-1.4-0.install.linux
deleted file mode 100644
index 838a1cf..0000000
--- a/debian/libdirectfb-1.4-0.install.linux
+++ /dev/null
@@ -1,39 +0,0 @@
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ati128.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_cyber5k.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ep9x.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_gl.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_mach64.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_matrox.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nsc.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nvidia.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_pxa3xx.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_radeon.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_sis315.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_tdfx.so
-usr/lib/directfb-*/gfxdrivers/libdirectfb_vmware.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_joystick.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_keyboard.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_linux_input.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_lirc.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_mutouch.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_penmount.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_ps2mouse.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_serialmouse.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_sonypi.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_wm97xx_ts.so
-usr/lib/directfb-*/inputdrivers/libdirectfb_zytronic.so
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_default.so
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
-usr/lib/directfb-*/systems/libdirectfb_devmem.so
-usr/lib/directfb-*/systems/libdirectfb_fbdev.so
-usr/lib/directfb-*/wm/libdirectfbwm_default.so
-usr/lib/directfb-*/wm/libdirectfbwm_unique.so
-usr/lib/libdirect-*.so.*
-usr/lib/libdirectfb-*.so.*
-usr/lib/libfusion-*.so.*
-usr/lib/libuniquewm-*.so.*
-usr/share/directfb-*/cursor.dat
diff --git a/debian/libdirectfb-dev.install b/debian/libdirectfb-dev.install
index c194ce1..0045de0 100644
--- a/debian/libdirectfb-dev.install
+++ b/debian/libdirectfb-dev.install
@@ -15,28 +15,17 @@ usr/include/directfb/direct/*.h
usr/include/directfb/fusion/*.h
usr/include/directfb/fusion/shm/*.h
usr/include/directfb/unique/*.h
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_default.a
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_dgiff.a
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_ft2.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.a
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.a
-usr/lib/directfb-*/systems/libdirectfb_devmem.a
-usr/lib/directfb-*/systems/libdirectfb_x11.a
-usr/lib/directfb-*/wm/libdirectfbwm_default.a
-usr/lib/directfb-*/wm/libdirectfbwm_unique.a
-usr/lib/libdirect.a
-usr/lib/libdirect.so
-usr/lib/libdirectfb.a
-usr/lib/libdirectfb.so
-usr/lib/libfusion.a
-usr/lib/libfusion.so
-usr/lib/libuniquewm.a
-usr/lib/libuniquewm.so
-usr/lib/pkgconfig/direct.pc
-usr/lib/pkgconfig/directfb-internal.pc
-usr/lib/pkgconfig/directfb.pc
-usr/lib/pkgconfig/fusion.pc
+usr/lib/*/directfb-*/interfaces/IDirectFBFont/*.a
+usr/lib/*/directfb-*/interfaces/IDirectFBImageProvider/*.a
+usr/lib/*/directfb-*/systems/*.a
+usr/lib/*/directfb-*/wm/*.a
+usr/lib/*/libdirect.a
+usr/lib/*/libdirect.so
+usr/lib/*/libdirectfb.a
+usr/lib/*/libdirectfb.so
+usr/lib/*/libfusion.a
+usr/lib/*/libfusion.so
+usr/lib/*/libuniquewm.a
+usr/lib/*/libuniquewm.so
+usr/lib/*/pkgconfig
usr/share/man/man1/directfb-csource.1
diff --git a/debian/libdirectfb-dev.install.amd64 b/debian/libdirectfb-dev.install.amd64
deleted file mode 100644
index 399ca13..0000000
--- a/debian/libdirectfb-dev.install.amd64
+++ /dev/null
@@ -1,74 +0,0 @@
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/include/directfb-internal/*.h
-usr/include/directfb-internal/core/*.h
-usr/include/directfb-internal/devmem/*.h
-usr/include/directfb-internal/display/*.h
-usr/include/directfb-internal/fbdev/*.h
-usr/include/directfb-internal/gfx/*.h
-usr/include/directfb-internal/gfx/generic/*.h
-usr/include/directfb-internal/input/*.h
-usr/include/directfb-internal/media/*.h
-usr/include/directfb-internal/misc/*.h
-usr/include/directfb-internal/windows/*.h
-usr/include/directfb/*.h
-usr/include/directfb/direct/*.h
-usr/include/directfb/fusion/*.h
-usr/include/directfb/fusion/shm/*.h
-usr/include/directfb/unique/*.h
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ati128.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_cyber5k.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ep9x.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_gl.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_i810.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_i830.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_mach64.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_matrox.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_neomagic.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nsc.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nvidia.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_pxa3xx.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_radeon.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_savage.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_sis315.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_tdfx.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_unichrome.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_vmware.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_joystick.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_keyboard.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_linux_input.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_lirc.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_mutouch.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_penmount.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_ps2mouse.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_serialmouse.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_sonypi.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_wm97xx_ts.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_zytronic.a
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_default.a
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_dgiff.a
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_ft2.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.a
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.a
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.a
-usr/lib/directfb-*/systems/libdirectfb_devmem.a
-usr/lib/directfb-*/systems/libdirectfb_fbdev.a
-usr/lib/directfb-*/systems/libdirectfb_x11.a
-usr/lib/directfb-*/wm/libdirectfbwm_default.a
-usr/lib/directfb-*/wm/libdirectfbwm_unique.a
-usr/lib/libdirect.a
-usr/lib/libdirect.so
-usr/lib/libdirectfb.a
-usr/lib/libdirectfb.so
-usr/lib/libfusion.a
-usr/lib/libfusion.so
-usr/lib/libuniquewm.a
-usr/lib/libuniquewm.so
-usr/lib/pkgconfig/direct.pc
-usr/lib/pkgconfig/directfb-internal.pc
-usr/lib/pkgconfig/directfb.pc
-usr/lib/pkgconfig/fusion.pc
-usr/share/man/man1/directfb-csource.1
diff --git a/debian/libdirectfb-dev.install.armel b/debian/libdirectfb-dev.install.armel
deleted file mode 100644
index 7aeb1e2..0000000
--- a/debian/libdirectfb-dev.install.armel
+++ /dev/null
@@ -1,75 +0,0 @@
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/include/directfb-internal/*.h
-usr/include/directfb-internal/core/*.h
-usr/include/directfb-internal/devmem/*.h
-usr/include/directfb-internal/display/*.h
-usr/include/directfb-internal/fbdev/*.h
-usr/include/directfb-internal/gfx/*.h
-usr/include/directfb-internal/gfx/generic/*.h
-usr/include/directfb-internal/input/*.h
-usr/include/directfb-internal/media/*.h
-usr/include/directfb-internal/misc/*.h
-usr/include/directfb-internal/windows/*.h
-usr/include/directfb/*.h
-usr/include/directfb/direct/*.h
-usr/include/directfb/fusion/*.h
-usr/include/directfb/fusion/shm/*.h
-usr/include/directfb/linux/*.h
-usr/include/directfb/unique/*.h
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ati128.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_cyber5k.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_davinci.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ep9x.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_gl.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_mach64.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_matrox.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nsc.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nvidia.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_omap.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_pxa3xx.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_radeon.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_sis315.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_tdfx.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_vmware.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_joystick.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_keyboard.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_linux_input.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_lirc.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_mutouch.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_penmount.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_ps2mouse.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_serialmouse.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_sonypi.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_ucb1x00_ts.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_wm97xx_ts.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_zytronic.a
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_default.a
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_dgiff.a
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_ft2.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.a
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.a
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.a
-usr/lib/directfb-*/systems/libdirectfb_devmem.a
-usr/lib/directfb-*/systems/libdirectfb_fbdev.a
-usr/lib/directfb-*/systems/libdirectfb_x11.a
-usr/lib/directfb-*/wm/libdirectfbwm_default.a
-usr/lib/directfb-*/wm/libdirectfbwm_unique.a
-usr/lib/libdavinci_c64x.a
-usr/lib/libdavinci_c64x.so
-usr/lib/libdirect.a
-usr/lib/libdirect.so
-usr/lib/libdirectfb.a
-usr/lib/libdirectfb.so
-usr/lib/libfusion.a
-usr/lib/libfusion.so
-usr/lib/libuniquewm.a
-usr/lib/libuniquewm.so
-usr/lib/pkgconfig/direct.pc
-usr/lib/pkgconfig/directfb-internal.pc
-usr/lib/pkgconfig/directfb.pc
-usr/lib/pkgconfig/fusion.pc
-usr/share/man/man1/directfb-csource.1
diff --git a/debian/libdirectfb-dev.install.i386 b/debian/libdirectfb-dev.install.i386
deleted file mode 100644
index 399ca13..0000000
--- a/debian/libdirectfb-dev.install.i386
+++ /dev/null
@@ -1,74 +0,0 @@
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/include/directfb-internal/*.h
-usr/include/directfb-internal/core/*.h
-usr/include/directfb-internal/devmem/*.h
-usr/include/directfb-internal/display/*.h
-usr/include/directfb-internal/fbdev/*.h
-usr/include/directfb-internal/gfx/*.h
-usr/include/directfb-internal/gfx/generic/*.h
-usr/include/directfb-internal/input/*.h
-usr/include/directfb-internal/media/*.h
-usr/include/directfb-internal/misc/*.h
-usr/include/directfb-internal/windows/*.h
-usr/include/directfb/*.h
-usr/include/directfb/direct/*.h
-usr/include/directfb/fusion/*.h
-usr/include/directfb/fusion/shm/*.h
-usr/include/directfb/unique/*.h
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ati128.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_cyber5k.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ep9x.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_gl.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_i810.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_i830.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_mach64.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_matrox.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_neomagic.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nsc.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nvidia.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_pxa3xx.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_radeon.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_savage.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_sis315.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_tdfx.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_unichrome.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_vmware.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_joystick.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_keyboard.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_linux_input.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_lirc.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_mutouch.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_penmount.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_ps2mouse.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_serialmouse.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_sonypi.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_wm97xx_ts.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_zytronic.a
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_default.a
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_dgiff.a
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_ft2.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.a
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.a
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.a
-usr/lib/directfb-*/systems/libdirectfb_devmem.a
-usr/lib/directfb-*/systems/libdirectfb_fbdev.a
-usr/lib/directfb-*/systems/libdirectfb_x11.a
-usr/lib/directfb-*/wm/libdirectfbwm_default.a
-usr/lib/directfb-*/wm/libdirectfbwm_unique.a
-usr/lib/libdirect.a
-usr/lib/libdirect.so
-usr/lib/libdirectfb.a
-usr/lib/libdirectfb.so
-usr/lib/libfusion.a
-usr/lib/libfusion.so
-usr/lib/libuniquewm.a
-usr/lib/libuniquewm.so
-usr/lib/pkgconfig/direct.pc
-usr/lib/pkgconfig/directfb-internal.pc
-usr/lib/pkgconfig/directfb.pc
-usr/lib/pkgconfig/fusion.pc
-usr/share/man/man1/directfb-csource.1
diff --git a/debian/libdirectfb-dev.install.linux b/debian/libdirectfb-dev.install.linux
deleted file mode 100644
index 329e46a..0000000
--- a/debian/libdirectfb-dev.install.linux
+++ /dev/null
@@ -1,69 +0,0 @@
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/include/directfb-internal/*.h
-usr/include/directfb-internal/core/*.h
-usr/include/directfb-internal/devmem/*.h
-usr/include/directfb-internal/display/*.h
-usr/include/directfb-internal/fbdev/*.h
-usr/include/directfb-internal/gfx/*.h
-usr/include/directfb-internal/gfx/generic/*.h
-usr/include/directfb-internal/input/*.h
-usr/include/directfb-internal/media/*.h
-usr/include/directfb-internal/misc/*.h
-usr/include/directfb-internal/windows/*.h
-usr/include/directfb/*.h
-usr/include/directfb/direct/*.h
-usr/include/directfb/fusion/*.h
-usr/include/directfb/fusion/shm/*.h
-usr/include/directfb/unique/*.h
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ati128.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_cyber5k.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_ep9x.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_gl.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_mach64.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_matrox.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nsc.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_nvidia.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_pxa3xx.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_radeon.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_sis315.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_tdfx.a
-usr/lib/directfb-*/gfxdrivers/libdirectfb_vmware.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_joystick.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_keyboard.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_linux_input.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_lirc.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_mutouch.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_penmount.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_ps2mouse.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_serialmouse.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_sonypi.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_wm97xx_ts.a
-usr/lib/directfb-*/inputdrivers/libdirectfb_zytronic.a
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_default.a
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_dgiff.a
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_ft2.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.a
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.a
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.a
-usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.a
-usr/lib/directfb-*/systems/libdirectfb_devmem.a
-usr/lib/directfb-*/systems/libdirectfb_fbdev.a
-usr/lib/directfb-*/systems/libdirectfb_x11.a
-usr/lib/directfb-*/wm/libdirectfbwm_default.a
-usr/lib/directfb-*/wm/libdirectfbwm_unique.a
-usr/lib/libdirect.a
-usr/lib/libdirect.so
-usr/lib/libdirectfb.a
-usr/lib/libdirectfb.so
-usr/lib/libfusion.a
-usr/lib/libfusion.so
-usr/lib/libuniquewm.a
-usr/lib/libuniquewm.so
-usr/lib/pkgconfig/direct.pc
-usr/lib/pkgconfig/directfb-internal.pc
-usr/lib/pkgconfig/directfb.pc
-usr/lib/pkgconfig/fusion.pc
-usr/share/man/man1/directfb-csource.1
diff --git a/debian/libdirectfb-extra.install b/debian/libdirectfb-extra.install
index fa373d3..1dd62b4 100644
--- a/debian/libdirectfb-extra.install
+++ b/debian/libdirectfb-extra.install
@@ -1,4 +1,4 @@
-usr/lib/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
-usr/lib/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-usr/lib/directfb-*/systems/libdirectfb_x11.so
+usr/lib/*/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
+usr/lib/*/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
+usr/lib/*/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
+usr/lib/*/directfb-*/systems/libdirectfb_x11.so
diff --git a/debian/rules b/debian/rules
index 7b2fb49..afcb160 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,16 +18,7 @@ BUILD_UDEB := directfb-udeb
export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-format
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- conf_gnu_type += --build $(DEB_HOST_GNU_TYPE)
-else
- conf_gnu_type += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
- CROSS=LD=$(DEB_HOST_GNU_TYPE)-ld
-endif
+include /usr/share/dpkg/architecture.mk
ifeq ($(DEB_HOST_ARCH_OS), linux)
conf_options := \
@@ -46,36 +37,20 @@ endif
%:
dh $@
+override_dh_auto_clean:
+ dh_auto_clean --builddirectory=$(BUILD_DIST)
+ dh_auto_clean --builddirectory=$(BUILD_UDEB)
+
override_dh_auto_configure:
- mkdir -p $(BUILD_DIST)
-
- cd $(BUILD_DIST) && \
- $(conf_script_env) ../configure \
- $(conf_gnu_type) \
- --prefix=/usr \
- --includedir=\$${prefix}/include \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --sysconfdir=/etc \
- --localstatedir=/var \
+ dh_auto_configure --builddirectory=$(BUILD_DIST) -- \
$(conf_options) \
--enable-static \
--enable-unique \
--disable-sdl \
--disable-vnc \
--enable-x11
-
- mkdir -p $(BUILD_UDEB)
-
- cd $(BUILD_UDEB) && \
- $(conf_script_env) ../configure \
- $(conf_gnu_type) \
- --prefix=/usr \
- --includedir=\$${prefix}/include \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --sysconfdir=/etc \
- --localstatedir=/var \
+ dh_auto_configure --builddirectory=$(BUILD_UDEB) -- \
+ --libdir=/usr/lib
$(conf_options_udeb) \
--disable-sdl \
--disable-x11 \
@@ -89,17 +64,12 @@ override_dh_auto_configure:
--disable-sse
override_dh_auto_build:
- $(MAKE) $(CROSS) -C $(BUILD_DIST)
- $(MAKE) $(CROSS) -C $(BUILD_UDEB)
-
-override_dh_clean:
- rm -rf $(BUILD_DIST)
- rm -rf $(BUILD_UDEB)
- dh_clean
+ dh_auto_build --builddirectory=$(BUILD_DIST)
+ dh_auto_build --builddirectory=$(BUILD_UDEB)
override_dh_auto_install:
- $(MAKE) $(CROSS) -C $(BUILD_DIST) install DESTDIR=$(DESTDIR_DIST)
- $(MAKE) $(CROSS) -C $(BUILD_UDEB) install DESTDIR=$(DESTDIR_UDEB)
+ dh_auto_install --builddirectory=$(BUILD_DIST) --destdir=$(DESTDIR_DIST) -- -j1
+ dh_auto_install --builddirectory=$(BUILD_UDEB) --destdir=$(DESTDIR_UDEB) -- -j1
override_dh_install:
dh_install -a -N$(pkg_lib_udeb) -N$(pkg_bin_udeb) --sourcedir=$(DESTDIR_DIST)
--
directfb packaging
More information about the pkg-multimedia-commits
mailing list