Package: wxwidgets2.6
Version: 2.6.3.2.1
Severity: wishlist
Tags: patch
Hello Ron,
I was backporting the latest version of wxwidgets2.6 for backports.org,
and found that the patch provided for #350695 (the "FTBFS with new make"
bug) is not compatible with sarge's version of make.
I guess I could've just reverted it to the previous version, which works
on sarge but not in sid, but I spent a bit trying to figure out if a
version existed that would work in both.
After quite a while of struggling, I shall confess, I came up with such
version. I attach a patch against the current sid version, which I'd be
happy to see applied in the next upload. The resulting version is just
like the original, but with double quotes instead of single ones.
Thanks in advance,
--
Adeodato Simó dato at net.com.org.es
Debian Developer adeodato at debian.org
Listening to: Luke Vibert - Prick Tat
--- wxwidgets2.6/debian/rules~ 2006-05-01 06:38:42.000000000 +0200
+++ wxwidgets2.6/debian/rules
@@ -15,14 +15,15 @@
# respect their precious opinion of how much blue smoke to use.
JOB_COUNT := $(CONCURRENCY_LEVEL)
-else ifdef DISTCC_HOSTS
+else
+ifdef DISTCC_HOSTS
# Otherwise, if they have a cluster, try to put it to good use.
JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$\#)
# Not much faster, but it might keep you warm in winter...
#JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$(($$\# +
$$\#)))
-
+endif
endif
ifdef JOB_COUNT
@@ -213,53 +214,53 @@
echo python_ver := python$(shell python -c "import sys;print
sys.version[:3]") > $@
debian/control: $(addprefix debian/,control.in python-version)
- sed -e 's/=V/$(release)/g;s/=SOV/$(sorelease)/g;s/=PY/$(python_ver)/g'\
+ sed -e "s/=V/$(release)/g;s/=SOV/$(sorelease)/g;s/=PY/$(python_ver)/g"\
< debian/control.in > debian/control
control-files-stamp: debian/control
dh_testdir
@for f in postinst prerm; do \
echo "generating control file $(package_wxbase_dev).$$f"; \
- sed -e 's/=V/$(release)/g; '\
-' s/=PRIO/$(alt_prio)/g' \
+ sed -e "s/=V/$(release)/g; \
+ s/=PRIO/$(alt_prio)/g" \
< debian/libwxbase-dev.$$f \
> debian/$(package_wxbase_dev).$$f; \
done;
@for f in postinst prerm; do \
echo "generating control file $(package_wxbase_dbg).$$f"; \
- sed -e 's/=V/$(release)/g; '\
-' s/=PRIO/$(alt_prio)/g' \
+ sed -e "s/=V/$(release)/g; \
+ s/=PRIO/$(alt_prio)/g" \
< debian/libwxbase-dbg.$$f \
> debian/$(package_wxbase_dbg).$$f; \
done;
@for f in postinst prerm; do \
echo "generating control file $(package_gtk_dev).$$f"; \
- sed -e 's/=V/$(release)/g; '\
-' s/=PRIO/$(alt_prio)/g' \
+ sed -e "s/=V/$(release)/g; \
+ s/=PRIO/$(alt_prio)/g" \
< debian/libwxgtk-dev.$$f \
> debian/$(package_gtk_dev).$$f; \
done;
@for f in postinst prerm; do \
echo "generating control file $(package_gtk_dbg).$$f"; \
- sed -e 's/=V/$(release)/g; '\
-' s/=PRIO/$(alt_prio)/g' \
+ sed -e "s/=V/$(release)/g; \
+ s/=PRIO/$(alt_prio)/g" \
< debian/libwxgtk-dbg.$$f \
> debian/$(package_gtk_dbg).$$f; \
done;
@for f in docs postinst prerm; do \
echo "generating control file $(package_gtk_py_lib).$$f"; \
- sed -e 's/=PY/$(python_ver)/g; '\
-' s|=WXPYDIR|$(wxpydir)|g; '\
-' s/=V/$(release)/g; '\
-' s/=PRIO/$(alt_prio)/g' \
+ sed -e "s/=PY/$(python_ver)/g; \
+ s|=WXPYDIR|$(wxpydir)|g; \
+ s/=V/$(release)/g; \
+ s/=PRIO/$(alt_prio)/g" \
< debian/python-wxgtk.$$f \
> debian/$(package_gtk_py_lib).$$f; \
done;
@for f in postinst prerm; do \
echo "generating control file $(package_gtk_dbg_py).$$f"; \
- sed -e 's/=PY/$(python_ver)/g; '\
-' s/=V/$(release)/g; '\
-' s/=PRIO/$(alt_prio)/g' \
+ sed -e "s/=PY/$(python_ver)/g; \
+ s/=V/$(release)/g; \
+ s/=PRIO/$(alt_prio)/g" \
< debian/python-wxgtk-dbg.$$f \
> debian/$(package_gtk_dbg_py).$$f; \
done;
@@ -267,7 +268,7 @@
@cp debian/python-wxgtk.docs debian/$(package_gtk_dbg_py).docs;
@for f in docs doc-base; do \
echo "generating control file $(package_doc).$$f"; \
- sed -e 's/=V/$(release)/g' < debian/wx-doc.$$f \
+ sed -e "s/=V/$(release)/g" < debian/wx-doc.$$f \
> debian/$(package_doc).$$f; \
done;
@for f in examples; do \
@@ -276,26 +277,26 @@
done;
@for f in postinst prerm; do \
echo "generating control file $(package_msw_dev).$$f"; \
- sed -e 's/=V/$(release)/g; '\
-' s/=H/$(cross_host)/g; '\
-' s/=PRIO/$(alt_prio)/g' \
+ sed -e "s/=V/$(release)/g; \
+ s/=H/$(cross_host)/g; \
+ s/=PRIO/$(alt_prio)/g" \
< debian/libwxmsw-dev.$$f \
> debian/$(package_msw_dev).$$f; \
done;
@for f in postinst prerm; do \
echo "generating control file $(package_msw_dbg).$$f"; \
- sed -e 's/=V/$(release)/g; '\
-' s/=H/$(cross_host)/g; '\
-' s/=PRIO/$(alt_prio)/g' \
+ sed -e "s/=V/$(release)/g; \
+ s/=H/$(cross_host)/g; \
+ s/=PRIO/$(alt_prio)/g" \
< debian/libwxmsw-dbg.$$f \
> debian/$(package_msw_dbg).$$f; \
done;
# @echo "generating control file $(package_common).menu"; \
-# sed -e 's/=V/$(release)/g' < debian/wx-common.menu \
+# sed -e "s/=V/$(release)/g" < debian/wx-common.menu \
# > debian/$(package_common).menu;
@echo "generating control file lintian-override"; \
- sed -e 's/=V/$(release)/g; '\
-' s/=SOV/$(sorelease)/g' \
+ sed -e "s/=V/$(release)/g; \
+ s/=SOV/$(sorelease)/g" \
< debian/lintian-override.in \
> debian/lintian-override; \
touch $@
