This is an automated email from the git hooks/post-receive script. arand-guest pushed a commit to branch debdir in repository redeclipse.
commit c1e900c322ea0b3b3a79a9d54ae72c932aea4d3d Author: Arand Nash <[email protected]> Date: Mon Feb 21 17:57:05 2011 +0000 more installation mucking install in usr/games instead, use redeclipse.install for data into usr/share/games/redeclipse will need to separate out client/server/data laters --- dirs | 2 ++ emacsen-install.ex | 45 --------------------------------------------- emacsen-remove.ex | 15 --------------- emacsen-startup.ex | 25 ------------------------- patches/01_makefile.patch | 8 +++----- redeclipse.install | 1 + 6 files changed, 6 insertions(+), 90 deletions(-) diff --git a/dirs b/dirs new file mode 100644 index 0000000..7bcee9b --- /dev/null +++ b/dirs @@ -0,0 +1,2 @@ +usr/games +usr/share/games/redeclipse diff --git a/emacsen-install.ex b/emacsen-install.ex deleted file mode 100644 index 74d15c8..0000000 --- a/emacsen-install.ex +++ /dev/null @@ -1,45 +0,0 @@ -#! /bin/sh -e -# /usr/lib/emacsen-common/packages/install/redeclipse - -# Written by Jim Van Zandt <[email protected]>, borrowing heavily -# from the install scripts for gettext by Santiago Vila -# <[email protected]> and octave by Dirk Eddelbuettel <[email protected]>. - -FLAVOR=$1 -PACKAGE=redeclipse - -if [ ${FLAVOR} = emacs ]; then exit 0; fi - -echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} - -#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" - -ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} -ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} - -# 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/share/info/${PACKAGE}.info.gz -fi - -install -m 755 -d ${ELCDIR} -cd ${ELDIR} -FILES=`echo *.el` -cp ${FILES} ${ELCDIR} -cd ${ELCDIR} - -cat << EOF > path.el -(setq load-path (cons "." load-path) byte-compile-warnings nil) -EOF -${FLAVOR} ${FLAGS} ${FILES} -rm -f *.el path.el - -exit 0 diff --git a/emacsen-remove.ex b/emacsen-remove.ex deleted file mode 100644 index 8dfec86..0000000 --- a/emacsen-remove.ex +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -e -# /usr/lib/emacsen-common/packages/remove/redeclipse - -FLAVOR=$1 -PACKAGE=redeclipse - -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/share/info/redeclipse.info.gz - fi - - echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} - rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} -fi diff --git a/emacsen-startup.ex b/emacsen-startup.ex deleted file mode 100644 index 18e566c..0000000 --- a/emacsen-startup.ex +++ /dev/null @@ -1,25 +0,0 @@ -;; -*-emacs-lisp-*- -;; -;; Emacs startup file, e.g. /etc/emacs/site-start.d/50redeclipse.el -;; for the Debian redeclipse package -;; -;; Originally contributed by Nils Naumann <[email protected]> -;; Modified by Dirk Eddelbuettel <[email protected]> -;; Adapted for dh-make by Jim Van Zandt <[email protected]> - -;; The redeclipse package follows the Debian/GNU Linux 'emacsen' policy and -;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, -;; xemacs19, emacs20, xemacs20...). The compiled code is then -;; installed in a subdirectory of the respective site-lisp directory. -;; We have to add this to the load-path: -(let ((package-dir (concat "/usr/share/" - (symbol-name flavor) - "/site-lisp/redeclipse"))) -;; If package-dir does not exist, the redeclipse package must have -;; removed but not purged, and we should skip the setup. - (when (file-directory-p package-dir) - (setq load-path (cons package-dir load-path)) - (autoload 'redeclipse-mode "redeclipse-mode" - "Major mode for editing redeclipse files." t) - (add-to-list 'auto-mode-alist '("\\.redeclipse$" . redeclipse-mode)))) - diff --git a/patches/01_makefile.patch b/patches/01_makefile.patch index 8e713b2..3771587 100644 --- a/patches/01_makefile.patch +++ b/patches/01_makefile.patch @@ -1,17 +1,15 @@ --- a/src/Makefile +++ b/src/Makefile -@@ -170,10 +170,12 @@ +@@ -170,10 +170,10 @@ endif install-client: client - cp reclient ../bin/reclient$(PLATFORM_SUFFIX) -+ mkdir -p $(DESTDIR)/usr/bin/ -+ cp reclient $(DESTDIR)/usr/bin/reclient$(PLATFORM_SUFFIX) ++ cp reclient $(DESTDIR)/usr/games/reclient$(PLATFORM_SUFFIX) install-server: server - cp reserver ../bin/reserver$(PLATFORM_SUFFIX) -+ mkdir -p $(DESTDIR)/usr/bin/ -+ cp reserver $(DESTDIR)/usr/bin/reserver$(PLATFORM_SUFFIX) ++ cp reserver $(DESTDIR)/usr/games/reserver$(PLATFORM_SUFFIX) endif install: install-client install-server diff --git a/redeclipse.install b/redeclipse.install new file mode 100644 index 0000000..540f32e --- /dev/null +++ b/redeclipse.install @@ -0,0 +1 @@ +data usr/share/games/redeclipse -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
