tag 401687 +pending +patch
tag 432185 +pending
thanks
On Sun, Jul 08, 2007 at 10:06:00AM +0200, Sven Joachim wrote:
> Package: gnuplot-mode
> Version: 1:0.6.0-2.1
> Severity: wishlist
> Tags: patch
>
> Could you please support emacs22, which is trivially achieved by the
> following patch?
Since there was no reply from the maintainer I have uploaded a NMU to the
DELAYED-2 queue, should go into the archive on Sunday.
This upload should also fix #401687 as well as some lintian warnings, and
also contains some minor cosmetic fixes.
Did not try to fix the lisp bugs, since IMHO that is better done through a
patch system to preserve upstream files integrity.
Patch attached, changelog follows:
* debian/emacsen-install:
- Support emacs22 (Closes: #432185).
- Set symlinks to .el files and do not load site files
when byte-compiling (Closes: #401687).
- Reorganize script for clarity.
* debian/control:
- debhelper should be in Build-Depends, not Build-Depends-Indep.
* debian/rules:
- Do not blindly ignore make clean error if a makefile is available.
* debian/changelog:
- Remove trailing whitespace
- Remove obsolete Local Variables section.
--
Agustin
diff -u gnuplot-mode-0.6.0/debian/changelog gnuplot-mode-0.6.0/debian/changelog
--- gnuplot-mode-0.6.0/debian/changelog
+++ gnuplot-mode-0.6.0/debian/changelog
@@ -1,3 +1,21 @@
+gnuplot-mode (1:0.6.0-2.2) unstable; urgency=low
+
+ * Non-Maintainer upload.
+ * debian/emacsen-install:
+ - Support emacs22 (Closes: #432185).
+ - Set symlinks to .el files and do not load site files
+ when byte-compiling (Closes: #401687).
+ - Reorganize script for clarity.
+ * debian/control:
+ - debhelper should be in Build-Depends, not Build-Depends-Indep.
+ * debian/rules:
+ - Do not blindly ignore make clean error if a makefile is available.
+ * debian/changelog:
+ - Remove trailing whitespace
+ - Remove obsolete Local Variables section.
+
+ -- Agustin Martin Domingo <[EMAIL PROTECTED]> Fri, 16 Nov 2007 13:20:01 +0100
+
gnuplot-mode (1:0.6.0-2.1) unstable; urgency=low
* NMU
@@ -20,7 +38,7 @@
gnuplot-mode (1:0.5r-1) unstable; urgency=low
- * New upstream version.
+ * New upstream version.
* Not globally bind the [f9] key. closes: #154435
-- Ryuichi Arafune <[EMAIL PROTECTED]> Tue, 30 Jul 2002 18:47:19 +0900
@@ -33,13 +51,13 @@
gnuplot-mode (1:0.5q-1) unstable; urgency=low
- * new upstream verion.
+ * new upstream verion.
-- Ryuichi Arafune <[EMAIL PROTECTED]> Tue, 17 Jul 2001 19:06:39 +0900
gnuplot-mode (1:0.5n-1) unstable; urgency=low
- * New upstream version.
+ * New upstream version.
-- Ryuichi Arafune <[EMAIL PROTECTED]> Wed, 31 Jan 2001 11:29:48 +0900
@@ -73,3 +91 @@
-Local variables:
-mode: debian-changelog
-End:
+
diff -u gnuplot-mode-0.6.0/debian/control gnuplot-mode-0.6.0/debian/control
--- gnuplot-mode-0.6.0/debian/control
+++ gnuplot-mode-0.6.0/debian/control
@@ -2,11 +2,11 @@
Section: math
Priority: optional
Maintainer: Ryuichi Arafune <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>> 3.0.5)
+Build-Depends: debhelper (>> 3.0.5)
Standards-Version: 3.5.8
Package: gnuplot-mode
-Architecture: all
+Architecture: all
Depends: emacsen, gnuplot-nox | gnuplot-x11
Description: Yet another Gnuplot mode for Emacs
Gnuplot is a major mode for Emacs flavours with the following features:
diff -u gnuplot-mode-0.6.0/debian/emacsen-install gnuplot-mode-0.6.0/debian/emacsen-install
--- gnuplot-mode-0.6.0/debian/emacsen-install
+++ gnuplot-mode-0.6.0/debian/emacsen-install
@@ -12,43 +12,43 @@
case "${FLAVOR}" in
- emacs20|emacs21|emacs-snapshot|xemacs20|xemacs21)
- echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
+ emacs20|emacs21|emacs22|emacs-snapshot|xemacs20|xemacs21)
+ echo "install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}"
+ ;;
+ *)
+ echo "install/${PACKAGE}: Ignoring emacsen flavor $FLAVOR."
+ exit 0;
+ ;;
+esac
-#FLAVORTEST=`echo $FLAVOR | cut -c-6`
-#if [ ${FLAVORTEST} = xemacs ] ; then
-# SITEFLAG="-no-site-file"
-#else
-# SITEFLAG="--no-site-file"
-#fi
- FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
+SITEFLAG="-no-site-file" # Do not load site files when byte-compiling
+FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
- ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
- ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
+ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-# Install-info-altdir does not actually exist.
+# Install-info-altdir does not actually exist.
# 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
#fi
- install -m 755 -d ${ELCDIR}
- cd ${ELDIR}
- FILES=`echo *.el`
- cp ${FILES} ${ELCDIR}
- cd ${ELCDIR}
+
+install -m 0755 -d ${ELCDIR}
+
+cd ${ELDIR}
+FILES=`echo *.el`
+
+cd ${ELCDIR}
+for i in $FILES; do
+ ln -sf ${ELDIR}/$i .
+done
cat << EOF > path.el
(setq load-path (cons "." load-path) byte-compile-warnings nil)
(require 'font-lock)
(defun hilit-repaint-command (foo))
EOF
- ${FLAVOR} ${FLAGS} ${FILES}
- rm -f *.el path.el
- ;;
- *)
- echo "install/${PACKAGE}: Ignoring emacsen flavor $FLAVOR."
- ;;
-esac
-
+${FLAVOR} ${FLAGS} ${FILES}
+rm -f path.el
exit 0
diff -u gnuplot-mode-0.6.0/debian/rules gnuplot-mode-0.6.0/debian/rules
--- gnuplot-mode-0.6.0/debian/rules
+++ gnuplot-mode-0.6.0/debian/rules
@@ -24,7 +24,7 @@
rm -f build-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_clean
