use xvfb for tests and use --with quilt

* use xvfb for tests
* use 'dh --with quilt' for patching instead of including
  /usr/share/quilt/quilt.make
This commit is contained in:
Ryan Niebur 2009-05-14 22:25:09 -07:00
parent e75ec240d6
commit b3106bf819
3 changed files with 11 additions and 10 deletions

5
debian/changelog vendored
View file

@ -3,8 +3,11 @@ midori (0.1.6-2) UNRELEASED; urgency=low
* adopt package: set myself as maintainer, remove uploaders, remove dm * adopt package: set myself as maintainer, remove uploaders, remove dm
flag (Closes: #528731) flag (Closes: #528731)
* rearrange the debian/rules file * rearrange the debian/rules file
* use xvfb for tests
* use 'dh --with quilt' for patching instead of including
/usr/share/quilt/quilt.make
-- Ryan Niebur <ryanryan52@gmail.com> Thu, 14 May 2009 22:14:14 -0700 -- Ryan Niebur <ryanryan52@gmail.com> Thu, 14 May 2009 22:24:31 -0700
midori (0.1.6-1) experimental; urgency=low midori (0.1.6-1) experimental; urgency=low

6
debian/control vendored
View file

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Ryan Niebur <ryanryan52@gmail.com> Maintainer: Ryan Niebur <ryanryan52@gmail.com>
Build-Depends: Build-Depends:
debhelper (>= 7.2), debhelper (>= 7.2),
quilt, quilt (>= 0.46-7),
libgtk2.0-dev (>= 2.10), libgtk2.0-dev (>= 2.10),
libglib2.0-dev, libglib2.0-dev,
libwebkit-dev (>= 1.1), libwebkit-dev (>= 1.1),
@ -19,6 +19,10 @@ Build-Depends:
libunique-dev (>= 1.0.6), libunique-dev (>= 1.0.6),
python-docutils, python-docutils,
libsoup2.4-dev (>= 2.25.2), libsoup2.4-dev (>= 2.25.2),
# For testing under xvfb:
xvfb,
xauth,
xfonts-base
# Disabled optional dependencies: # Disabled optional dependencies:
Build-Conflicts: Build-Conflicts:
gtk-doc-tools, gtk-doc-tools,

10
debian/rules vendored
View file

@ -1,13 +1,7 @@
#!/usr/bin/make -f #!/usr/bin/make -f
include /usr/share/quilt/quilt.make
%: %:
dh $@ dh --with quilt $@
clean: unpatch
build binary-arch: patch
override_dh_auto_clean: override_dh_auto_clean:
./waf --nocache distclean ./waf --nocache distclean
@ -20,7 +14,7 @@ override_dh_auto_build:
./waf --nocache build --debug full ./waf --nocache build --debug full
override_dh_auto_test: override_dh_auto_test:
./waf --nocache check xvfb-run ./waf --nocache check
override_dh_auto_install: override_dh_auto_install:
./waf --nocache install --destdir debian/tmp ./waf --nocache install --destdir debian/tmp