Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-03-09 16:30:09 (GMT)
committer Jonas Smedegaard <dr@jones.dk>2008-03-09 16:30:09 (GMT)
commit6a0bd0b55e31af5468952fc0997fa8bbe9df8e52 (patch)
tree6bc364de68bc67cc5288c9ab99b1dd0f7b94eb93
parente0f711c6a3eb2ee2e2a7a8a42a90069ae7272c18 (diff)
* Drop documentation-related build-dependencies: Not yet integrateddebian/0.8.0.git.13d354b-2
with main build routines.
-rw-r--r--debian/changelog2
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules7
3 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 73e3d15..7e038c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ sugar-datastore (0.8.0~git.13d354b-2) unstable; urgency=low
try: except: finally: constructs, to support Python 2.4.
* Patch xapianindex to manually acquire and release locks (not using
with construct), to support Python 2.4.
+ * Drop documentation-related build-dependencies: Not yet integrated
+ with main build routines.
-- Jonas Smedegaard <dr@jones.dk> Sun, 09 Mar 2008 17:24:15 +0100
diff --git a/debian/control b/debian/control
index e93c975..ba42f1e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: sugar-datastore
Section: misc
Priority: optional
Maintainer: Jonas Smedegaard <dr@jones.dk>
-Build-Depends: cdbs (>= 0.4.23-1.1), libtool, automake1.10, autoconf, debhelper (>= 5), devscripts (>= 2.10.7), dh-buildinfo, python-all-dev, python-docutils, python-epydoc, python-central
+Build-Depends: cdbs (>= 0.4.23-1.1), libtool, automake1.10, autoconf, debhelper (>= 5), devscripts (>= 2.10.7), dh-buildinfo, python-all-dev, python-central
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/collab-maint/sugar-datastore.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-datastore.git;a=summary
diff --git a/debian/rules b/debian/rules
index 1cba4f7..0a775da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,9 +34,14 @@ binary-post-install/$(pkg)::
rmdir --ignore-fail-on-non-empty --parents $(DEB_DESTDIR)/usr/lib
# Needed by upstream build process
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev, python-docutils, python-epydoc
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev
+
+# Needed by upstream documentation build process
+# (disabled: not yet integrated with main build routines)
+#CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-docutils, python-epydoc
# Needed by upstream unittests
+# (disabled: seems broken - can't find own module olpc.datastore)
#CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-setuptools, python-dbus, python-gobject, sugar-toolkit
# Needed for our packaging routines