Commit | Line | Data |
---|---|---|
76fcbc18 IK |
1 | We do not use use the provided read-mail to process spools and we don't |
2 | use lists.def. We bypass that part of mharc and call web-archive | |
3 | instead. | |
e9187eaf | 4 | |
76fcbc18 IK |
5 | This repo is based on mharc 0.7.3 release. The .dist files are all the |
6 | upstream except changing path names of standard utilities to match the | |
7 | distro, and missing cgi-bin/template/NMZ*dist. I dunno what those are | |
8 | about. TODO: figure out namazu integration. | |
e9187eaf | 9 | |
2ea8f66b | 10 | |
76fcbc18 IK |
11 | The .dist files should never be changed except when upgrading to new |
12 | upstream version (and there does exist a non-release snapshot we should | |
13 | upgrade to). | |
14 | ||
15 | Any file with a correspond .in version should never be manually edited, | |
16 | instead generated from the .in file by running make configure. Note, | |
17 | make configure must be run from /home/mharc (checkout into that | |
18 | directory on your local system). | |
19 | ||
20 | The lists.fsf branch should be rebased to any changes from master, like this: | |
21 | ||
22 | git checkout lists.fsf | |
23 | git rebase master | |
24 | # if there are merge conflicts, manually merge any .in files, then | |
25 | make configure | |
26 | git add . | |
27 | git rebase --continue | |
28 | git push -f | |
29 | ||
30 | Then on lists.fsf.org: | |
31 | ||
32 | su mharc | |
33 | cd | |
34 | git fetch | |
35 | git reset --hard origin/lists.fsf |