tags 469494 + patch
thanks
Hi,
The following is the diff for my kde-style-qtcurve 0.55.2-2.1 NMU, which I
will upload to the delayed queue.
diff -u kde-style-qtcurve-0.55.2/debian/changelog
kde-style-qtcurve-0.55.2/debian/changelog
--- kde-style-qtcurve-0.55.2/debian/changelog
+++ kde-style-qtcurve-0.55.2/debian/changelog
@@ -1,3 +1,11 @@
+kde-style-qtcurve (0.55.2-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build with cmake in a subdirectory, to fix FTBFS if built twice in a row
+ (original patch by Sune Vuorela) (Closes: #469494)
+
+ -- Peter Eisentraut <[EMAIL PROTECTED]> Mon, 16 Jun 2008 13:10:09 +0200
+
kde-style-qtcurve (0.55.2-2) unstable; urgency=low
* Bumped standards version
diff -u kde-style-qtcurve-0.55.2/debian/rules
kde-style-qtcurve-0.55.2/debian/rules
--- kde-style-qtcurve-0.55.2/debian/rules
+++ kde-style-qtcurve-0.55.2/debian/rules
@@ -24,36 +24,29 @@
CFLAGS += -O2
endif
-config.status: CMakeLists.txt config.h.cmake
+builddir/config.h: CMakeLists.txt config.h.cmake
dh_testdir
# Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- cmake .
+ mkdir -p builddir
+ cd builddir && cmake ..
build: build-stamp
-build-stamp: config.status
+build-stamp: builddir/config.h
dh_testdir
# Add here commands to compile the package.
- $(MAKE)
- #docbook-to-man debian/kde-style-qtcurve.sgml > kde-style-qtcurve.1
+ $(MAKE) -C builddir
touch $@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
- rm -f config.sub config.guess
+ rm -f build-stamp
+ rm -rf builddir
dh_clean
@@ -64,7 +57,7 @@
dh_installdirs
# Add here commands to install the package into
debian/kde-style-qtcurve.
- $(MAKE) DESTDIR=$(CURDIR)/debian/kde-style-qtcurve install
+ $(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/kde-style-qtcurve install
# Build architecture-independent files here.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
