diff --git a/debian/changelog b/debian/changelog index bad022337..0ce098a89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ cmake (2.8.0~rc5-1) UNRELEASED; urgency=low * New upstream development release. - FindJNI.cmake does no longer get confused about multiple JVM installs (Closes: #553151). + * Switch to dpkg-source format 3.0 (quilt): + - drop build dependency on quilt; + - drop quilt.make snippet include from debian/rules. -- Modestas Vainius Fri, 06 Nov 2009 22:09:00 +0200 diff --git a/debian/control b/debian/control index 6daca654a..da4db1fd8 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: A. Maitland Bottoms Uploaders: Modestas Vainius DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 7), tcl8.4, quilt, +Build-Depends: debhelper (>= 7), tcl8.4, libcurl4-gnutls-dev, libxmlrpc-c3-dev, libexpat1-dev, zlib1g-dev, libncurses5-dev, libqt4-dev (>= 4.4.0) Standards-Version: 3.8.3 diff --git a/debian/rules b/debian/rules index dde59e619..9bb34c551 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f -include /usr/share/quilt/quilt.make - # The next line will cause Dart to be used if it is installed... #USE_DARTP:=$(shell if [ -d /usr/share/Dart ]; then echo true; fi ) USE_DARTP:= @@ -54,7 +52,7 @@ build-stamp: configure-stamp cd Build && $(MAKE) $(if $(USE_DARTP),Experimental && $(MAKE) ExperimentalSubmit) touch $@ -clean: unpatch +clean: dh_testdir dh_testroot rm -rf build-stamp configure-stamp $(BUILD_FLAGS_FILE) diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt)