diff -u cedet-1.0pre4/debian/control cedet-1.0pre4/debian/control --- cedet-1.0pre4/debian/control +++ cedet-1.0pre4/debian/control @@ -1,7 +1,8 @@ Source: cedet Section: editors Priority: optional -Maintainer: Michael W. Olson (GNU address) +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Michael W. Olson (GNU address) Uploaders: Masayuki Hatta (mhatta) Build-Depends: debhelper (>= 4.0.0) Standards-Version: 3.7.3 diff -u cedet-1.0pre4/debian/changelog cedet-1.0pre4/debian/changelog --- cedet-1.0pre4/debian/changelog +++ cedet-1.0pre4/debian/changelog @@ -1,3 +1,11 @@ +cedet (1:1.0pre4-3ubuntu1) karmic; urgency=low + + * debian/patches/0010-Fix-byte-compile-error-outbuffer.patch: + - handle renamed outbuffer to bytecomp-outbuffer during byte compile + (LP: #420402) + + -- Anselm Helbig Sat, 03 Oct 2009 13:39:31 +0200 + cedet (1:1.0pre4-3) unstable; urgency=low * debian/control: only in patch2: unchanged: --- cedet-1.0pre4.orig/debian/patches/0010-Fix-byte-compile-error-outbuffer.patch +++ cedet-1.0pre4/debian/patches/0010-Fix-byte-compile-error-outbuffer.patch @@ -0,0 +1,19 @@ +Subject: Fixes byte compile error for emacs-snapshot, outbuffer variable was renamed to bytecomp-outbuffer +Bug-Ubuntu: https://launchpad.net/bugs/420402 +Origin: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/cedet/files/cedet-1.0_pre6-fix-eieio-comp.patch?view=markup + +diff -Naur eieio.org/eieio-comp.el eieio/eieio-comp.el +--- cedet/eieio/eieio-comp.el 2009-10-03 13:26:17.000000000 +0200 ++++ ceted/eieio/eieio-comp.el 2009-10-03 13:27:15.000000000 +0200 +@@ -74,7 +74,10 @@ + (class (if (listp arg1) (nth 1 arg1) nil)) + (my-outbuffer (if (eval-when-compile + (string-match "XEmacs" emacs-version)) +- byte-compile-outbuffer outbuffer)) ++ byte-compile-outbuffer ++ (condition-case nil ++ bytecomp-outbuffer ++ (error outbuffer)))) + ) + (let ((name (format "%s::%s" (or class "#") meth))) + (if byte-compile-verbose