[SCM] directfb/experimental: Remove udebs
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 9d337b499134747e737eb8c0daaec6545aa2a65e
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sat Dec 31 11:17:13 2016 +0100
Remove udebs
GTK+ udebs no longer use directfb.
diff --git a/debian/control b/debian/control
index 82fe592..d787b46 100644
--- a/debian/control
+++ b/debian/control
@@ -26,20 +26,6 @@ Description: direct frame buffer graphics - shared libraries
in mind. It offers maximum hardware accelerated performance at a minimum
of resource usage and overhead.
-Package: libdirectfb-1.4-0-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: libdirectfb-1.4-0
-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.
-
Package: libdirectfb-bin
Section: libs
Architecture: any
@@ -53,19 +39,6 @@ Description: direct frame buffer graphics - binaries
This package contains the DirectFB background configuration tool
and the directfbrc man page.
-Package: libdirectfb-bin-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: any
-Depends: libdirectfb-1.4-0-udeb (= ${binary:Version}),
- ${shlibs:Depends}, ${misc: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.
-
Package: libdirectfb-extra
Section: libs
Architecture: any
diff --git a/debian/libdirectfb-1.4-0-udeb.install b/debian/libdirectfb-1.4-0-udeb.install
deleted file mode 100644
index 32be102..0000000
--- a/debian/libdirectfb-1.4-0-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.4-0-udeb.install.linux b/debian/libdirectfb-1.4-0-udeb.install.linux
deleted file mode 100644
index a006ff0..0000000
--- a/debian/libdirectfb-1.4-0-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-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/rules b/debian/rules
index afcb160..ae42830 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,16 +4,8 @@
#export DH_VERBOSE=1
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')
-
-DESTDIR_DIST := $(CURDIR)/debian/tmp
-DESTDIR_UDEB := $(CURDIR)/debian/tmp-udeb
-
-BUILD_DIST := directfb-build
-BUILD_UDEB := directfb-udeb
+pkgs_deb := $(shell dh_listpackages | sed -e '/$(pkg_lib)/d; /dbg/d')
export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-format
@@ -24,56 +16,26 @@ 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 $@
-override_dh_auto_clean:
- dh_auto_clean --builddirectory=$(BUILD_DIST)
- dh_auto_clean --builddirectory=$(BUILD_UDEB)
-
override_dh_auto_configure:
- dh_auto_configure --builddirectory=$(BUILD_DIST) -- \
+ dh_auto_configure -- \
$(conf_options) \
--enable-static \
--enable-unique \
--disable-sdl \
--disable-vnc \
--enable-x11
- dh_auto_configure --builddirectory=$(BUILD_UDEB) -- \
- --libdir=/usr/lib
- $(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:
- dh_auto_build --builddirectory=$(BUILD_DIST)
- dh_auto_build --builddirectory=$(BUILD_UDEB)
override_dh_auto_install:
- 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)
- dh_install --remaining-packages --sourcedir=$(DESTDIR_UDEB)
+ dh_auto_install -- -j1
override_dh_link:
for pkg in $(pkgs_deb); do \
@@ -81,7 +43,4 @@ override_dh_link:
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)
-
.PHONY: override_dh_auto_test
--
directfb packaging
More information about the pkg-multimedia-commits
mailing list