fix building in Serial mode (on HPPA)
This commit is contained in:
parent
8e04cf6503
commit
24006e6b45
6 changed files with 26 additions and 3 deletions
8
debian/changelog
vendored
8
debian/changelog
vendored
|
@ -1,3 +1,11 @@
|
|||
midori (0.2.4-3) UNRELEASED; urgency=low
|
||||
|
||||
* don't run the tests
|
||||
* add debian/source/format
|
||||
* fix building in Serial mode (on HPPA)
|
||||
|
||||
-- Ryan Niebur <ryan@debian.org> Sun, 18 Apr 2010 23:41:17 -0700
|
||||
|
||||
midori (0.2.4-2) unstable; urgency=low
|
||||
|
||||
* use a patched waf for hppa, thanks to Jakub Wilk (Closes: #559989)
|
||||
|
|
2
debian/patches/default-homepage
vendored
2
debian/patches/default-homepage
vendored
|
@ -17,7 +17,7 @@ Midori's user documentation. This is similar to what Dillo did/does.
|
|||
|
||||
#include "sokoke.h"
|
||||
|
||||
@@ -602,7 +603,7 @@
|
||||
@@ -609,7 +610,7 @@
|
||||
"homepage",
|
||||
_("Homepage:"),
|
||||
_("The homepage"),
|
||||
|
|
13
debian/patches/fix-serial-build
vendored
Normal file
13
debian/patches/fix-serial-build
vendored
Normal file
|
@ -0,0 +1,13 @@
|
|||
fix building in Serial mode (on HPPA)
|
||||
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -466,7 +466,7 @@
|
||||
obj.source = 'data/' + APPNAME + '.desktop.in'
|
||||
obj.install_path = appdir
|
||||
obj.flags = ['-d', '-c']
|
||||
- bld.install_files (appdir, 'data/' + APPNAME + '.desktop')
|
||||
+ bld.install_files (appdir, blddir + '/default/data/' + APPNAME + '.desktop')
|
||||
else:
|
||||
folder = os.path.abspath (blddir + '/default/data')
|
||||
Utils.check_dir (folder)
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -1,2 +1,3 @@
|
|||
fix-serial-build
|
||||
default-homepage
|
||||
add-debian-searches
|
||||
|
|
4
debian/rules
vendored
4
debian/rules
vendored
|
@ -47,8 +47,8 @@ override_dh_auto_configure: $(WAFADMIN_FILE)
|
|||
override_dh_auto_build: $(WAFADMIN_FILE)
|
||||
$(WAF) --nocache build --debug full
|
||||
|
||||
override_dh_auto_test: $(WAFADMIN_FILE)
|
||||
xvfb-run $(WAF) --nocache check
|
||||
#override_dh_auto_test: $(WAFADMIN_FILE)
|
||||
# xvfb-run $(WAF) --nocache check
|
||||
|
||||
override_dh_auto_install: $(WAFADMIN_FILE)
|
||||
$(WAF) --nocache install --destdir debian/tmp
|
||||
|
|
1
debian/source/format
vendored
Normal file
1
debian/source/format
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
3.0 (quilt)
|
Loading…
Reference in a new issue