[SCM] directfb/master: Merge changes from experimental

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sat Dec 31 15:48:55 UTC 2016


The following commit has been merged in the master branch:
commit c99b82a0575a1e8af7c6b4d32520eee90ae03ade
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Dec 31 15:37:46 2016 +0100

    Merge changes from experimental
    
    * Drop udebs
    * Remove symlinks
    * Modernize packaging

diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index dfb13c8..9b52b41 100644
--- a/debian/control
+++ b/debian/control
@@ -1,86 +1,87 @@
 Source: directfb
 Priority: optional
-Maintainer: Debian DirectFB Team <pkg-directfb-devel at lists.alioth.debian.org>
-Uploaders: Fathi Boudra <fabo at debian.org>,
-           Otavio Salvador <otavio at debian.org>,
-           Luis Mondesi <lemsx1 at gmail.com>
-Build-Depends: autoconf,
-               automake,
-               debhelper (>= 9),
-               libfreetype6-dev,
-               libjpeg-dev,
-               libpng-dev,
-               libtool,
-               libx11-dev,
-               libxext-dev,
-               pkg-config,
-               x11proto-core-dev,
-               zlib1g-dev
-Standards-Version: 3.9.6
+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,
+ libfreetype6-dev,
+ libgl1-mesa-dev,
+ libjpeg-dev,
+ libpng-dev,
+ libx11-dev,
+ libxext-dev,
+ pkg-config,
+ x11proto-core-dev,
+ zlib1g-dev
+Standards-Version: 3.9.8
 Section: libs
-Homepage: http://www.directfb.org/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-directfb/directfb/
-Vcs-Svn: svn://svn.debian.org/pkg-directfb/directfb/trunk/
+Homepage: http://www.directfb.net
+Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/directfb.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/directfb.git
 
-Package: libdirectfb-1.2-9
+Package: libdirectfb-dev
+Section: libdevel
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdirectfb-1.2-0 [armel]
-Description: direct frame buffer graphics - shared libraries
+Depends:
+ libdirectfb-1.2-9 (= ${binary:Version}),
+ libdirectfb-extra,
+ libfreetype6-dev,
+ libgl1-mesa-dev,
+ libjpeg-dev,
+ libmpeg3-dev,
+ libpng-dev,
+ libx11-dev,
+ libxext-dev,
+ pkg-config,
+ x11proto-core-dev,
+ zlib1g-dev,
+ ${misc:Depends}
+Description: direct frame buffer graphics library - development files
  DirectFB is a graphics library which was designed with embedded systems
  in mind. It offers maximum hardware accelerated performance at a minimum
  of resource usage and overhead.
+ .
+ This package contains the files needed to compile and link programs
+ which use DirectFB.
 
-Package: libdirectfb-1.2-9-udeb
-XC-Package-Type: udeb
-Section: debian-installer
+Package: libdirectfb-1.2-9
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Provides: libdirectfb-1.2-9
-Description: direct frame buffer graphics - shared libraries
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: direct frame buffer graphics (shared libraries)
  DirectFB is a graphics library which was designed with embedded systems
  in mind. It offers maximum hardware accelerated performance at a minimum
  of resource usage and overhead.
  .
- This package contains the shared libraries for use with the Debian
- installer.
+ This package contains the shared libraries and drivers.
 
 Package: libdirectfb-bin
 Architecture: any
-Depends: libdirectfb-1.2-9 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: libdirectfb-dev (<< 1.2.10.0-6)
+Replaces: libdirectfb-dev (<< 1.2.10.0-6)
 Description: direct frame buffer graphics - binaries
  DirectFB is a graphics library which was designed with embedded systems
  in mind. It offers maximum hardware accelerated performance at a minimum
  of resource usage and overhead.
  .
  This package contains the DirectFB background configuration tool
- and the directfbrc man page.
-
-Package: libdirectfb-bin-udeb
-XC-Package-Type: udeb
-Section: debian-installer
-Architecture: any
-Depends: libdirectfb-1.2-9-udeb (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: direct frame buffer graphics - binaries
- DirectFB is a graphics library which was designed with embedded systems
- in mind. It offers maximum hardware accelerated performance at a minimum
- of resource usage and overhead.
- .
- This package contains the DirectFB dfbinfo debugging tool.
+ and the source generation tool.
 
 Package: libdirectfb-extra
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libdirectfb-1.2-9 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+ libdirectfb-1.2-9 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: direct frame buffer graphics - extra providers
  DirectFB is a graphics library which was designed with embedded systems
  in mind. It offers maximum hardware accelerated performance at a minimum
@@ -92,67 +93,3 @@ Description: direct frame buffer graphics - extra providers
    * image JPEG
    * font FreeType
    * system X11
-
-Package: libdirectfb-dev
-Section: libdevel
-Architecture: any
-Depends: libdirectfb-1.2-9 (= ${binary:Version}),
-         libdirectfb-extra,
-         libfreetype6-dev,
-         libjpeg-dev,
-         libpng-dev,
-         libx11-dev,
-         libxext-dev,
-         x11proto-core-dev,
-         zlib1g-dev (>= 1:1.1.3),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: direct frame buffer graphics library - development files
- DirectFB is a graphics library which was designed with embedded systems
- in mind. It offers maximum hardware accelerated performance at a minimum
- of resource usage and overhead.
- .
- This package contains the files needed to compile and link programs
- which use DirectFB.
-
-Package: libdirectfb-1.2-9-dbg
-Section: debug
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Depends: libdirectfb-1.2-9 (= ${binary:Version}), ${misc:Depends}
-Description: direct frame buffer graphics - shared libraries debug symbols
- DirectFB is a graphics library which was designed with embedded systems
- in mind. It offers maximum hardware accelerated performance at a minimum
- of resource usage and overhead.
- .
- This package contains DirectFB shared libraries debugging symbols.
-
-Package: libdirectfb-bin-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: libdirectfb-1.2-9-dbg (= ${binary:Version}),
-         libdirectfb-bin (= ${binary:Version}),
-         ${misc:Depends}
-Description: direct frame buffer graphics - binaries debug symbols
- DirectFB is a graphics library which was designed with embedded systems
- in mind. It offers maximum hardware accelerated performance at a minimum
- of resource usage and overhead.
- .
- This package contains DirectFB binaries debugging symbols.
-
-Package: libdirectfb-extra-dbg
-Section: debug
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Depends: libdirectfb-1.2-9-dbg (= ${binary:Version}),
-         libdirectfb-extra (= ${binary:Version}),
-         ${misc:Depends}
-Description: direct frame buffer graphics - extra provider debug symbols
- DirectFB is a graphics library which was designed with embedded systems
- in mind. It offers maximum hardware accelerated performance at a minimum
- of resource usage and overhead.
- .
- This package contains DirectFB extra provide debugging symbols.
diff --git a/debian/directfb-config.1 b/debian/directfb-config.1
deleted file mode 100644
index a3d10c8..0000000
--- a/debian/directfb-config.1
+++ /dev/null
@@ -1,77 +0,0 @@
-.TH directfb-config 1 2006-06-14 0.9.25.1 "DirectFB User's Manual"
-.SH NAME
-directfb-config \- script to get information about the installed version of directfb
-.SH SYNOPSIS
-.B directfb\-config
-.RB [ \-\-prefix [=\fIDIR\fP]]
-.RB [ \-\-exec\-prefix [=\fIDIR\fP]]
-.RB [ \-\-version ]
-.RB [ \-\-libs ]
-.RB [ \-\-cflags ]
-.RB [ \-\-input =\fI<driver>\fP[,\fI<driver>\fP]...]
-.RB [ \-\-graphics =\fI<driver>\fP[,\fI<driver>\fP]...]
-.RB [ \-\-fonts =\fI<impl>\fP[,\fI<impl>\fP]...]
-.RB [ \-\-imageprovider =\fI<impl>\fP[,\fI<impl>\fP]...]
-.RB [ \-\-videoprovider =\fI<impl>\fP[,\fI<impl>\fP]...]
-.SH DESCRIPTION
-.PP
-\fIdirectfb\-config\fP is a tool that is used to configure to determine
-the compiler and linker flags that should be used to compile
-and link programs that use \fIdirectfb\fP. It is also used internally
-to the .m4 macros for GNU autoconf that are included with \fIdirectfb\fP.
-.
-.SH OPTIONS
-\fIdirectfb\-config\fP accepts the following options:
-.TP 8
-.B \-\-version
-Print the currently installed version of \fIdirectfb\fP on the standard output.
-.TP 8
-.B \-\-libs
-Print the linker flags that are necessary to link a \fIdirectfb\fP program.
-.TP 8
-.B \-\-cflags
-Print the compiler flags that are necessary to compile a \fIdirectfb\fP program.
-.TP 8
-.BR \-\-prefix [=\fIDIR\fP]
-If specified, use PREFIX instead of the installation prefix that \fIdirectfb\fP
-was built with when computing the output for the \fB\-\-cflags\fP and
-\fB\-\-libs\fP options. This option is also used for the exec prefix
-if \fB\-\-exec\-prefix\fP was not specified. This option must be specified
-before any \fB\-\-libs\fP or \fB\-\-cflags\fP options.
-.TP 8
-.BR \-\-exec\-prefix [=\fIDIR\fP]
-If specified, use PREFIX instead of the installation exec prefix that
-\fIdirectfb\fP was built with when computing the output for the \fB\-\-cflags\fP
-and \fB\-\-libs\fP options. This option must be specified before any
-\fB\-\-libs\fP or \fB\-\-cflags\fP options.
-.TP 8
-.BR \-\-input =\fI<driver>\fP[,\fI<driver>\fP]...
-Print the linker flags necessary to statically link the listed input drivers
-into the object.
-.TP 8
-.BR \-\-graphics =\fI<driver>\fP[,\fI<driver>\fP]...
-Print the linker flags necessary to statically link the listed graphic drivers
-into the object.
-.TP 8
-.BR \-\-fonts =\fI<impl>\fP[,\fI<impl>\fP]...
-Print the linker flags necessary to statically link the listed font
-implementations into the object.
-.TP 8
-.BR \-\-imageprovider =\fI<impl>\fP[,\fI<impl>\fP]...
-Print the linker flags necessary to statically link the listed imageprovider
-implementations into the object.
-.TP 8
-.BR \-\-videoprovider =\fI<impl>\fP[,\fI<impl>\fP]...
-Print the linker flags necessary to statically link the listed videoprovider
-implementations into the object.
-.SH COPYRIGHT
-Copyright \(co  1998 Owen Taylor
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation.
-
-Adapted to directfb by Guillem Jover <guillem at debian.org>.
-
diff --git a/debian/libdirectfb-1.2-9-udeb.install b/debian/libdirectfb-1.2-9-udeb.install
deleted file mode 100644
index 946f998..0000000
--- a/debian/libdirectfb-1.2-9-udeb.install
+++ /dev/null
@@ -1,11 +0,0 @@
-usr/lib/*/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_default.so
-usr/lib/*/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-usr/lib/*/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
-usr/lib/*/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-usr/lib/*/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-usr/lib/*/directfb-*/systems/libdirectfb_devmem.so
-usr/lib/*/directfb-*/wm/libdirectfbwm_default.so
-usr/lib/*/libdirect-*.so.*
-usr/lib/*/libdirectfb-*.so.*
-usr/lib/*/libfusion-*.so.*
-usr/share/directfb-*/cursor.dat
diff --git a/debian/libdirectfb-1.2-9-udeb.install.linux b/debian/libdirectfb-1.2-9-udeb.install.linux
deleted file mode 100644
index 170f097..0000000
--- a/debian/libdirectfb-1.2-9-udeb.install.linux
+++ /dev/null
@@ -1,17 +0,0 @@
-usr/lib/*/directfb-*/gfxdrivers/libdirectfb_matrox.so
-usr/lib/*/directfb-*/inputdrivers/libdirectfb_keyboard.so
-usr/lib/*/directfb-*/inputdrivers/libdirectfb_linux_input.so
-usr/lib/*/directfb-*/inputdrivers/libdirectfb_ps2mouse.so
-usr/lib/*/directfb-*/inputdrivers/libdirectfb_serialmouse.so
-usr/lib/*/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_default.so
-usr/lib/*/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-usr/lib/*/directfb-*/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
-usr/lib/*/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-usr/lib/*/directfb-*/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-usr/lib/*/directfb-*/systems/libdirectfb_devmem.so
-usr/lib/*/directfb-*/systems/libdirectfb_fbdev.so
-usr/lib/*/directfb-*/wm/libdirectfbwm_default.so
-usr/lib/*/libdirect-*.so.*
-usr/lib/*/libdirectfb-*.so.*
-usr/lib/*/libfusion-*.so.*
-usr/share/directfb-*/cursor.dat
diff --git a/debian/libdirectfb-1.2-9.docs b/debian/libdirectfb-1.2-9.docs
index eb8f4a2..09d7744 100644
--- a/debian/libdirectfb-1.2-9.docs
+++ b/debian/libdirectfb-1.2-9.docs
@@ -1,4 +1,2 @@
-NEWS
 README
-TODO
 docs/README.screenshots
diff --git a/debian/libdirectfb-1.2-9.install b/debian/libdirectfb-1.2-9.install
old mode 100644
new mode 100755
index b6b9f55..7dab6de
--- a/debian/libdirectfb-1.2-9.install
+++ b/debian/libdirectfb-1.2-9.install
@@ -1,13 +1,18 @@
+#! /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/lib/*/libfusion-*.so.*
+usr/lib/*/libdirect-*.so.*
+[armel] usr/lib/*/libdavinci_c64x.so.*
 usr/share/directfb-*/cursor.dat
diff --git a/debian/libdirectfb-1.2-9.install.amd64 b/debian/libdirectfb-1.2-9.install.amd64
deleted file mode 100644
index dc1f2f1..0000000
--- a/debian/libdirectfb-1.2-9.install.amd64
+++ /dev/null
@@ -1,41 +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_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_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-*/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.2-9.install.armel b/debian/libdirectfb-1.2-9.install.armel
deleted file mode 100644
index 3dcda77..0000000
--- a/debian/libdirectfb-1.2-9.install.armel
+++ /dev/null
@@ -1,40 +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_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_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-*/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.2-9.install.i386 b/debian/libdirectfb-1.2-9.install.i386
deleted file mode 100644
index dc1f2f1..0000000
--- a/debian/libdirectfb-1.2-9.install.i386
+++ /dev/null
@@ -1,41 +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_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_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-*/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.2-9.install.linux b/debian/libdirectfb-1.2-9.install.linux
deleted file mode 100644
index 365c9f4..0000000
--- a/debian/libdirectfb-1.2-9.install.linux
+++ /dev/null
@@ -1,36 +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_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_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-*/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.2-9.lintian-overrides b/debian/libdirectfb-1.2-9.lintian-overrides
new file mode 100644
index 0000000..b2c4e32
--- /dev/null
+++ b/debian/libdirectfb-1.2-9.lintian-overrides
@@ -0,0 +1,5 @@
+# They are available as libfusion.so, etc.
+libdirectfb-1.2-9: dev-pkg-without-shlib-symlink usr/lib/*/libfusion-1.2.so.*
+libdirectfb-1.2-9: dev-pkg-without-shlib-symlink usr/lib/*/libdirectfb-1.2.so.*
+libdirectfb-1.2-9: dev-pkg-without-shlib-symlink usr/lib/*/libdirect-1.2.so.*
+libdirectfb-1.2-9: dev-pkg-without-shlib-symlink usr/lib/*/libuniquewm-1.2.so.*
diff --git a/debian/libdirectfb-bin-udeb.install b/debian/libdirectfb-bin-udeb.install
deleted file mode 100644
index 3d174f5..0000000
--- a/debian/libdirectfb-bin-udeb.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/dfbinfo
diff --git a/debian/libdirectfb-bin.preinst b/debian/libdirectfb-bin.preinst
new file mode 100755
index 0000000..4d5a6b7
--- /dev/null
+++ b/debian/libdirectfb-bin.preinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+# handle symlink to directory conversion
+DOCDIR=/usr/share/doc/libdirectfb-bin
+if [ -L $DOCDIR ] ; then
+  rm $DOCDIR
+fi
+
+#DEBHELPER#
diff --git a/debian/libdirectfb-dev.install b/debian/libdirectfb-dev.install
old mode 100644
new mode 100755
index 590e9f1..673ac0b
--- a/debian/libdirectfb-dev.install
+++ b/debian/libdirectfb-dev.install
@@ -1,3 +1,4 @@
+#! /usr/bin/dh-exec
 usr/include/directfb-internal
 usr/include/directfb
 usr/lib/*/libdirect.a
@@ -8,4 +9,6 @@ usr/lib/*/libfusion.a
 usr/lib/*/libfusion.so
 usr/lib/*/libuniquewm.a
 usr/lib/*/libuniquewm.so
+[armel] usr/lib/*/libdavinci_c64x.so
+[armel] usr/lib/*/libdavinci_c64x.a
 usr/lib/*/pkgconfig
diff --git a/debian/libdirectfb-dev.install.amd64 b/debian/libdirectfb-dev.install.amd64
deleted file mode 100644
index 092a3e7..0000000
--- a/debian/libdirectfb-dev.install.amd64
+++ /dev/null
@@ -1,71 +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_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_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-*/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 e313b7c..0000000
--- a/debian/libdirectfb-dev.install.armel
+++ /dev/null
@@ -1,72 +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_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_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-*/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 092a3e7..0000000
--- a/debian/libdirectfb-dev.install.i386
+++ /dev/null
@@ -1,71 +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_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_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-*/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 a89ad56..0000000
--- a/debian/libdirectfb-dev.install.linux
+++ /dev/null
@@ -1,66 +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_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_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-*/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.manpages b/debian/libdirectfb-dev.manpages
deleted file mode 100644
index fbdfd18..0000000
--- a/debian/libdirectfb-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/directfb-config.1
diff --git a/debian/libdirectfb-dev.preinst b/debian/libdirectfb-dev.preinst
new file mode 100755
index 0000000..a57807d
--- /dev/null
+++ b/debian/libdirectfb-dev.preinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+# handle symlink to directory conversion
+DOCDIR=/usr/share/doc/libdirectfb-dev
+if [ -L $DOCDIR ] ; then
+  rm $DOCDIR
+fi
+
+#DEBHELPER#
diff --git a/debian/libdirectfb-extra.preinst b/debian/libdirectfb-extra.preinst
new file mode 100755
index 0000000..ca0e95c
--- /dev/null
+++ b/debian/libdirectfb-extra.preinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+# handle symlink to directory conversion
+DOCDIR=/usr/share/doc/libdirectfb-extra
+if [ -L $DOCDIR ] ; then
+  rm $DOCDIR
+fi
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index a7f3deb..b9e3d4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,67 +1,25 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-format
 
-pkg_lib := $(shell dh_listpackages | head -n1)
-pkg_lib_udeb := $(pkg_lib)-udeb
-pkg_bin_udeb := libdirectfb-bin-udeb
-
-pkgs_deb := $(shell dh_listpackages | sed -e '/$(pkg_lib)/d; /udeb/d; /dbg/d')
-pkgs_dbg := $(shell dh_listpackages | grep dbg | sed -e 's|-dbg||')
-
-DESTDIR_DIST := $(CURDIR)/debian/tmp
-DESTDIR_UDEB := $(CURDIR)/debian/tmp-udeb
-
-BUILD_DIST := directfb-build
-BUILD_UDEB := directfb-udeb
-
-conf_script_env := LDFLAGS="-Wl,--as-needed"
-
-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)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-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 := \
     --with-gfxdrivers=all \
     --enable-video4linux2
-  conf_options_udeb := \
-    --with-gfxdrivers=matrox \
-    --with-inputdrivers=keyboard,linuxinput,ps2mouse,serialmouse
 else
   conf_options := \
     --with-gfxdrivers=none \
     --with-inputdrivers=ps2mouse
-  conf_options_udeb := $(conf_options)
 endif
 
 %:
-	dh $@ --parallel
+	dh $@
 
 override_dh_auto_configure:
-	autoreconf -f -i
-
-	mkdir -p $(BUILD_DIST)
-
-	cd $(BUILD_DIST) && \
-	$(conf_script_env) ../configure \
-		$(conf_gnu_type) \
-		--prefix=/usr \
-		--includedir=\$${prefix}/include \
-		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
+	dh_auto_configure -- \
 		$(conf_options) \
 		--enable-static \
 		--enable-unique \
@@ -69,73 +27,10 @@ override_dh_auto_configure:
 		--disable-vnc \
 		--enable-x11
 
-	mkdir -p $(BUILD_UDEB)
-
-	cd $(BUILD_UDEB) && \
-	$(conf_script_env) ../configure \
-		$(conf_gnu_type) \
-		--prefix=/usr \
-		--includedir=\$${prefix}/include \
-		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		$(conf_options_udeb) \
-		--disable-sdl \
-		--disable-x11 \
-		--disable-vnc \
-		--disable-gif \
-		--disable-jpeg \
-		--disable-mpeg2 \
-		--disable-unique \
-		--disable-video4linux \
-		--disable-mmx \
-		--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)
-
-	find . -name 'Makefile.in' -delete
-	rm -f configure config.* aclocal.m4 ltmain.sh INSTALL \
-		missing mkinstalldirs depcomp install-sh compile
-
-	rm -rf $(DESTDIR_UDEB)
-	
-	rm -f m4/libtool.m4
-	rm -f m4/ltoptions.m4
-	rm -f m4/ltsugar.m4
-	rm -f m4/ltversion.m4
-	rm -f m4/lt~obsolete.m4
-
-	dh_clean
-
 override_dh_auto_install:
-	$(MAKE) $(CROSS) -C $(BUILD_DIST) install DESTDIR=$(DESTDIR_DIST)
-	$(MAKE) $(CROSS) -C $(BUILD_UDEB) install DESTDIR=$(DESTDIR_UDEB)
-
-override_dh_install:
-	dh_install -a -N$(pkg_lib_udeb) -N$(pkg_bin_udeb) --sourcedir=$(DESTDIR_DIST)
-	dh_install --remaining-packages --sourcedir=$(DESTDIR_UDEB)
-
-override_dh_link:
-	for pkg in $(pkgs_deb); do \
-		rm -rf debian/$$pkg/usr/share/doc/$$pkg; \
-		dh_link -p$$pkg usr/share/doc/$(pkg_lib) usr/share/doc/$$pkg; \
-	done
-
-override_dh_makeshlibs:
-	dh_makeshlibs -a --add-udeb=$(pkg_lib_udeb)
+	dh_auto_install -- -j1
 
-override_dh_strip:
-	for pkg in $(pkgs_dbg); do \
-		dh_strip -p$$pkg --dbg-package=$${pkg}-dbg; \
-	done
-	dh_strip --remaining-packages
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS
 
 .PHONY: override_dh_auto_test
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..79bf90e
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+# we use autoreconf via debhelper compat 10
+directfb source: outdated-autotools-helper-file config.guess 2007-07-22
+directfb source: outdated-autotools-helper-file config.sub 2007-06-28

-- 
directfb packaging



More information about the pkg-multimedia-commits mailing list