debian/0000755000000000000000000000000012132315014007156 5ustar debian/patch-to-news0000755000000000000000000000072712131140556011611 0ustar #!/bin/bash set -e patch="$1" sed ' # delete everything after the first line starting with "--- " (the diff) /^--- [^ ]/,$d' < "$patch" \ | tac \ | sed ' # delete everything up to the first line containing only "---" (the diffstat) 1,/^---$/d' \ | tac \ | sed ' # delete everything before the first blank line (git summary line) 1,/^$/d' \ | sed ' # convert to our README.Debian NEWS format 1 s/^/* / 2,$ s/^/ /' echo " Patch: $(basename $patch)" debian/mangle-info0000755000000000000000000000046012132313021011274 0ustar #!/usr/bin/perl -w -i use English; use strict; $RS = undef; my $prefix = $ENV{"DEBIAN_INFO_PREFIX"}; my $x = <>; if(!($x =~ m/^(\s*START-INFO-DIR-ENTRY\s+\*\s*[^:]+:\s*)\(([^\)]+)\)/mo)) { die "Couldn't find START-INFO-DIR-ENTRY."; } print ${PREMATCH}; print "$1($prefix/$2)"; print ${POSTMATCH}; debian/control0000644000000000000000000000213112132314714010564 0ustar Source: emacs24-non-dfsg Section: non-free/editors Priority: optional Maintainer: Rob Browning Uploaders: Jerome Marant Build-Depends: texinfo, autotools-dev, dpkg-dev (>> 1.10.0), quilt, debhelper (>= 9) Standards-Version: 3.7.2 Package: emacs24-common-non-dfsg Section: non-free/editors Priority: optional Architecture: all Depends: ${shlibs:Depends}, dpkg (>= 1.15.4) | install-info Conflicts: emacs22-common (<< 22.2) Replaces: emacs22-common (<< 22.2) Description: GNU Emacs common non-DFSG items, including the core documentation This package includes the core Emacs documentation: the Emacs Info pages, the Emacs Lisp Reference Manual, and the Emacs Lisp Intro. . GNU Emacs is the extensible self-documenting text editor. This package contains the architecture independent infrastructure that is not compliant with the Debian Free Software Guidelines. In particular, this includes some of the GNU Emacs info pages, as they are covered under the GFDL, and specify invariant sections. See http://www.debian.org/vote/2006/vote_001 for more information. debian/emacs-common-non-dfsg.lintian-overrides0000644000000000000000000000016112132313021016617 0ustar # This is not a license file. emacs24-common-non-dfsg: extra-license-file usr/share/emacs/24.1/etc/copying.paper debian/source/0000755000000000000000000000000012131140556010464 5ustar debian/source/format0000644000000000000000000000001412131140556011672 0ustar 3.0 (quilt) debian/compat0000644000000000000000000000000212131140556010362 0ustar 9 debian/copyright.in0000644000000000000000000000434012132313021011513 0ustar -*-text-*- This package is derived from the main Emacs packages which were debianized by Rob Browning on Tue, 16 Dec 1997 00:05:45 -0600. The original source archive is emacs-@UPSTREAM_VERSION@.tar.gz, and it can be found here for stable releases: ftp://ftp.gnu.org:/gnu/emacs/ and here for alpha pre-releases: ftp://alpha.gnu.org:/gnu/emacs/pretest/ Please see /usr/share/doc/@DEB_FLAVOR@-common-non-dfsg/README.Debian.gz for a description of the Debian specific differences from the upstream version. This package contains files which have been deemed unsuitable for Debian main because their licenses do not appear to satisfy the requirements of the Debian Free Software Guidelines (DFSG). See http://www.debian.org/social_contract. In particular, some of the info pages included in this package are covered under the GNU Free Documentation License (GFDL), which Debian has decided does not satisfy the DFSG in cases where "Invariant Sections" are specified. See this Debian General Resolution on the topic: http://www.debian.org/vote/2006/vote_001. Some other files are included here because their license only allows verbatim copying, or because there was some other question regarding their license. Copyright: Emacs itself is licensed under the terms of the GNU General Public License (GPL), Version 3. See the file /usr/share/common-licenses/GPL-3 for more information. In general, the info pages are covered under the GNU Free Documentation License (GFDL). See the "GNU Free Documentation License" node in "info emacs-@MAJOR_VERSION@/emacs". etc/INTERVIEW contains the following statement: Copyright (C) 1986 Richard Stallman. Permission is granted to make and distribute copies of this article as long as the copyright and this notice appear on all copies. etc/MOTIVATION contains the following statement: [reprinted with permission of the author from the Monday 19 January 1987 Boston Globe] These files appear to only allow verbatim copying: etc/CENSORSHIP etc/GNU etc/LINUX-GNU etc/THE-GNU-PROJECT etc/WHY-FREE etc/copying.paper These files appear to have no explicit copyright statement: etc/COOKIES etc/DEVEL.HUMOR etc/JOKES debian/patches/0000755000000000000000000000000012132313021010601 5ustar debian/patches/series0000644000000000000000000000007412132313021012017 0ustar 0001-Adjust-the-build-system-to-handle-the-DFSG-split.patch debian/patches/0001-Adjust-the-build-system-to-handle-the-DFSG-split.patch0000644000000000000000000000265012132313021023133 0ustar From 3e90823b842631b17930f5c6b690c17bc1e47bb0 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sat, 9 Apr 2011 20:41:52 -0500 Subject: Adjust the build system to handle the DFSG split. This package contains the Emacs files that do not appear to satisfy the DFSG. Author: Rob Browning Added-by: Rob Browning Status: new --- doc/misc/Makefile.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index dfe633c..c936a23 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -43,7 +43,7 @@ MAKEINFO_OPTS = --force -I$(emacsdir) INFO_TARGETS = ada-mode auth autotype bovine calc ccmode cl \ dbus dired-x ebrowse ede ediff edt eieio \ - emacs-mime epa erc ert eshell eudc efaq \ + emacs-mime epa erc ert eshell eudc \ flymake forms gnus emacs-gnutls htmlfontify idlwave info.info \ mairix-el message mh-e newsticker nxml-mode \ org pcl-cvs pgg rcirc remember reftex sasl \ @@ -71,7 +71,6 @@ DVI_TARGETS = \ ert.dvi \ eshell.dvi \ eudc.dvi \ - faq.dvi \ flymake.dvi \ forms.dvi \ gnus.dvi \ @@ -127,7 +126,6 @@ PDF_TARGETS = \ ert.pdf \ eshell.pdf \ eudc.pdf \ - faq.pdf \ flymake.pdf \ forms.pdf \ gnus.pdf \ @@ -162,7 +160,7 @@ PDF_TARGETS = \ wisent.pdf \ woman.pdf -HTML_TARGETS = emacs-faq.html +HTML_TARGETS = TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf debian/.git-dpm0000644000000000000000000000044012132313021010512 0ustar # see git-dpm(1) from git-dpm package 3e90823b842631b17930f5c6b690c17bc1e47bb0 3e90823b842631b17930f5c6b690c17bc1e47bb0 1861589f27624c6d06904a90934666faf3b0f1df 1861589f27624c6d06904a90934666faf3b0f1df emacs24-non-dfsg_24.3+1.orig.tar.bz2 a58ab0b799e810297708e492d847a5a4261e30f7 3447177 debian/rules0000755000000000000000000001625312132313021010241 0ustar #!/usr/bin/make -f # -*- makefile -*- # This file is licensed under the terms of the Gnu Public License. # With the one additional provision that Ian Jackson's name may not be # removed from the file. # Copyright 1994,1995 Ian Jackson # Copyright 2004-2005 Jérôme Marant # Copyright 1998-2012 Rob Browning # Originally copied from the GNU Hello Debian rules file (1.3). # Modified for emacs by Mark Eichin . # Debhelper support added via one of Joey Hess' example files. # See the debian/changelog for further historical information. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 SHELL := /bin/bash quilt := QUILT_PATCHES=debian/patches quilt # For now we assume that emacs' versioning scheme is always # MAJOR.MINORtinyrev where MAJOR and MINOR are integers and tinyrev is # an optional lowercase letter (or letters). We also assume that # upstream uses a numbering scheme that sorts in a "Debian friendly" # way. So far that's always been true. If it becomes false, some of # the values below will have to be set manually. # The official upstream version defined by AC_INIT in configure.in. upstream_ver := 24.3 # This must be the version that's actually used at runtime for things # like load-path. Historically, it's only differed from upstream_ver # by a trailing letter, i.e. 20.5a -> 20.5. runtime_ver := $(shell echo $(upstream_ver) | perl -pe 's/[a-z]+$$//o') major_ver := $(shell echo $(runtime_ver) | perl -pe 's/\..*$$//o') minor_ver := $(shell echo $(runtime_ver) | perl -pe 's/^[^.]*\.//o') # The name of the Debian source package src_name := $(shell dpkg-parsechangelog | egrep '^Source:') src_name := $(shell echo $(src_name) | perl -pe 's/Source:\s+//o') # The version from the changelog (i.e. 20.5-1) debian_ver := $(shell dpkg-parsechangelog | egrep '^Version:') debian_ver := $(shell echo $(debian_ver) | perl -pe 's/Version:\s+//o') # The Debian revision (i.e. the 1 from 20.5-1) # Always everything after the last '-' debian_rev := $(shell echo $(debian_ver) | perl -pe 's/.*-//o') # Might be 21.3, or it might be 21.3+1 if we've had to have more than # one re-release of the upstream source (rare, but it happens), or if # we have to split the package for DFSG purposes. Always everything # before the last '-' debsrc_ver := $(shell echo $(debian_ver) | perl -pe 's/-[^-]+$$//o') # The flavor (i.e. emacs21) currently matches the source package name. flavor := $(shell echo $(src_name) | perl -pe 's/-non-dfsg$$//o') # These files must always exist, i.e. can't ever be cleaned. persistent_autogen_files := debian/control debian/copyright nonpersistent_autogen_files := debian/$(flavor)-common-non-dfsg.README.Debian autogen_files := $(persistent_autogen_files) $(nonpersistent_autogen_files) pkgdir_common := $(CURDIR)/debian/$(flavor)-common-non-dfsg common_etc_dir := $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc define deb_sub perl -p \ -e "s|\@PKG_NAME\@|$(pkg_name)|go;" \ -e "s|\@MAJOR_VERSION\@|$(major_ver)|go;" \ -e "s|\@MINOR_VERSION\@|$(minor_ver)|go;" \ -e "s|\@FULL_VERSION\@|$(runtime_ver)|go;" \ -e "s|\@PACKAGE_VERSION\@|$(debian_ver)|go;" \ -e "s|\@DEBIAN_REV\@|$(deb_rev)|go;" \ -e "s|\@UPSTREAM_VERSION\@|$(upstream_ver)|go;" \ -e "s|\@DEBSRC_VERSION\@|$(debsrc_ver)|go;" \ -e "s|\@DEB_FLAVOR\@|$(flavor)|go;" \ < debian/$(1) > debian/$(2) endef %: dh $@ --parallel .PHONY: check-vars check-vars: @echo "upstream_ver: $(upstream_ver)" @echo "debian_ver: $(debian_ver)" @echo "debsrc_ver: $(debsrc_ver)" @echo "debian_rev: $(debian_rev)" @echo "runtime_ver: $(runtime_ver)" @echo "major_ver: $(major_ver)" @echo "minor_ver: $(minor_ver)" .PHONY: debian-sync debian-sync: $(persistent_autogen_files) # so dh pattern rule doesn't try to handle this target true debian/$(flavor)-common-non-dfsg.README.Debian: \ debian/emacs-common-non-dfsg.README \ debian/patches/*.patch debian/patches/series \ debian/rules debian/patch-to-news cd debian && \ csplit -s -f emacs-common-non-dfsg.README. \ emacs-common-non-dfsg.README '/@@PATCH_LIST_HERE@@/' cp debian/emacs-common-non-dfsg.README.00 \ debian/emacs-common-non-dfsg.README.tmp for p in $$($(quilt) series); do \ debian/patch-to-news debian/patches/$$p \ >> debian/emacs-common-non-dfsg.README.tmp; \ echo >> debian/emacs-common-non-dfsg.README.tmp; \ done tail -n +2 \ < debian/emacs-common-non-dfsg.README.01 \ >> debian/emacs-common-non-dfsg.README.tmp mv debian/emacs-common-non-dfsg.README.tmp $@ debian/%: debian/%.in debian/changelog debian/rules $(call deb_sub,$(notdir $<),$(notdir $@)) define gen_makefile perl -p \ -e "s|\@top_srcdir\@|$(CURDIR)|go;" \ -e "s|\@SHELL\@|/bin/bash|go;" \ -e "s|\@srcdir\@|$(CURDIR)/$1|go;" \ -e "s|\@VPATH\@|$(CURDIR)/$1|go;" \ -e "s|\@MAKEINFO\@|makeinfo|go;" \ -e "s|\@MKDIR_P\@|mkdir -p|go;" \ -e "s|\@INFO_OPTS\@|--no-split|go;" \ -e "s|\@INFO_EXT\@|.info|go;" \ < $1/Makefile.in > $1/Makefile endef override_dh_auto_configure: $(autogen_files) $(call gen_makefile,doc/emacs) $(call gen_makefile,doc/lispintro) $(call gen_makefile,doc/lispref) $(call gen_makefile,doc/misc) override_dh_auto_build: $(autogen_files) rm -rf info && install -d info $(MAKE) -C doc/emacs $(MAKE) -C doc/lispintro $(MAKE) -C doc/lispref $(MAKE) -C doc/misc pkg_infodir := $(pkgdir_common)/usr/share/info/emacs-$(major_ver) override_dh_auto_install: pkg_name := $(flavor)-common-non-dfsg override_dh_auto_install: $(autogen_files) rm -rf $(pkgdir_common) && install -d $(pkgdir_common) # info files install -d $(pkgdir_common)/usr/share/info/emacs-$(major_ver) cp -a info/* $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/ # etc files install -d $(common_etc_dir) cp -a etc/* $(common_etc_dir)/ rm $(common_etc_dir)/COPYING install -d $(pkgdir_common)/usr/share/doc/$(flavor)-common-non-dfsg # Mangle info menu entries for subdir. chmod 755 debian/mangle-info DEBIAN_INFO_PREFIX=emacs-$(major_ver) \ debian/mangle-info $(pkg_infodir)/eintr.info DEBIAN_INFO_PREFIX=emacs-$(major_ver) \ debian/mangle-info $(pkg_infodir)/emacs.info DEBIAN_INFO_PREFIX=emacs-$(major_ver) \ debian/mangle-info $(pkg_infodir)/elisp.info # Handle doc/misc files. set -e; \ set -x; \ for f in $$(make -f doc/misc/Makefile -f debian/makefile-bit-doc-misc \ echo-info-targets \ | grep INFO_TARGETS= | cut -b 14-); \ do \ DEBIAN_INFO_PREFIX=emacs-$(major_ver) \ debian/mangle-info $(pkg_infodir)/$${f%.info}.info; \ done install -d $(pkgdir_common)/usr/share/lintian/overrides cp -a debian/emacs-common-non-dfsg.lintian-overrides \ $(pkgdir_common)/usr/share/lintian/overrides/$(flavor)-common-non-dfsg override_dh_testdir: dh_testdir debian/emacs-common-non-dfsg.README etc/THE-GNU-PROJECT override_dh_clean: $(persistent_autogen_files) rm -rf \ debian/*-stamp \ debian/*.tmp \ debian/emacs-common-non-dfsg.README.00 \ debian/emacs-common-non-dfsg.README.01 \ debian/emacs-common-non-dfsg.README.tmp \ doc/emacs/Makefile \ doc/lispintro/Makefile \ doc/lispref/Makefile \ doc/misc/Makefile \ info rm -f $(nonpersistent_autogen_files) dh_clean debian/control.in0000644000000000000000000000216312132313021011164 0ustar Source: emacs@MAJOR_VERSION@-non-dfsg Section: non-free/editors Priority: optional Maintainer: Rob Browning Uploaders: Jerome Marant Build-Depends: texinfo, autotools-dev, dpkg-dev (>> 1.10.0), quilt, debhelper (>= 9) Standards-Version: 3.7.2 Package: emacs@MAJOR_VERSION@-common-non-dfsg Section: non-free/editors Priority: optional Architecture: all Depends: ${shlibs:Depends}, dpkg (>= 1.15.4) | install-info Conflicts: emacs22-common (<< 22.2) Replaces: emacs22-common (<< 22.2) Description: GNU Emacs common non-DFSG items, including the core documentation This package includes the core Emacs documentation: the Emacs Info pages, the Emacs Lisp Reference Manual, and the Emacs Lisp Intro. . GNU Emacs is the extensible self-documenting text editor. This package contains the architecture independent infrastructure that is not compliant with the Debian Free Software Guidelines. In particular, this includes some of the GNU Emacs info pages, as they are covered under the GFDL, and specify invariant sections. See http://www.debian.org/vote/2006/vote_001 for more information. debian/emacs-common-non-dfsg.README0000644000000000000000000000021312132313021014114 0ustar This file details the Debian specific changes to Emacs. @@PATCH_LIST_HERE@@ Local Variables: mode: outline outline-regexp: " *\\*+" End: debian/changelog0000644000000000000000000001053212132314615011037 0ustar emacs24-non-dfsg (24.3+1-1) unstable; urgency=low * Upgrade to upstream version 24.3 and update debian/copyright, debian/patches, and debian/rules appropriately. -- Rob Browning Sat, 13 Apr 2013 12:43:18 -0500 emacs24-non-dfsg (24.2+1-1) unstable; urgency=low * Upgrade to upstream version 24.2 and update debian/patches. * Have debian/% depend on debian/rules since it now sets the upstream_ver. * Update debian/rules upstream_ver to 24.2 and run "debian/rules debian-sync". -- Rob Browning Sun, 09 Sep 2012 13:12:36 -0500 emacs24-non-dfsg (24.1+1-1) unstable; urgency=low * Upgrade to upstream version 24.1. * Update debian/.gitignore for emacs24. * Update debian control, copyright, etc. for emacs24. * Update debian control and compat for debhelper 9. * Clean up debian/rules, and update it for emacs24. -- Rob Browning Sun, 24 Jun 2012 21:35:06 -0500 emacs23-non-dfsg (23.4+1-1) unstable; urgency=low * Upgrade to upstream version 23.4. * Update debian/* for Emacs 23.4. -- Rob Browning Tue, 20 Mar 2012 20:23:53 -0500 emacs23-non-dfsg (23.3+1-1) unstable; urgency=low * Incorporate new upstream version 23.3. * Adjust emacsVER-common.README to accommodate new patch headers. Add debian/patch-to-news to handle converting new git-dpm style patch headers to emacsVER-common.README. -- Rob Browning Sun, 10 Apr 2011 12:21:08 -0500 emacs23-non-dfsg (23.2+1-1) unstable; urgency=low * New emacs23 packages. * Change debian/rules to use "dh $@" approach. * Update debian/compat from 4 to 7. * Remove debian/emacs-common-non-dfsg.prerm and debian/emacs-common-non-dfsg.postinst. * Update doc/misc/Makefile.in to report INFO_TARGETS for use in rules. * Switch to Debian 3.0 (quilt) source format. * Add dependency on "dpkg (>= 1.15.4) | install-info". * Change debian/copyright.in to refer to GPL-3. * Add lintian override for usr/share/emacs/23.2/etc/copying.paper which is not a license. -- Rob Browning Tue, 11 May 2010 00:08:54 -0700 emacs23-non-dfsg (23.1+1-1) unstable; urgency=low * New emacs23 packages. * Patches have been removed or adjusted. -- Rob Browning Sat, 01 Aug 2009 13:19:40 -0700 emacs22-non-dfsg (22.3+1-1) unstable; urgency=low * New upstream release. -- Rob Browning Tue, 31 Mar 2009 00:28:02 -0700 emacs22-non-dfsg (22.2+2-1) unstable; urgency=low * Move mh-e.texi to emacs22-common because the license does appear to be DFSG compatible. Thanks to Peter S Galbraith . (closes: #433953) * Fix upstream archive name in debian/copyright. -- Rob Browning Sun, 20 Apr 2008 14:09:57 -0700 emacs22-non-dfsg (22.2+1-2) unstable; urgency=low * Add Conflicts and Replaces emacs22-common (<< 22.2) to debian/control.in to handle move of dired-x. Thanks to Sven Joachim . (closes: #475519) * Use "tail -n +N" rather than "tail +N" in debian/rules. Thanks to John Zaitseff . (closes: #467525) * Fix quilt invocation to create README.Debian correctly. -- Rob Browning Sun, 13 Apr 2008 16:35:04 -0700 emacs22-non-dfsg (22.2+1-1) unstable; urgency=low * New upstream release. * Move dired-x.texi to this package since the license has changed. -- Rob Browning Thu, 10 Apr 2008 18:57:47 -0700 emacs22-non-dfsg (22.1+1-1) unstable; urgency=low * New upstream release. [rlb] -- Rob Browning Fri, 06 Jul 2007 20:41:10 -0700 emacs22-non-dfsg (22.0.99+1-1) experimental; urgency=low * Update to 22.0.99. -- Rob Browning Sun, 13 May 2007 11:26:42 -0700 emacs22-non-dfsg (22.0.95+1-1) unstable; urgency=low * New emacs22 packages. -- Rob Browning Sun, 15 Apr 2007 16:32:16 -0700 emacs21-non-dfsg (21.4a+1-1) unstable; urgency=low * New package: in accordance with the recent General Resolution (http://www.debian.org/vote/2006/vote_001), move all non-DFSG files to new packages that will be included in Debian's non-free section. -- Rob Browning Fri, 28 Jul 2006 22:37:16 -0700 Local Variables: coding: utf-8 End: debian/makefile-bit-doc-misc0000644000000000000000000000014312132313021013120 0ustar # -*-makefile-*- .PHONY: echo-info-targets echo-info-targets: @echo INFO_TARGETS=$(INFO_TARGETS) debian/copyright0000644000000000000000000000430012132314714011114 0ustar -*-text-*- This package is derived from the main Emacs packages which were debianized by Rob Browning on Tue, 16 Dec 1997 00:05:45 -0600. The original source archive is emacs-24.3.tar.gz, and it can be found here for stable releases: ftp://ftp.gnu.org:/gnu/emacs/ and here for alpha pre-releases: ftp://alpha.gnu.org:/gnu/emacs/pretest/ Please see /usr/share/doc/emacs24-common-non-dfsg/README.Debian.gz for a description of the Debian specific differences from the upstream version. This package contains files which have been deemed unsuitable for Debian main because their licenses do not appear to satisfy the requirements of the Debian Free Software Guidelines (DFSG). See http://www.debian.org/social_contract. In particular, some of the info pages included in this package are covered under the GNU Free Documentation License (GFDL), which Debian has decided does not satisfy the DFSG in cases where "Invariant Sections" are specified. See this Debian General Resolution on the topic: http://www.debian.org/vote/2006/vote_001. Some other files are included here because their license only allows verbatim copying, or because there was some other question regarding their license. Copyright: Emacs itself is licensed under the terms of the GNU General Public License (GPL), Version 3. See the file /usr/share/common-licenses/GPL-3 for more information. In general, the info pages are covered under the GNU Free Documentation License (GFDL). See the "GNU Free Documentation License" node in "info emacs-24/emacs". etc/INTERVIEW contains the following statement: Copyright (C) 1986 Richard Stallman. Permission is granted to make and distribute copies of this article as long as the copyright and this notice appear on all copies. etc/MOTIVATION contains the following statement: [reprinted with permission of the author from the Monday 19 January 1987 Boston Globe] These files appear to only allow verbatim copying: etc/CENSORSHIP etc/GNU etc/LINUX-GNU etc/THE-GNU-PROJECT etc/WHY-FREE etc/copying.paper These files appear to have no explicit copyright statement: etc/COOKIES etc/DEVEL.HUMOR etc/JOKES