From b964832e2ebf8272e19612db3acefaac1f619cf4 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Sat, 3 Jun 2006 21:18:35 +0000 Subject: [PATCH] Move Debian stuff into its own branch. * debian: Moved to muse--debian--0. git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-152 --- ChangeLog | 32 +++++++++++ debian/NEWS | 29 ---------- debian/changelog | 141 ------------------------------------------------ debian/compat | 1 - debian/control | 22 -------- debian/copyright | 42 --------------- debian/emacsen-install | 49 ----------------- debian/emacsen-remove | 15 ------ debian/emacsen-startup | 24 --------- debian/muse-el.dirs | 8 --- debian/muse-el.docs | 1 - debian/muse-el.examples | 3 -- debian/muse-el.info | 1 - debian/rules | 99 ---------------------------------- 14 files changed, 32 insertions(+), 435 deletions(-) delete mode 100644 debian/NEWS delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/emacsen-install delete mode 100644 debian/emacsen-remove delete mode 100644 debian/emacsen-startup delete mode 100644 debian/muse-el.dirs delete mode 100644 debian/muse-el.docs delete mode 100644 debian/muse-el.examples delete mode 100644 debian/muse-el.info delete mode 100755 debian/rules diff --git a/ChangeLog b/ChangeLog index 09b9466..b6b96e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,38 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2006/muse--main--1.0 # +2006-06-03 21:18:35 GMT Michael Olson patch-152 + + Summary: + Move Debian stuff into its own branch. + Revision: + muse--main--1.0--patch-152 + + * debian: Moved to muse--debian--0. + + removed files: + debian/.arch-ids/=id debian/.arch-ids/NEWS.id + debian/.arch-ids/changelog.id debian/.arch-ids/compat.id + debian/.arch-ids/control.id debian/.arch-ids/copyright.id + debian/.arch-ids/emacsen-install.id + debian/.arch-ids/emacsen-remove.id + debian/.arch-ids/emacsen-startup.id + debian/.arch-ids/muse-el.dirs.id + debian/.arch-ids/muse-el.docs.id + debian/.arch-ids/muse-el.examples.id + debian/.arch-ids/muse-el.info.id debian/.arch-ids/rules.id + debian/NEWS debian/changelog debian/compat debian/control + debian/copyright debian/emacsen-install debian/emacsen-remove + debian/emacsen-startup debian/muse-el.dirs debian/muse-el.docs + debian/muse-el.examples debian/muse-el.info debian/rules + + modified files: + ChangeLog + + removed directories: + debian debian/.arch-ids + + 2006-06-03 21:12:36 GMT Michael Olson patch-151 Summary: diff --git a/debian/NEWS b/debian/NEWS deleted file mode 100644 index 4c9debf..0000000 --- a/debian/NEWS +++ /dev/null @@ -1,29 +0,0 @@ -muse-el (3.02.02-1) unstable; urgency=low - -We now use a file extension for Muse files by default. - -To obtain the old behavior, set `muse-file-extension' to nil and -`muse-mode-auto-p' to t. - -To go along with the new behavior, be sure to rename all of your Muse -files to have a ".muse" extension. - - -- Michael W. Olson (GNU address) Sat, 19 Nov 2005 00:50:30 -0500 - -muse-el (3.02.01-1) unstable; urgency=low - -`muse-project-alist' -- This variable should now save customizations -to the correct form in the .emacs file. Before, it was saving an -intermediate form of the variable. - -If you have used the customize interface in the previous release of -Muse to set `muse-project-alist', please do the following to import -your settings. - - - Open your .emacs file. - - Move the point to where `muse-project-alist' is set. - - Type `M-: (setq muse-project-alist-using-customize t) RET'. - - Type `C-M-x'. - - Type `M-x customize-save-variable RET muse-project-alist RET'. - - -- Michael W. Olson (GNU address) Mon, 26 Sep 2005 17:00:46 -0500 diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index d733a78..0000000 --- a/debian/changelog +++ /dev/null @@ -1,141 +0,0 @@ -muse-el (3.02.90.arch.144-1) unstable; urgency=low - - * New Arch snapshot. - * control (Build-Depends): New field which contains debhelper - dependency. - (Standards-Version): Bump to 3.7.2. - - -- Michael W. Olson (GNU address) Mon, 29 May 2006 18:00:47 -0400 - -muse-el (3.02.90.arch.96-1) unstable; urgency=low - - * New Arch snapshot. - * Bug fix: "muse-el: Doesn't escape specials when publish using the - latex style", thanks to Jeremy Hankins (Closes: #340620). - * Bug fix: "muse-el: muse-http.el is not functional", thanks to Junichi - Uekawa (Closes: #357949). - - -- Michael W. Olson (GNU address) Fri, 7 Apr 2006 21:45:14 -0400 - -muse-el (3.02.6-2) unstable; urgency=low - - * Update copyright data. - * Bump `muse-version' up to 3.02.6. Thanks to Romain Francoise for - spotting this. - * debian/emacsen-install, debian/emacsen-statup: Use autoload file. - * debian/rules: (build-stamp): Make autoloads. - (install): Install NEWS properly. - - -- Michael W. Olson (GNU address) Mon, 16 Jan 2006 21:28:57 -0500 - -muse-el (3.02.6-1) unstable; urgency=low - - * New upstream release. - - -- Michael W. Olson (GNU address) Thu, 12 Jan 2006 22:22:01 -0500 - -muse-el (3.02.5-1) unstable; urgency=low - - * New upstream release. - - -- Michael W. Olson (GNU address) Sat, 17 Dec 2005 12:11:27 -0500 - -muse-el (3.02.02-1) unstable; urgency=low - - * New upstream release. - * debian/rules: Change dh_compat to v4, since the new version of - debhelper won't hit testing for a while, apparently. - * debian/control: Bump build-depends to debhelper 4.0.0. - - -- Michael W. Olson (GNU address) Sat, 19 Nov 2005 00:50:30 -0500 - -muse-el (3.02.01.arch.265-1) unstable; urgency=low - - * New Arch snapshot. - * debian/rules: Update dh_compat to v5. - - -- Michael W. Olson (GNU address) Sun, 6 Nov 2005 19:08:38 -0500 - -muse-el (3.02.01-1) unstable; urgency=low - - * New upstream release. - * If you have used the customize interface to save `muse-project-alist', - you will need to follow the instructions in NEWS.Debian. - - -- Michael W. Olson (GNU address) Mon, 26 Sep 2005 17:00:46 -0500 - -muse-el (3.02-1) unstable; urgency=medium - - * New upstream release. - - -- Michael W. Olson (GNU address) Fri, 16 Sep 2005 01:58:36 -0500 - -muse-el (3.01.arch.201-4) unstable; urgency=low - - * Makefile: Correct a build issue involving revisions and accidentally - modifying the original tarball. - - -- Michael W. Olson (GNU address) Thu, 18 Aug 2005 01:36:27 -0500 - -muse-el (3.01.arch.201-3) unstable; urgency=low - - * debian/control: Add emacs21 | emacsen to Build-Depends-Indep. This - should fix a potential build failure. We need a binary named `emacs' - at build time. - - -- Michael W. Olson (GNU address) Sun, 14 Aug 2005 16:28:34 -0500 - -muse-el (3.01.arch.201-2) unstable; urgency=low - - * debian/control: Shorten description and make first line match the ITP. - - -- Michael W. Olson (GNU address) Sun, 14 Aug 2005 13:45:49 -0500 - -muse-el (3.01.arch.201-1) unstable; urgency=low - - * New Arch snapshot. - * Initial Debian upload (Closes: #323020). - - -- Michael W. Olson (GNU address) Sun, 14 Aug 2005 02:02:03 -0500 - -muse-el (3.01.arch.195-1) unstable; urgency=low - - * New Arch snapshot. - * debian/rules (clean): Call $(MAKE) realclean instead of $(MAKE) clean. - * Attempt to ensure that the full set of changes is generated. - Thanks to Romain Francoise for the advice. - - -- Michael W. Olson (GNU address) Tue, 9 Aug 2005 16:40:40 -0500 - -muse-el (3.01.arch.188-1) unstable; urgency=low - - * New Arch snapshot. - - -- Michael W. Olson (GNU address) Wed, 27 Jul 2005 02:23:56 -0500 - -muse-el (3.01.arch.160-1) unstable; urgency=low - - * New Arch snapshot. - * debian/control: Add tetex-bin to Build-Depends-Indep. - - -- Michael W. Olson (GNU address) Tue, 19 Jul 2005 02:16:25 -0500 - -muse-el (3.01.arch.152-1) unstable; urgency=low - - * New Arch snapshot. - * debian/control: Expand description. - - -- Michael W. Olson (GNU address) Sun, 17 Jul 2005 21:57:34 -0500 - -muse-el (3.01.arch.150-1) unstable; urgency=low - - * New Arch snapshot. - - -- Michael W. Olson (GNU address) Sun, 17 Jul 2005 16:04:06 -0500 - -muse-el (3.01-1) unstable; urgency=low - - * Initial Release. - - -- Trent Buck Thu, 23 Jun 2005 13:03:38 +1000 - diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b8626c4..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/debian/control b/debian/control deleted file mode 100644 index 92b5dc1..0000000 --- a/debian/control +++ /dev/null @@ -1,22 +0,0 @@ -Source: muse-el -Section: web -Priority: optional -Maintainer: Michael W. Olson (GNU address) -Build-Depends: debhelper (>> 4.0.0) -Build-Depends-Indep: debhelper (>> 4.0.0), texinfo, tetex-bin, emacs21 | emacsen -Standards-Version: 3.7.2 - -Package: muse-el -Architecture: all -Depends: emacs21 | xemacs21 (>= 1.4.14) | emacsen -Description: Author and publish projects using Wiki-like markup - Emacs Muse is an authoring and publishing environment for Emacs. It - simplifies the process of writings documents and publishing them to - various output formats, such as DocBook, LaTeX, (X)HTML, TexInfo, and - PDF. It can even produce content suitable for blogging, such as - Blosxom-style .txt files and RDF or RSS 2.0 feeds, using the - muse-blosxom and muse-journal modules. - . - Muse consists of two main parts: an enhanced text-mode for authoring - documents and navigating within Muse projects, and a set of publishing - styles for generating different kinds of output. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 99ebce0..0000000 --- a/debian/copyright +++ /dev/null @@ -1,42 +0,0 @@ -This package was debianized by Trent Buck on -Thu, 23 Jun 2005 13:12:12 +1000. - -It was downloaded from -http://www.mwolson.org/projects/EmacsMuse.html - -Upstream Authors: John Wiegley - Michael Olson - Sacha Chua - Brad Collins - Li Daobing - Bastien Guerry - Yann Hodique - Andrew J. Korty - Peter K. Lee - Jim Ottaway - Per B. Sederberg - Dale P. Smith - John Sullivan - Ganesh Swami - -Copyright: - - Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, - 02110-1301, USA. - -On Debian systems, the complete text of the GNU General Public License -can be found in `/usr/share/common-licenses/GPL'. diff --git a/debian/emacsen-install b/debian/emacsen-install deleted file mode 100644 index a43297f..0000000 --- a/debian/emacsen-install +++ /dev/null @@ -1,49 +0,0 @@ -#! /bin/sh -e -# /usr/lib/emacsen-common/packages/install/muse - -# Written by Jim Van Zandt , borrowing heavily -# from the install scripts for gettext by Santiago Vila -# and octave by Dirk Eddelbuettel . - -FLAVOR=$1 -PACKAGE=muse-el - -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" -ELPREFIX=/usr/share/emacs/site-lisp/${PACKAGE} - -for i in ${PACKAGE} ${PACKAGE}/contrib; do - - ELDIR=/usr/share/emacs/site-lisp/$i - ELCDIR=/usr/share/${FLAVOR}/site-lisp/$i - - install -m 755 -d ${ELCDIR} - cd ${ELDIR} - FILES=`ls -1 *.el | grep -v autoloads` - rm -f ${ELCDIR}/*.el - cp ${FILES} ${ELCDIR} - cd ${ELCDIR} - - cat << EOF > path.el -(setq load-path (cons "${ELPREFIX}" (cons "${ELPREFIX}/contrib" load-path)) - byte-compile-warnings nil) -EOF - ${FLAVOR} ${FLAGS} ${FILES} 2>&1 | gzip -9qf > CompilationLog.gz - rm -f *.el path.el - ( cd ${ELDIR} - for f in *.el; do - ln -sf ${ELDIR}/${f} ${ELCDIR}/${f} - done - ) -done - -exit 0 diff --git a/debian/emacsen-remove b/debian/emacsen-remove deleted file mode 100644 index f895caf..0000000 --- a/debian/emacsen-remove +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -e -# /usr/lib/emacsen-common/packages/remove/muse - -FLAVOR=$1 -PACKAGE=muse-el - -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/emacs-wiki.info.gz - # fi - - echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} - rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} -fi diff --git a/debian/emacsen-startup b/debian/emacsen-startup deleted file mode 100644 index 86547f1..0000000 --- a/debian/emacsen-startup +++ /dev/null @@ -1,24 +0,0 @@ -;; -*-emacs-lisp-*- -;; -;; Emacs startup file for the Debian GNU/Linux muse package -;; -;; Originally contributed by Nils Naumann -;; Modified by Dirk Eddelbuettel -;; Adapted for dh-make by Jim Van Zandt -;; Adapted for Muse by Michael Olson - -;; The muse 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: - -;; Add the source file -(when (fboundp 'debian-pkg-add-load-path-item) - (let ((prefix (concat "/usr/share/" - (symbol-name flavor) - "/site-lisp/muse-el"))) - (debian-pkg-add-load-path-item prefix) - (debian-pkg-add-load-path-item (concat prefix "/contrib")))) - -(load "muse-autoloads.el") diff --git a/debian/muse-el.dirs b/debian/muse-el.dirs deleted file mode 100644 index b8be82d..0000000 --- a/debian/muse-el.dirs +++ /dev/null @@ -1,8 +0,0 @@ -usr/share/emacs/site-lisp/muse-el -usr/share/emacs/site-lisp/muse-el/contrib -usr/share/emacs/site-lisp/muse-el/experimental -usr/share/doc/muse-el -usr/share/doc/muse-el/contrib/pyblosxom -usr/share/doc/muse-el/examples -usr/share/doc/muse-el/examples/johnw -usr/share/doc/muse-el/examples/mwolson diff --git a/debian/muse-el.docs b/debian/muse-el.docs deleted file mode 100644 index 1936cc1..0000000 --- a/debian/muse-el.docs +++ /dev/null @@ -1 +0,0 @@ -html diff --git a/debian/muse-el.examples b/debian/muse-el.examples deleted file mode 100644 index 3043fad..0000000 --- a/debian/muse-el.examples +++ /dev/null @@ -1,3 +0,0 @@ -examples/mwolson -examples/johnw -examples/publish-project diff --git a/debian/muse-el.info b/debian/muse-el.info deleted file mode 100644 index f8302f8..0000000 --- a/debian/muse-el.info +++ /dev/null @@ -1 +0,0 @@ -muse.info diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 762b59c..0000000 --- a/debian/rules +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 -LANG=C -LC_CTYPE=C - -PACKAGE = muse-el -PKGDIR = debian/${PACKAGE} -DOCDIR = /usr/share/doc/${PACKAGE} -LISPDIR = /usr/share/emacs/site-lisp/${PACKAGE} - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - -build: configure-stamp build-stamp -build-stamp: - dh_testdir - makeinfo muse.texi - makeinfo --html --output=html muse.texi - # Add here commands to compile the package. - $(MAKE) autoloads - $(MAKE) examples - #/usr/bin/docbook-to-man debian/muse.sgml > muse.1 - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - # Add here commands to clean up after the build process. - -$(MAKE) realclean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/muse. - # $(MAKE) install DESTDIR=$(CURDIR)/debian/muse - install -m 644 lisp/*.el $(PKGDIR)$(LISPDIR) - install -m 644 experimental/*.el $(PKGDIR)$(LISPDIR)/experimental - install -m 644 contrib/*.el $(PKGDIR)$(LISPDIR)/contrib - install -m 644 contrib/pyblosxom/*.py $(PKGDIR)$(DOCDIR)/contrib/pyblosxom - - # Other documentation - install -m 0644 AUTHORS ${PKGDIR}${DOCDIR}/AUTHORS - install -m 0644 NEWS ${PKGDIR}${DOCDIR}/NEWS - install -m 0644 README ${PKGDIR}${DOCDIR}/README - install -m 0644 ChangeLog ${PKGDIR}${DOCDIR}/changelog - cat ChangeLog.2005 >> ${PKGDIR}${DOCDIR}/changelog - cat ChangeLog.2004 >> ${PKGDIR}${DOCDIR}/changelog - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot -# dh_installdebconf - dh_installdocs - dh_installexamples -# dh_installmenu -# dh_installlogrotate - dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installman - dh_installinfo -# dh_undocumented - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_makeshlibs - dh_installdeb -# dh_perl -# dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure -- 2.11.4.GIT