Am 2010-04-11 20:26, schrieb Leo 'costela' Antunes: > On 11/04/10 20:13, Michael Musenbrock wrote: > >> So the attached patch should do the trick again. >> > I assumed the package Alexander had prepared already > included your first patch, so I didn't even check. > So that the patch will break the whole thing on ubuntu, he can't use the patch for the ubuntu system, I think that was the reason.
@Alexander Prepared a new patch, this one can be used both for the ubuntu and the debian package. So you can use the 'same' build rules on both systems (Have no Ubuntu system to test). Regards
--- enigmail-1.0.1.orig/debian/rules 2010-04-10 01:39:14.000000000 +0200 +++ enigmail-1.0.1/debian/rules 2010-04-11 22:08:56.000000000 +0200 @@ -3,7 +3,14 @@ #BUILDDIR = $(CURDIR)/objdir-enigmail BUILDDIR = $(CURDIR) -TBIRD_SDK = $(shell ls -d /usr/lib/thunderbird-devel-3* | head -n1) +TBIRD_SDK = $(shell ls -d /usr/lib/thunderbird-devel-3* /usr/lib/icedove-devel* 2> /dev/null | head -n1) + +ifneq (,$(findstring icedove,$(TBIRD_SDK))) +DEBIANSPECIFICFLAGS = --with-system-nspr --with-system-nss +else +DEBIANSPECIFICFLAGS = +endif + %: # dh --with quilt --with xul-ext --builddirectory=$(BUILDDIR) $@ @@ -11,7 +18,7 @@ override_dh_auto_configure: mkdir -p $(BUILDDIR) - cd $(BUILDDIR); $(CURDIR)/configure --with-libxul-sdk=$(TBIRD_SDK) --enable-application=extensions --enable-extensions=enigmail --disable-debug --disable-tests --disable-crashreporter --disable-ogg + cd $(BUILDDIR); $(CURDIR)/configure --with-libxul-sdk=$(TBIRD_SDK) --enable-application=extensions --enable-extensions=enigmail --disable-debug --disable-tests --disable-crashreporter --disable-ogg $(DEBIANSPECIFICFLAGS) override_dh_auto_build: # dh_auto_build --builddirectory=$(BUILDDIR)
