Here's the patch for my NMU 2.3.5-1.1 of jde:
diff -u jde-2.3.5/debian/changelog jde-2.3.5/debian/changelog
--- jde-2.3.5/debian/changelog
+++ jde-2.3.5/debian/changelog
@@ -1,3 +1,15 @@
+jde (2.3.5-1.1) unstable; urgency=medium
+
+ * NMU.
+ * Medium urgency due to RC bug.
+ * Fix missing jde-require and version. Thanks to YANG Shouxun.
+ Closes: #327911.
+ * Added (require 'cedet) to jde.el.
+ * Use /usr/share/info, not /usr/info. But the code is not actually
+ executed, hrm.
+
+ -- Per Olofsson <[EMAIL PROTECTED]> Sun, 19 Feb 2006 00:39:13 +0100
+
jde (2.3.5-1) unstable; urgency=low
* New upstream release - closes: #283509
diff -u jde-2.3.5/debian/emacsen-remove jde-2.3.5/debian/emacsen-remove
--- jde-2.3.5/debian/emacsen-remove
+++ jde-2.3.5/debian/emacsen-remove
@@ -7,7 +7,7 @@
if [ ${FLAVOR} != emacs ]; then
if test -x /usr/sbin/install-info-altdir; then
echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
- install-info-altdir --quiet --remove --dirname=${FLAVOR}
/usr/info/jde.info.gz
+ install-info-altdir --quiet --remove --dirname=${FLAVOR}
/usr/share/info/jde.info.gz
fi
echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
diff -u jde-2.3.5/debian/emacsen-install jde-2.3.5/debian/emacsen-install
--- jde-2.3.5/debian/emacsen-install
+++ jde-2.3.5/debian/emacsen-install
@@ -27,7 +27,7 @@
# Maybe somebody will write it.
if test -x /usr/sbin/install-info-altdir; then
echo install/${PACKAGE}: install Info links for ${FLAVOR}
- install-info-altdir --quiet --section "" "" --dirname=${FLAVOR}
/usr/info/${PACKAGE}.info.gz
+ install-info-altdir --quiet --section "" "" --dirname=${FLAVOR}
/usr/share/info/${PACKAGE}.info.gz
fi
install -m 755 -d ${ELCDIR}
only in patch2:
unchanged:
--- jde-2.3.5.orig/lisp/jde-bug.el
+++ jde-2.3.5/lisp/jde-bug.el
@@ -36,6 +36,7 @@
;;; Code:
(require 'cl)
+(require 'jde-util)
(require 'jde-parse)
(require 'jde-dbs)
(require 'jde-dbo)
only in patch2:
unchanged:
--- jde-2.3.5.orig/lisp/jde.el
+++ jde-2.3.5/lisp/jde.el
@@ -70,6 +70,7 @@
(jde-root))))
(require 'jde-autoload))
+(require 'cedet)
(require 'jde-custom)
(require 'jde-help)
(require 'semantic-load)
@@ -987,22 +988,21 @@
(defun jde-check-version (current-version min-version max-version)
"Return non-nil if CURRENT-VERSION >= MIN-VERSION or <= MAX-VERSION."
- (and (or (jde-earlier-versionp current-version
- max-version)
- (string= current-version
- max-version))
- (or (jde-earlier-versionp min-version
- current-version)
- (string= current-version
- min-version))))
+ (not (inversion-test 'cedet min-version)))
(defun jde-earlier-versionp (ver1 ver2)
"Return non-nil if VER1 is earlier than VER2"
(let ((ver1-betap (string-match "beta" ver1))
- (ver2-betap (string-match "beta" ver2)))
+ (ver2-betap (string-match "beta" ver2))
+ (ver1-prep (string-match "pre" ver1))
+ (ver2-prep (string-match "pre" ver2)))
(if (or (and ver1-betap ver2-betap)
(and (not ver1-betap) (not ver2-betap)))
- (string< ver1 ver2)
+ (if (and ver2-prep (not ver1-prep))
+ nil
+ (if (and ver1-prep (not ver2-prep))
+ t
+ (string< ver1 ver2)))
(if ver1-betap
(progn
(or (string= ver2 (substring ver1 0 ver1-betap))
--
Pelle
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
