Re: xf86-input-tslib and xorg 1.9
Julien Cristau writes:
>> +debian/tmp/usr/lib/xorg/modules/input/tslib_drv.so
>> usr/lib/xorg/modules/input/
>
> debian/tmp here looks wrong (or at least unnecessary). dh_install looks
> there in compat level 7 anyway.
debian/compat is 5 so it fails:
make[1]: Leaving directory `/home/lindi/scm/xf86-input-tslib'
debian/rules override_dh_install
make[1]: Entering directory `/home/lindi/scm/xf86-input-tslib'
find debian/tmp -name '*.la' -delete
dh_install --fail-missing
dh_install: xserver-xorg-input-tslib missing files (usr/share/man/man4/*),
aborting
make[1]: *** [override_dh_install] Error 2
make[1]: Leaving directory `/home/lindi/scm/xf86-input-tslib'
make: *** [binary] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2
debuild: fatal error at line 1329:
If I up it to 7 the package builds fine. I checked man 7 debhelper and
couldn't find anything that'd immediately break due to this. Updated
patch is attached.
>From 187f3349114b39cb80afb6ee3ab11001c2e1faf6 Mon Sep 17 00:00:00 2001
From: Timo Juhani Lindfors
Date: Sun, 13 Feb 2011 15:14:28 -0500
Subject: [PATCH 1/3] Use dh --with xsf instead of local debian/xsfbs/
This layout was adapted from
http://pkg-xorg.alioth.debian.org/reference/dependencies.html
---
debian/compat |2 +-
debian/control |7 +-
debian/install |1 -
debian/rules| 70 +---
debian/xcontrol | 24 --
debian/xserver-xorg-input-tslib.install |3 +
debian/xsfbs/repack.sh | 32 --
debian/xsfbs/xsfbs.mk | 285 --
debian/xsfbs/xsfbs.sh | 622 ---
9 files changed, 20 insertions(+), 1026 deletions(-)
delete mode 100644 debian/install
delete mode 100644 debian/xcontrol
create mode 100644 debian/xserver-xorg-input-tslib.install
delete mode 100644 debian/xsfbs/repack.sh
delete mode 100644 debian/xsfbs/xsfbs.mk
delete mode 100644 debian/xsfbs/xsfbs.sh
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index fb5c7dc..9d983d6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,11 @@ Section: x11
Priority: optional
Maintainer: Debian Embedded
Uploaders: Hector Oron , Jonas Smedegaard
-Build-Depends: debhelper (>= 5),
- xserver-xorg-dev (>= 2:1.7.6.901),
+Build-Depends: debhelper (>= 8),
+ xserver-xorg-dev (>= 2:1.9.4),
pkg-config, quilt,
- libts-dev (>= 1.0-4)
+ libts-dev (>= 1.0-4),
+ dh-autoreconf
Standards-Version: 3.8.4
Homepage: http://pengutronix.de/software/xf86-input-tslib/index_en.html
Vcs-Git: git://git.debian.org/git/collab-maint/xf86-input-tslib.git
diff --git a/debian/install b/debian/install
deleted file mode 100644
index f8f650c..000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/50-tslib.conf usr/share/X11/xorg.conf.d/
diff --git a/debian/rules b/debian/rules
index e1747f8..3d192dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,63 +1,17 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# Install in debian/tmp to retain control through dh_install:
+override_dh_auto_install:
+ dh_auto_install --destdir=debian/tmp
-include debian/xsfbs/xsfbs.mk
+# Kill *.la files, and forget no-one:
+override_dh_install:
+ find debian/tmp -name '*.la' -delete
+ dh_install --fail-missing
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# That's a plugin, use appropriate warning level:
+override_dh_shlibdeps:
+ dh_shlibdeps -- --warnings=6
-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
-
-config.status: configure
- dh_testdir
- ./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-z,defs"
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
- $(MAKE)
- touch $@
-
-clean: xsfclean
- dh_testdir
- dh_testroot
- rm -f build-stamp
- [ ! -f Makefile ] || $(MAKE) distclean
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) DESTDIR=$(CURDIR)/debian/xserver-xorg-input-tslib install
- rm -fr debian/*/usr/share/man/man4/* \
- debian/*/usr/lib/xorg/modules/input/*.la
-
-binary-indep: build install
-
-binary-arch: build install serverabi
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installman man/tslib.4
- dh_install
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: bina
Re: xf86-input-tslib and xorg 1.9 (Was: Coordinating work around X.Org drivers)
On Sun, Feb 13, 2011 at 23:03:55 +0200, Timo Juhani Lindfors wrote: > diff --git a/debian/xserver-xorg-input-tslib.install > b/debian/xserver-xorg-input-tslib.install > new file mode 100644 > index 000..c3cb272 > --- /dev/null > +++ b/debian/xserver-xorg-input-tslib.install > @@ -0,0 +1,3 @@ > +debian/tmp/usr/share/man/man4/* usr/share/man/man4/ > +debian/tmp/usr/lib/xorg/modules/input/tslib_drv.so > usr/lib/xorg/modules/input/ debian/tmp here looks wrong (or at least unnecessary). dh_install looks there in compat level 7 anyway. > +debian/50-tslib.conf usr/share/X11/xorg.conf.d/ Cheers, Julien -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20110213212249.gc3...@radis.liafa.jussieu.fr
xf86-input-tslib and xorg 1.9 (Was: Coordinating work around X.Org drivers)
Hi,
Cyril Brulebois writes:
> Documentation is available online:
> http://pkg-xorg.alioth.debian.org/reference/dependencies.html
thanks a lot for writing this. I'm not an X hacker but since
xserver-xorg-input-tslib is essential software on my openmoko I took a
quick look at the packaging and came up with the attached patch.
It works for me but please review it carefully :-)
>From a5eecdd2ff55fcb0adf22a83a62cb4e80a79e9c6 Mon Sep 17 00:00:00 2001
From: Timo Juhani Lindfors
Date: Sun, 13 Feb 2011 15:14:28 -0500
Subject: [PATCH 1/2] Use dh --with xsf instead of local debian/xsfbs/
This layout was adapted from
http://pkg-xorg.alioth.debian.org/reference/dependencies.html
---
debian/control |7 +-
debian/install |1 -
debian/rules| 70 +---
debian/xcontrol | 24 --
debian/xserver-xorg-input-tslib.install |3 +
debian/xsfbs/repack.sh | 32 --
debian/xsfbs/xsfbs.mk | 285 --
debian/xsfbs/xsfbs.sh | 622 ---
8 files changed, 19 insertions(+), 1025 deletions(-)
delete mode 100644 debian/install
delete mode 100644 debian/xcontrol
create mode 100644 debian/xserver-xorg-input-tslib.install
delete mode 100644 debian/xsfbs/repack.sh
delete mode 100644 debian/xsfbs/xsfbs.mk
delete mode 100644 debian/xsfbs/xsfbs.sh
diff --git a/debian/control b/debian/control
index fb5c7dc..9d983d6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,11 @@ Section: x11
Priority: optional
Maintainer: Debian Embedded
Uploaders: Hector Oron , Jonas Smedegaard
-Build-Depends: debhelper (>= 5),
- xserver-xorg-dev (>= 2:1.7.6.901),
+Build-Depends: debhelper (>= 8),
+ xserver-xorg-dev (>= 2:1.9.4),
pkg-config, quilt,
- libts-dev (>= 1.0-4)
+ libts-dev (>= 1.0-4),
+ dh-autoreconf
Standards-Version: 3.8.4
Homepage: http://pengutronix.de/software/xf86-input-tslib/index_en.html
Vcs-Git: git://git.debian.org/git/collab-maint/xf86-input-tslib.git
diff --git a/debian/install b/debian/install
deleted file mode 100644
index f8f650c..000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/50-tslib.conf usr/share/X11/xorg.conf.d/
diff --git a/debian/rules b/debian/rules
index e1747f8..3d192dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,63 +1,17 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# Install in debian/tmp to retain control through dh_install:
+override_dh_auto_install:
+ dh_auto_install --destdir=debian/tmp
-include debian/xsfbs/xsfbs.mk
+# Kill *.la files, and forget no-one:
+override_dh_install:
+ find debian/tmp -name '*.la' -delete
+ dh_install --fail-missing
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# That's a plugin, use appropriate warning level:
+override_dh_shlibdeps:
+ dh_shlibdeps -- --warnings=6
-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
-
-config.status: configure
- dh_testdir
- ./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-z,defs"
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
- $(MAKE)
- touch $@
-
-clean: xsfclean
- dh_testdir
- dh_testroot
- rm -f build-stamp
- [ ! -f Makefile ] || $(MAKE) distclean
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) DESTDIR=$(CURDIR)/debian/xserver-xorg-input-tslib install
- rm -fr debian/*/usr/share/man/man4/* \
- debian/*/usr/lib/xorg/modules/input/*.la
-
-binary-indep: build install
-
-binary-arch: build install serverabi
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installman man/tslib.4
- dh_install
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+ dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
diff --git a/debian/xcontrol b/debian/xcontrol
deleted file mode 100644
index 4607b77..000
--- a/debian/xcontrol
+++ /dev/null
@@ -1,24 +0,0 @@
-Source: xf86-input-tslib
-Section: x11
-Priority: optional
-Maintainer: Wen-Yen Chuang
-Build-Depends: xserver-xorg-dev (>= 2:1.4),
- libts-dev (>= 1.0-4)
-Build-Depends-Tools: debhelper (>= 5),
- pkg-config
-Standards-Version: 3.8.3
-Homepage: http://pengutronix.de/software/xf86-input-tslib/index_en.html
-
-Package: xserver-xorg-input-tslib
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
-Recommends:
