[SVN] r744 - in /trunk/cyrus-imapd-2.2.13/debian: changelog patches/00list patches/85-fix-option-passing.dpatch

[debian at incase.de]

Author: sven
Date: Mon Aug  6 21:41:38 2007
New Revision: 744

URL: https://mail.incase.de/viewcvs?rev=3D744&root=3Dcyrus22&view=3Drev
Log:
Fix a FTBFS error with multi-word CC options (like in Uwe Hermann's Open64 =
rebuild which used CC=3D"/opt/open64/bin/opencc -m32")

Added:
    trunk/cyrus-imapd-2.2.13/debian/patches/85-fix-option-passing.dpatch   =
(with props)
Modified:
    trunk/cyrus-imapd-2.2.13/debian/changelog
    trunk/cyrus-imapd-2.2.13/debian/patches/00list

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changel=
og?rev=3D744&root=3Dcyrus22&r1=3D743&r2=3D744&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Mon Aug  6 21:41:38 2007
@@ -1,8 +1,10 @@
-cyrus-imapd-2.2 (2.2.13-14) UNRELEASED-unstable; urgency=3Dlow
-
-  * [Placeholder] =

-
- -- Benjamin Seidenberg <benjamin at debian.org>  Fri, 22 Jun 2007 17:42:12 +=
0100
+cyrus-imapd-2.2 (2.2.13-14) UNRELEASED; urgency=3Dlow
+
+  * Fix a problem in lib/Makefile.in with multi-word CCs
+    (problem found by Uwe Hermann's try at building all Debian packages wi=
th
+    Open64 - kudos to him for this nice little project)
+
+ -- Sven Mueller <sven at debian.org>  Mon,  6 Aug 2007 21:39:58 +0200
 =

 cyrus-imapd-2.2 (2.2.13-13) unstable; urgency=3Dlow
 =


Modified: trunk/cyrus-imapd-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches=
/00list?rev=3D744&root=3Dcyrus22&r1=3D743&r2=3D744&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Mon Aug  6 21:41:38 2007
@@ -58,6 +58,7 @@
 75-update-imapd.conf-documentation.dpatch
 77-change-missing-sieve-notice.dpatch
 80-kbsd-no-psstrings.dpatch
+85-fix-option-passing.dpatch
 # optional patch: Allow upload of mails with "From " headers
 # 82-allow-from_-header.dpatch
 99-update-autoconf.dpatch

Added: trunk/cyrus-imapd-2.2.13/debian/patches/85-fix-option-passing.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches=
/85-fix-option-passing.dpatch?rev=3D744&root=3Dcyrus22&view=3Dauto
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/cyrus-imapd-2.2.13/debian/patches/85-fix-option-passing.dpatch (a=
dded)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/85-fix-option-passing.dpatch Mo=
n Aug  6 21:41:38 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 85-fix-option-passing.dpatch by Sven Mueller <sven at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/lib/Makefile.in cyrus-imapd-2.2.13/lib/Mak=
efile.in
+--- cyrus-imapd-2.2.13~/lib/Makefile.in	2007-08-06 21:16:23.419137227 +0200
++++ cyrus-imapd-2.2.13/lib/Makefile.in	2007-08-06 21:23:51.158077242 +0200
+@@ -134,7 +134,7 @@
+ 	$(RANLIB) libcyrus_min.a
+ =

+ imapopts.c: imapoptions $(srcdir)/../tools/config2header
+-	sed -e "s/%IDLE%/$(IDLE)/g" < $(srcdir)/imapoptions | $(srcdir)/../tools=
/config2header CC=3D$(CC) $(srcdir)/imapopts.c $(srcdir)/imapopts.h
++	sed -e "s/%IDLE%/$(IDLE)/g" < $(srcdir)/imapoptions | $(srcdir)/../tools=
/config2header CC=3D"$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h
+ =

+ imapopts.h: imapopts.c
+ =


Propchange: trunk/cyrus-imapd-2.2.13/debian/patches/85-fix-option-passing.d=
patch
---------------------------------------------------------------------------=
---
    svn:executable =3D *