summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-04-04 14:36:57 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-04-04 14:36:57 -0700
commit98022c34083cab1ecf7fbe41859f7d77b7a37a7c (patch)
treea3e7706cabc4e361c0311fa246fe9907d06d8f5a /debian
parentf8af4c7d128fb5584eaf9aea9ee5476864014a7a (diff)
downloademacs-98022c34083cab1ecf7fbe41859f7d77b7a37a7c.tar.gz
move docs to .mrconfig.in in dotfiles.git
Diffstat (limited to 'debian')
-rw-r--r--debian/README.source24
-rwxr-xr-xdebian/merge-snapshot3
2 files changed, 0 insertions, 27 deletions
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index bc215441f49..00000000000
--- a/debian/README.source
+++ /dev/null
@@ -1,24 +0,0 @@
-athena/unstable branch merges only from upstream emacs.git#master, and then is
-only tagged and uploaded to athena after running locally for a day or so to
-confirm that nothing obvious is broken. Build with 'dgit sbuild -d CODENAME
-to get something to test, and then use rebuild-for-athena to build, tag and
-upload.
-
-athena/CODENAME-bpo: backported from athena/unstable, automatically updated by
-rebuild-for-athena when preparing the version of athena/unstable to upload to
-athena as described above.
-
-tmp/HOSTNAME: short-lived branch to test out patches/series not in upstream
-master by running Emacs with those patches on my main laptop during regular
-Emacs usage. Not pushed anywhere. When want to do this, create branch
-starting from athena/unstable, merge/apply the series, dch, build and install
-the .deb, restart Emacs.
- -- now using the 'melete' branch instead; see admin/README.melete there.
-
-To test running Emacs with patches/series not in upstream master without
-affecting my regular environment -- typically because I want to do some
-particular testing of them which takes just a few minutes -- make a temporary
-branch based on upstream master (not athena/unstable), build, and run the copy
-of the just-built in-tree copy of Emacs.
-
- -- Sean Whitton <spwhitton@spwhitton.name>, Sat, 25 Dec 2021 22:41:59 -0700
diff --git a/debian/merge-snapshot b/debian/merge-snapshot
index 83c0c4d6911..71724934ad1 100755
--- a/debian/merge-snapshot
+++ b/debian/merge-snapshot
@@ -1,8 +1,5 @@
#!/usr/bin/perl
-# after running this script and installing and testing the package,
-# can use rebuild-for-athena script
-
use 5.028;
use strict;
use warnings;