github.com/ArchiveTeam/glowing-computing-machine commits

need to -s theirs or the merge is likely to fail

5d92ed6ea773ae62344d114e8a1992fd61bd9445 authored over 10 years ago

Merge branch 'joeyconfig'

c0cc5d214bb9fc609c9f90cc1a024baef43853fa authored over 10 years ago

simpler merge

Ah, we've checked out the oldref, so can just merge the newref in and get a
branch that is suita...

d289a222d5915e9307e0e7a9a51f342942a2fe2d authored over 10 years ago

Merge branch 'joeyconfig'

4634f3cf4767d93c910bddec4769e16a95e935e8 authored over 10 years ago

need to connect up history

adf8b2ec34d5daec0eb3b060681cce6eceb6238d authored over 10 years ago

Merge branch 'joeyconfig'

845877a44a91e3c7bf0878887f2d8f152d9f17b1 authored over 10 years ago

beargN

6f8f0c1c6bb7d79889bfb617d9c89cec6a38188b authored over 10 years ago

Merge branch 'joeyconfig'

7e069973f809c81b7e0ad1c3c7636aa46d33b4bb authored over 10 years ago

merge from master

7a34a1efbf9df3e964f203f0c782d4c50e6683c9 authored over 10 years ago

Merge branch 'joeyconfig'

25312ae18b4561412eaf86c80acbe28bd73248df authored over 10 years ago

merge from master

215a8e7f0e0943166e98611176b3b5290f31730b authored over 10 years ago

Merge branch 'joeyconfig'

Conflicts:
Makefile

5160041df9dbaa69d40e792bac896d3f4da1d14f authored over 10 years ago

bleargh45678etc

4766442124483e6c0965f02e6a2f19ce0cb962be authored over 10 years ago

bleargh3

eff0fe5dffaf387771042f8584501219d98bbbf2 authored over 10 years ago

Merge branch 'joeyconfig'

afe75ef651ad65bf763b32cadbc9dfbb15b7ba73 authored over 10 years ago

double bleargh

5365334ac2b7ad16b6be6c7518b366718b9abee4 authored over 10 years ago

Merge branch 'joeyconfig'

33f2e899d26f10ef01c31a47b4d3aa07dce96f6f authored over 10 years ago

bleargh

d366e5e525994cb8491b11e56d834fbcd4decf56 authored over 10 years ago

Merge branch 'joeyconfig'

e29c7080e8eef65fc627ae877581ba1a6398f535 authored over 10 years ago

oh, can't use cabal sdist --list-sources

Doesn't work when using ./Setup as cabal

7c558cfad1c3a9108c570c540ec59978f7b4d617 authored over 10 years ago

Merge branch 'joeyconfig'

bddd8c7b91e5f246d6cea8ac76d42b8028e4c318 authored over 10 years ago

syntax

1bf736293dbbbc8dd4f302e00587a7b4eb4b8ab9 authored over 10 years ago

Merge branch 'joeyconfig'

bd1af7f39fb8e4b19a5fd2677b221f0e482d5351 authored over 10 years ago

syntax

7743da0c3d0a155fb35dbc5d124dba966675da97 authored over 10 years ago

Merge branch 'joeyconfig'

9516c4e76b2a6d653091c62a355d7da8ccdc0a57 authored over 10 years ago

oops, can't rely on a git repo when building debian package..

fc967dfa4c8568d8fd47e3a9a837421f2acfd245 authored over 10 years ago

color message

d54ee6c336f21212bda28559ec7bac02a11c15a4 authored over 10 years ago

Merge branch 'joeyconfig'

16c33945e29a3d9fdd908ada0dbb63eda9ba44fa authored over 10 years ago

fixes

f72a1aa690704b352fa3914514d04438fd0718c0 authored over 10 years ago

Merge branch 'joeyconfig'

b938dbbe3cb5b6d24406cdfc632c9358906398ad authored over 10 years ago

prep release

371f6077fdc86e1af5c0e9f2ff4d3ee03b9a1e8c authored over 10 years ago

Merge branch 'joeyconfig'

429f793fc32895c5405cc9f14ede5b1e7b990601 authored over 10 years ago

fix

7c0e2125a25ef4fb78da8d111e92d288751af1a6 authored over 10 years ago

Merge branch 'joeyconfig'

d66216b92a5956f7997eed88f99187bffec6af98 authored over 10 years ago

fix

32ca119859eee0fbe8a9e60e28de2d230d6ef2fe authored over 10 years ago

Merge branch 'joeyconfig'

5b651cf81881a0970ec92cdf4702ada98c7786e4 authored over 10 years ago

use git archive, rather than cabal sdist for making single-commit git repo

This makes the symlinks be preserved, which it seems cabal does not do.

b9f1e87604bab5786e530318e7f3b15ccb737b30 authored over 10 years ago

Merge branch 'joeyconfig'

922f916baf4da6435a390896e949d870e9a3dfab authored over 10 years ago

fix ref name

1ada0f10141405c8c20decddf893eb5186be8581 authored over 10 years ago

Merge branch 'joeyconfig'

2ed83d6fccf5727ef1bb7116d0e7952f20fb396d authored over 10 years ago

head file will end with a newline

4ae9578e3644cb3a11c105281b043721400f74cb authored over 10 years ago

Merge branch 'joeyconfig'

16c01b24ceb0a67af913ada32f945ab67899be66 authored over 10 years ago

ugly workaround for lack of history in repo distributed with debian package

3c61c109fbba19fb5c41870333f879fdc6dc0c1a authored over 10 years ago

Merge branch 'joeyconfig'

c57ff0cb463f9acd1a0aa0d11a2bbaad75d361be authored over 10 years ago

final fixes

e0bbb776bfff6c320d8d717fd351b41720a8112c authored over 10 years ago

Merge branch 'joeyconfig'

c157fd402692feca95d8b365101d21f218baadb9 authored over 10 years ago

typo

882872b1ec3c016403ce8a043d62d8880d6dc30c authored over 10 years ago

Merge branch 'joeyconfig'

4cb37fc564801075560d55bd4b079e915cfa7977 authored over 10 years ago

warnings

8e45b0f77bb7f4dbf7572b126f2959afc63d5ce9 authored over 10 years ago

Merge branch 'joeyconfig'

77f79fa03233db11c7249c725531840d9038c8e7 authored over 10 years ago

debian upgrade handling

The /usr/bin/propellor wrapper will warn when ~/.propellor/ is out of date
and a newer version i...

1830f501ee7d8ca7832cbd337629b0d9225baedb authored over 10 years ago

Merge branch 'joeyconfig'

c3711ff09cdaf7ca203af67d393aaeb19ebddfd0 authored over 10 years ago

typo

527ae1dc208599bee15afd8167eeec17744a6b0b authored over 10 years ago

Merge branch 'joeyconfig'

90a6b1f094ba12b734015a27cfc5e326c5f413cb authored over 10 years ago

stop removing privdata, it's no longer in master

71ccd256da18dd4f38df0b631eee752b299602d1 authored over 10 years ago

Merge branch 'joeyconfig'

21897c955ed5a38fe6da5246ca90bfbaaba57b04 authored over 10 years ago

remove privdata from master, to avoid conflicts with other users' privdata

This will result in some easily resolved merge conflicts when I merge
joeyconfig into master. I ...

b86a482924d1e9648cdcef2321d9f6f584d1485a authored over 10 years ago

local repo fully working now

7d59dee4690297154f6924a04949413ddea8a17b authored over 10 years ago

Merge branch 'joeyconfig'

c8b85823419eaea40ac7a7e2ac3d814b2a607f53 authored over 10 years ago

The Debian package now includes a single-revision git repository in /usr/src/propellor/, and ~/.propellor/ is set up to use this repository as its "upstream" remote. This avoids relying on the security of the github repository when using the Debian package.

b6c5f547419ce95d20453f30403e1a5860720fe6 authored over 10 years ago

Merge remote-tracking branch 'origin/master'

fd2bd09135921df96691117c6c83b1713ef64e54 authored over 10 years ago

Merge branch 'joeyconfig'

ebeb3cb8fa8f81cac2c3b9eea3d5216c0f3b852f authored over 10 years ago

The Debian package now includes a single-revision git repository in /usr/src/propellor/, and ~/.propellor/ is set up to use this repository as its "upstream" remote. This avoids relying on the security of the github repository when using the Debian package.

e6f13a9af9c4253a1f41c3949ee78ddcc4e7f8a4 authored over 10 years ago

upgrade note

c3c1f921bb96f4ae86564f28f53392f2c08e4007 authored over 10 years ago

Included the config.hs symlink to config-simple.hs in the cabal and Debian packages.

1ed98cc755ed5ac1cf6635d6683f0734004b224b authored over 10 years ago

update

f162c629e4934b787e5a0fd6ef0bdc801aa16114 authored over 10 years ago

Added a comment

bcbf53cad634d0c3f34437575ad4a8d58d81237d authored over 10 years ago

propellor spin

f727bceb7529725f5619ccb05e81731550abb0ac authored over 10 years ago

propellor spin

5011529def36b3a10e2cc17a747686a80d41438e authored over 10 years ago

add news item for propellor 0.8.2

8bea99ea0ec7f46994f372b3e4c7c2b9624bd7d8 authored over 10 years ago

Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid'

e743068ccf5af2f92ed65374c4407264fa1d30c0 authored over 10 years ago

Merge branch 'master' of ssh://propellor.branchable.com

9a856f6aa92ec25ee0d7fbf21046c3ee88321464 authored over 10 years ago

Merge branch 'joeyconfig'

81f370b9daa63c07236a4d88adcd407bd84267a9 authored over 10 years ago

prep release

9d2cc7774bb8ccf7c8663f28c55c489bc383e5ce authored over 10 years ago

propellor spin

261ed396fe02e5ad3744c438f3ffd1a26f1ebe27 authored over 10 years ago

propellor spin

08a3c52017b20bb6d4c8a89da019c072a90ddd50 authored over 10 years ago

propellor spin

6cf770c6994bb14be745021293344926125745c5 authored over 10 years ago

changelog

02d7e6d5c6e381b307c2d81abff5d067895beae7 authored over 10 years ago

propellor spin

8fc3b6143188a83688e391ffc02bd323d940534e authored over 10 years ago

propellor spin

db7c012c1a8bc832098c4fae87959d722ec28df4 authored over 10 years ago

propellor spin

74e28cb6b48abb0d6aabd9cda616958fb136b63e authored over 10 years ago

propellor spin

359f13323d370a215b3d3fd1f827b422f72bc7ae authored over 10 years ago

propellor spin

ac46ab4d0c2df3f2f19c9f45b0a8e22122e3fb59 authored over 10 years ago

propellor spin

3d617fd98b981929886498bf881c93e650096248 authored over 10 years ago

propellor spin

41a23743e7f5b90c12a2b2ef19ccb3dcbb7bfef9 authored over 10 years ago

propellor spin

de50ea480dee911f0c65cce2425145561566b1fe authored over 10 years ago

propellor spin

dd32a63a07107a749a5a8e7ab1d2b0d629ac4538 authored over 10 years ago

propellor spin

ecc275cfeb9dc2c18abe525f3a93aad7614e1a0c authored over 10 years ago

propellor spin

d393b8fc533b29ea44412b5728e3467fd1521254 authored over 10 years ago

propellor spin

7d3c09df5f33e1560e5d4c5b8f3c78a5a588dd5a authored over 10 years ago

update

b5ebe614839136d682007342bd32439dbaa6741f authored over 10 years ago

propellor spin

8d151bf93c43712d5dd733fbea6ae7d62e26c58a authored over 10 years ago

propellor spin

78bbd860c608368185d3ddc010393c07734b4ec0 authored over 10 years ago

propellor spin

321a0bdef6c34c250af8c893290747e6e3e628c3 authored over 10 years ago

propellor spin

660f77c28fe11534139e8d9ecda2d573921fa8dd authored over 10 years ago

propellor spin

ed8396646039c68eeb7aec7788258205fd998a5f authored over 10 years ago

propellor spin

dc1a8db06455a287169f765b4e5c115200386359 authored over 10 years ago

propellor spin

fcabeb677bc075088a4da464960b9f5b705bfa51 authored over 10 years ago

propellor spin

e01fc46ba30ffab6b3e53f518718a334d763ac80 authored over 10 years ago

propellor spin

25cc0270250b504ba93f814545dd7e764006f9dd authored over 10 years ago

Ecosyste.ms: OpenCollective

github.com/ArchiveTeam/glowing-computing-machine