Commit 70c3a3c1 authored by Olly Betts's avatar Olly Betts

debian/rules: Add zlib1g-dev to B-D for hardy, which needs it, probably

because on the new libmagic-dev B-D.

git-svn-id: file:///home/xapian-svn/xapian/trunk@15284 6b2f1b92-a4f3-0310-943f-de3cbe41748b
parent eda49e91
xapian-omega (1.2.4-2) UNRELEASED; urgency=low
* debian/rules: Add zlib1g-dev to B-D for hardy, which needs it, probably
because on the new libmagic-dev B-D.
-- Olly Betts <olly@survex.com> Fri, 24 Dec 2010 10:29:42 +0000
xapian-omega (1.2.4-1) unstable; urgency=low xapian-omega (1.2.4-1) unstable; urgency=low
* New upstream release. * New upstream release.
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# Codename we're building packages for. For backported packages, put the # Codename we're building packages for. For backported packages, put the
# codename (e.g. lenny or jaunty) in debian/codename. If that file doesn't # codename (e.g. lenny or jaunty) in debian/codename. If that file doesn't
# exist, the default is sid. # exist, the default is sid.
# CODENAME := $(shell cat debian/codename 2>/dev/null||echo sid) CODENAME := $(shell cat debian/codename 2>/dev/null||echo sid)
# Version without the "-N" suffix. # Version without the "-N" suffix.
XAPIAN_VERSION := $(shell sed 's/.*(\([^-]*\)\(-.*\)*).*/\1/;q' debian/changelog) XAPIAN_VERSION := $(shell sed 's/.*(\([^-]*\)\(-.*\)*).*/\1/;q' debian/changelog)
...@@ -68,6 +68,12 @@ BUILD_DEPS := \ ...@@ -68,6 +68,12 @@ BUILD_DEPS := \
libxapian-dev (>= $(XAPIAN_VERSION)), \ libxapian-dev (>= $(XAPIAN_VERSION)), \
libxapian-dev (<< $(XAPIAN_VERSION_CEILING)), libxapian-dev (<< $(XAPIAN_VERSION_CEILING)),
ifeq ($(CODENAME),hardy)
# We need -lz on hardy since adding the libmagic-dev B-D. I suspect in hardy
# the .la file for libmagic lists -lz, though I haven't verified this.
BUILD_DEPS += zlib1g-dev,
endif
commonconfflags := \ commonconfflags := \
$(confflags) \ $(confflags) \
--prefix=/usr \ --prefix=/usr \
......
#!/bin/sh -e #!/bin/sh
set -e
# Check package is being configured. # Check package is being configured.
if [ "$1" = configure ] ; then if [ "$1" = configure ] ; then
......
#!/bin/sh -e #!/bin/sh
set -e
# If we're being purged, then delete the templates directory. # If we're being purged, then delete the templates directory.
if [ "$1" = purge ] ; then if [ "$1" = purge ] ; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment