|
Hi, d-r. Several packages built from aplus-fsf source (aplus-fsf, aplus-fsf-doc, aplus-fsf-el, aplus-fsf-dev, xfronts-kapl) were removed from TESTING because there was a dependency on xemacs21-nomule, which in turn was removed from TESTING because of bug 670292. Most of aplus-fsf does not require xemacs21-nomule, just the aplus-fsf-el package. It appears to me that xemacs21 will not likely be restored, so in order to continue to make the rest of aplus-fsf available for users, I removed the functionality that depends on xemacs21-nomule from aplus-fsf, removed xemacs21-nomule from the Depends of the package, and uploaded that. I restricted the changes to that plus the addition of a NEWS file that says the functionality has been removed. Attached is the debdiff output for the source. Since the bug 670292 is not in aplus-fsf itself but in the xemacs21-nomule package, I did not close it via the changelog. I did file an unblock bug for aplus-fsf; it is 683831. Thanks. -- Neil Roeth |
diff -u aplus-fsf-4.22.1/config/config.sub aplus-fsf-4.22.1/config/config.sub
--- aplus-fsf-4.22.1/config/config.sub
+++ aplus-fsf-4.22.1/config/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2012-04-18'
+timestamp='2012-02-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -225,12 +225,6 @@
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
- -lynx*178)
- os=-lynxos178
- ;;
- -lynx*5)
- os=-lynxos5
- ;;
-lynx*)
os=-lynxos
;;
@@ -1543,9 +1537,6 @@
c4x-* | tic4x-*)
os=-coff
;;
- hexagon-*)
- os=-elf
- ;;
tic54x-*)
os=-coff
;;
diff -u aplus-fsf-4.22.1/debian/rules aplus-fsf-4.22.1/debian/rules
--- aplus-fsf-4.22.1/debian/rules
+++ aplus-fsf-4.22.1/debian/rules
@@ -134,10 +134,10 @@
dh_testdir
dh_testroot
rm -fr debian/aplus-fsf-el/ debian/aplus-fsf-el.*.debhelper
- #dh_installdirs
- #dh_install
- #dh_installdocs
- #dh_installemacsen --flavor=xemacs21
+ dh_installdirs
+ dh_install
+ dh_installdocs
+ dh_installemacsen --flavor=xemacs21
dh_installchangelogs ChangeLog
dh_compress
dh_fixperms
diff -u aplus-fsf-4.22.1/debian/changelog aplus-fsf-4.22.1/debian/changelog
--- aplus-fsf-4.22.1/debian/changelog
+++ aplus-fsf-4.22.1/debian/changelog
@@ -1,11 +1,3 @@
-aplus-fsf (4.22.1-5) unstable; urgency=low
-
- * Made aplus-fsf-el inoperative because it depends upon XEmacs 21 which
- is removed from Debian. Files can still be edited with vi in an
- xterm, and the interpreter is still fully functional.
-
- -- Neil Roeth <neil@debian.org> Fri, 03 Aug 2012 20:04:08 -0400
-
aplus-fsf (4.22.1-4.2) unstable; urgency=low
* Non maintainer upload.
reverted:
--- aplus-fsf-4.22.1/debian/aplus-fsf-el.NEWS
+++ aplus-fsf-4.22.1.orig/debian/aplus-fsf-el.NEWS
@@ -1,5 +0,0 @@
-The aplus-fsf-el package has been made inoperative because the XEmacs package
-upon which it dependes has been removed from Debian. The shell of the package
-remains in case XEmacs is resurrected or A+ can be made to work with FSF
-Emacs. As an alternative, you can view and edit A+ files in an xterm using the
-xfonts-kapl package.
diff -u aplus-fsf-4.22.1/debian/control aplus-fsf-4.22.1/debian/control
--- aplus-fsf-4.22.1/debian/control
+++ aplus-fsf-4.22.1/debian/control
@@ -29,7 +29,7 @@
Package: aplus-fsf-el
Section: lisp
Architecture: all
-Depends: ${misc:Depends}
+Depends: xemacs21-nomule, ${misc:Depends}
Description: XEmacs lisp for A+ development
This package contains the XEmacs lisp required for the development of A+
programs. It does the key bindings, sets the font properly, and binds some