diff -Nru cyrus-imspd-1.8/debian/changelog cyrus-imspd-1.8/debian/changelog --- cyrus-imspd-1.8/debian/changelog 2017-11-30 06:56:22.000000000 +0000 +++ cyrus-imspd-1.8/debian/changelog 2017-11-29 19:51:15.000000000 +0000 @@ -1,3 +1,12 @@ +cyrus-imspd (1.8-4) unstable; urgency=medium + + * Convert to dh with compat 9. (10 would run autoreconf, which breaks) + * Fix imsp/Makefile.in to install to the correct location. + * Priority: optional. + * Remove Homepage, doesn't exist anymore. + + -- Christoph Berg Wed, 29 Nov 2017 20:51:15 +0100 + cyrus-imspd (1.8-3) unstable; urgency=low * Define MAXPATHLEN on hurd. diff -Nru cyrus-imspd-1.8/debian/compat cyrus-imspd-1.8/debian/compat --- cyrus-imspd-1.8/debian/compat 2017-11-30 06:56:22.000000000 +0000 +++ cyrus-imspd-1.8/debian/compat 2017-11-29 19:33:13.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru cyrus-imspd-1.8/debian/control cyrus-imspd-1.8/debian/control --- cyrus-imspd-1.8/debian/control 2017-11-30 06:56:22.000000000 +0000 +++ cyrus-imspd-1.8/debian/control 2017-11-29 19:50:02.000000000 +0000 @@ -1,12 +1,11 @@ Source: cyrus-imspd Section: mail -Priority: extra +Priority: optional Maintainer: Christoph Berg -Build-Depends: debhelper (>> 7), autotools-dev, chrpath, libldap-dev, libsasl2-dev, quilt -Standards-Version: 3.9.2 -Homepage: https://cyrusimap.web.cmu.edu/archives/rfc/imsp.html -Vcs-Git: git://git.debian.org/collab-maint/cyrus-imspd.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/cyrus-imspd.git +Build-Depends: debhelper (>> 9), autotools-dev, chrpath, libldap-dev, libsasl2-dev +Standards-Version: 4.1.1 +Vcs-Git: https://anonscm.debian.org/git/collab-maint/cyrus-imspd.git +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/cyrus-imspd.git Package: cyrus-imspd Architecture: any diff -Nru cyrus-imspd-1.8/debian/cyrus-imspd.install cyrus-imspd-1.8/debian/cyrus-imspd.install --- cyrus-imspd-1.8/debian/cyrus-imspd.install 2017-11-30 06:56:22.000000000 +0000 +++ cyrus-imspd-1.8/debian/cyrus-imspd.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -imsp/cyrus-imspd usr/sbin diff -Nru cyrus-imspd-1.8/debian/patches/destdir cyrus-imspd-1.8/debian/patches/destdir --- cyrus-imspd-1.8/debian/patches/destdir 1970-01-01 00:00:00.000000000 +0000 +++ cyrus-imspd-1.8/debian/patches/destdir 2017-11-29 19:48:46.000000000 +0000 @@ -0,0 +1,44 @@ +--- a/imsp/Makefile.in ++++ b/imsp/Makefile.in +@@ -76,7 +76,7 @@ quantify: cyrus-imspd.quant + $< + + install: cyrus-imspd +- $(INSTALL) -s cyrus-imspd $(DESTDIR)/cyrus/usr/cyrus/bin/imspd ++ $(INSTALL) -D cyrus-imspd $(DESTDIR)/usr/sbin/cyrus-imspd + + cyrus-imspd: $(IMSPDOBJS) $(DEPLIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o cyrus-imspd $(IMSPDOBJS) $(DEPLIBS) $(LIBS) +--- a/Makefile.in ++++ b/Makefile.in +@@ -29,7 +29,7 @@ VPATH = @srcdir@ + SHELL = /bin/sh + + all:: +- @for d in $(SUBDIRS); \ ++ @set -e; for d in $(SUBDIRS); \ + do \ + (cd $$d; echo "### Making" all "in" `pwd`; \ + $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all; \ +@@ -37,11 +37,7 @@ all:: + done + + install:: +- - mkdir ${DESTDIR}/cyrus +- - mkdir ${DESTDIR}/cyrus/usr +- - mkdir ${DESTDIR}/cyrus/usr/cyrus +- - mkdir ${DESTDIR}/cyrus/usr/cyrus/bin +- @for d in $(SUBDIRS); \ ++ @set -e; for d in $(SUBDIRS); \ + do \ + (cd $$d; echo "### Making" install "in" `pwd`; \ + $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) install ; \ +@@ -66,7 +62,7 @@ distclean:: + rm -f Makefile config.* + + depend:: +- @for d in $(SUBDIRS); \ ++ @set -e; for d in $(SUBDIRS); \ + do \ + (cd $$d; echo "### Making" depend "in" `pwd`; \ + $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) depend ; \ diff -Nru cyrus-imspd-1.8/debian/patches/series cyrus-imspd-1.8/debian/patches/series --- cyrus-imspd-1.8/debian/patches/series 2017-11-30 06:56:22.000000000 +0000 +++ cyrus-imspd-1.8/debian/patches/series 2017-11-29 19:43:52.000000000 +0000 @@ -7,3 +7,4 @@ bump-version maxhostnamelen maxpathlen +destdir diff -Nru cyrus-imspd-1.8/debian/rules cyrus-imspd-1.8/debian/rules --- cyrus-imspd-1.8/debian/rules 2017-11-30 06:56:22.000000000 +0000 +++ cyrus-imspd-1.8/debian/rules 2017-11-29 19:50:21.000000000 +0000 @@ -1,51 +1,19 @@ #!/usr/bin/make -f -include /usr/share/quilt/quilt.make +override_dh_autoreconf: + # skip autoreconf, doesn't work unfortunately -build build-arch: build-stamp -build-stamp: $(QUILT_STAMPFN) - dh_testdir - cp /usr/share/misc/config.guess /usr/share/misc/config.sub . - ./configure --prefix=/usr --with-statedir=/var/lib/imsp +override_dh_auto_configure: + dh_auto_configure -- --with-statedir=/var/lib/imsp + +override_dh_auto_build: $(MAKE) -C lib $(MAKE) # Remove /usr/local/lib rpath chrpath -d imsp/cyrus-imspd - touch build-stamp - -build-indep: - -clean: unpatch - dh_testdir - dh_testroot - rm -rf build-stamp ptclient - [ ! -f Makefile ] || $(MAKE) distclean - dh_clean - -install: build-stamp - dh_testdir - dh_testroot - dh_prep - dh_installdirs - dh_install -binary-indep: -binary binary-arch: build-stamp install - dh_testdir - dh_testroot +override_dh_installchangelogs: dh_installchangelogs notes/Changes-Todo - dh_installdocs - dh_installexamples - dh_installman - dh_installinit - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb -.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install +%: + dh $@ diff -Nru cyrus-imspd-1.8/debian/source/format cyrus-imspd-1.8/debian/source/format --- cyrus-imspd-1.8/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ cyrus-imspd-1.8/debian/source/format 2017-11-29 19:26:56.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)