[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-43-gccf2a45

Steffen Moeller moeller at debian.org
Sat Jul 17 20:11:11 UTC 2010


The following commit has been merged in the master branch:
commit ccf2a45b030309aa8b6d4e9b2b21e8c51cae96b6
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Jul 17 22:10:36 2010 +0200

    source format 3.0, binary-indep target added

diff --git a/debian/changelog b/debian/changelog
index a671574..8de7c69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
-boinc (6.10.58+dfsg-2) UNRELEASED; urgency=low
+boinc (6.10.58+dfsg-2) unstable; urgency=low
 
+  [ Daniel Hahler ]
   * Use chrt instead of schedtool (LP: #527639)
     - debian/control, debian/boinc-client.init
+  [ Steffen Moeller ]
   * Removed from source tree for DFSG compliance
     - samples/glut
+  * Adopted source format 3.0 (quilt)
 
- -- Daniel Hahler <ubuntu at thequod.de>  Tue, 13 Jul 2010 23:49:19 +0200
+ -- Daniel Hahler <ubuntu at thequod.de>  Sat, 17 Jul 2010 22:08:09 +0200
 
 boinc (6.10.58+dfsg-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 32ecb85..300fb89 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
  Daniel Hahler <ubuntu at thequod.de>
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.0
-Build-Depends: debhelper (>= 7.0.17ubuntu2), quilt (>= 0.40), po-debconf, dh-buildinfo,
+Build-Depends: debhelper (>= 7.0.17ubuntu2), po-debconf, dh-buildinfo,
  docbook2x, docbook-xml, autotools-dev, automake1.9 (>= 1.9.3),
  autoconf (>= 2.59), libxml2-utils, gettext, zlib1g-dev, libssl-dev,
  libcurl4-openssl-dev (>= 7.17.1), freeglut3-dev, libsm-dev, libice-dev,
diff --git a/debian/rules b/debian/rules
index 60ac87e..43116ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,6 @@
 #export CXX=/usr/lib/gcc-snapshot/bin/g++
 #export CPP=/usr/lib/gcc-snapshot/bin/cpp
 
-include /usr/share/quilt/quilt.make
-
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -122,7 +120,7 @@ test-stamp:
 	  debian/conffiles/global_prefs_override.xml
 	touch $@
 
-autoreconf-stamp: patch
+autoreconf-stamp:
 	dh_testdir
 	cp -f /usr/share/misc/config.guess config.guess
 	cp -f /usr/share/misc/config.sub config.sub
@@ -151,7 +149,7 @@ build-boinc-client-stamp: autoreconf-stamp
 	#cp client/boinc.unmodified client/boinc.optimized
 	touch $@
 
-clean: clean-patched unpatch
+clean: clean-patched 
 clean-patched:
 	dh clean 
 	dh_clean \
@@ -225,6 +223,9 @@ binary-arch: install
 	dh_strip -a --dbg-package=boinc-dbg
 	dh binary-arch
 
+binary-indep: 
+	# nothing to do
+
 binary: binary-arch
 
 origDir ?= .
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list