Pau Garcia i Quiles wrote:
Right, my mistake. I had uploaded an incomplete version. Please try
now. I have changed debian/rules to add build-resources, which is the
troublesome part, to the pre-requisites of both the static and the
shared build.
Still doesn't look right, the target dependencies have been changed in
debian/rules but paralell builds are still disabled and the changelog
hasn't been updated.
I took the liberty of fixing these issues myself so I could test. A
debdiff of what i'm testing with is attatched. Test results will follow
You appear to be a DM, can you upload witty yourself or will you be
needing sponsorship?
diff -u witty-3.3.3+dfsg/debian/changelog witty-3.3.3+dfsg/debian/changelog
--- witty-3.3.3+dfsg/debian/changelog
+++ witty-3.3.3+dfsg/debian/changelog
@@ -1,3 +1,19 @@
+witty (3.3.3+dfsg-3) unstable; urgency=medium
+
+ [Peter Michael Green]
+ * Fix minifier detection logic in debian/rules. Closes: #754662
+ * Change dependencies in debian/rules to use list of architectures where
+ nodejs is available rathe than incomplete list of architectures where
+ it is available.
+
+ [Pau Garcia i Quiles]
+ * Fix patch 12_install_wtconfig (wrong endif condition, although did no
+ harm)
+ * Fix target dependencies in debian/rules to (hopefully) make paralell
+ builds reliable.
+
+ -- Pau Garcia i Quiles <pgqui...@elpauer.org> Sat, 16 Aug 2014 18:18:42 +0200
+
witty (3.3.3+dfsg-2) unstable; urgency=medium
* Use yui-compressor where uglifyjs is not available. Closes: #754662
diff -u witty-3.3.3+dfsg/debian/control witty-3.3.3+dfsg/debian/control
--- witty-3.3.3+dfsg/debian/control
+++ witty-3.3.3+dfsg/debian/control
@@ -11,8 +11,9 @@
mtasc, libgraphicsmagick1-dev, lsb-release, hardening-wrapper, libjs-jquery,
libpango1.0-dev, python-pygments, firebird2.5-dev, libjs-jquery-jplayer,
jquery-jplayer-bluemonday, libmysqlclient-dev, fonts-font-awesome,
- libglew-dev (>= 1.10), libqt4-dev, yui-compressor [mips powerpc s390x],
- node-uglify [!mips !powerpc !s390x]
+ libglew-dev (>= 1.10), libqt4-dev,
+ yui-compressor [!amd64 !armel !armhf !i386 !kfreebsd-amd64 !kfreebsd-i386
!mipsel],
+ node-uglify [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mipsel]
Standards-Version: 3.9.5.0
Section: libdevel
Homepage: http://www.webtoolkit.eu/
diff -u witty-3.3.3+dfsg/debian/patches/12_install_wtconfig.dpatch
witty-3.3.3+dfsg/debian/patches/12_install_wtconfig.dpatch
--- witty-3.3.3+dfsg/debian/patches/12_install_wtconfig.dpatch
+++ witty-3.3.3+dfsg/debian/patches/12_install_wtconfig.dpatch
@@ -30,7 +30,7 @@
+IF(FORCE_INSTALL_WTCONFIG OR NOT EXISTS ${DESTDIR}${CONFIGDIR}/wt_config.xml)
INSTALL(FILES ${WT_BINARY_DIR}/wt_config.xml DESTINATION ${CONFIGDIR})
-ENDIF (NOT EXISTS ${CONFIGDIR}/wt_config.xml)
-+ENDIF(FORCE_INSTALL_WTCONFIG NOT EXISTS ${DESTDIR}${CONFIGDIR}/wt_config.xml)
++ENDIF(FORCE_INSTALL_WTCONFIG OR NOT EXISTS
${DESTDIR}${CONFIGDIR}/wt_config.xml)
IF(ENABLE_HARU AND HARU_FOUND)
SET(HAVE_HARU ON)
diff -u witty-3.3.3+dfsg/debian/rules witty-3.3.3+dfsg/debian/rules
--- witty-3.3.3+dfsg/debian/rules
+++ witty-3.3.3+dfsg/debian/rules
@@ -48,7 +48,7 @@
# yui-compressor (what upstream used in the past) where there is no UglifyJS
MINIFIER=$(shell which uglifyjs)
-ifdef MINIFIER
+ifneq ($(MINIFIER),)
MINIFIER_FLAGS=-c --no-seqs -nc
else
MINIFIER=/usr/bin/yui-compressor
@@ -73,7 +73,7 @@
CMAKEVERSION:=$(shell cmake --version | grep -o -P \(\\d\\.\\d\) | tr -d '\n')
-build-static/Makefile: patch-stamp
+build-static/Makefile: build-resources patch-stamp
dh_testdir
mkdir -p build-static
cd build-static && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr \
@@ -103,7 +103,7 @@
-DWEBUSER:STRING=www-data \
-DWEBGROUP:STRING=www-data
-build-shared/Makefile: patch-stamp
+build-shared/Makefile: build-resources patch-stamp
mkdir -p build-shared
cd build-shared && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_C_FLAGS="$(CFLAGS)"
-DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
@@ -140,7 +140,7 @@
build-indep: build
-build-stamp: build-resources build-static/Makefile build-shared/Makefile
+build-stamp: build-static/Makefile build-shared/Makefile
dh_testdir
cd build-static && $(MAKE) $(MAKEFLAGS)
cd build-shared && $(MAKE) $(MAKEFLAGS) && $(MAKE) $(MAKEFLAGS) doc
