Joey Hess
|
25312ae18b
|
Merge branch 'joeyconfig'
|
2014-08-19 17:31:15 -04:00 |
|
Joey Hess
|
215a8e7f0e
|
merge from master
|
2014-08-19 17:31:09 -04:00 |
|
Joey Hess
|
5160041df9
|
Merge branch 'joeyconfig'
Conflicts:
Makefile
|
2014-08-19 17:30:34 -04:00 |
|
Joey Hess
|
4766442124
|
bleargh45678etc
|
2014-08-19 17:30:10 -04:00 |
|
Joey Hess
|
eff0fe5dff
|
bleargh3
|
2014-08-19 17:25:05 -04:00 |
|
Joey Hess
|
afe75ef651
|
Merge branch 'joeyconfig'
|
2014-08-19 17:24:20 -04:00 |
|
Joey Hess
|
5365334ac2
|
double bleargh
|
2014-08-19 17:24:13 -04:00 |
|
Joey Hess
|
33f2e899d2
|
Merge branch 'joeyconfig'
|
2014-08-19 17:22:18 -04:00 |
|
Joey Hess
|
d366e5e525
|
bleargh
|
2014-08-19 17:22:14 -04:00 |
|
Joey Hess
|
e29c7080e8
|
Merge branch 'joeyconfig'
|
2014-08-19 17:19:48 -04:00 |
|
Joey Hess
|
7c558cfad1
|
oh, can't use cabal sdist --list-sources
Doesn't work when using ./Setup as cabal
|
2014-08-19 17:19:28 -04:00 |
|
Joey Hess
|
bddd8c7b91
|
Merge branch 'joeyconfig'
|
2014-08-19 17:17:42 -04:00 |
|
Joey Hess
|
1bf736293d
|
syntax
|
2014-08-19 17:17:36 -04:00 |
|
Joey Hess
|
bd1af7f39f
|
Merge branch 'joeyconfig'
|
2014-08-19 17:17:05 -04:00 |
|
Joey Hess
|
7743da0c3d
|
syntax
|
2014-08-19 17:17:01 -04:00 |
|
Joey Hess
|
9516c4e76b
|
Merge branch 'joeyconfig'
|
2014-08-19 17:16:17 -04:00 |
|
Joey Hess
|
fc967dfa4c
|
oops, can't rely on a git repo when building debian package..
|
2014-08-19 17:15:58 -04:00 |
|
Joey Hess
|
d54ee6c336
|
color message
|
2014-08-19 17:12:57 -04:00 |
|
Joey Hess
|
16c33945e2
|
Merge branch 'joeyconfig'
|
2014-08-19 17:09:54 -04:00 |
|
Joey Hess
|
f72a1aa690
|
fixes
|
2014-08-19 17:09:11 -04:00 |
|
Joey Hess
|
b938dbbe3c
|
Merge branch 'joeyconfig'
|
2014-08-19 17:00:56 -04:00 |
|
Joey Hess
|
371f6077fd
|
prep release
|
2014-08-19 17:00:49 -04:00 |
|
Joey Hess
|
429f793fc3
|
Merge branch 'joeyconfig'
|
2014-08-19 16:58:38 -04:00 |
|
Joey Hess
|
7c0e2125a2
|
fix
|
2014-08-19 16:58:35 -04:00 |
|
Joey Hess
|
d66216b92a
|
Merge branch 'joeyconfig'
|
2014-08-19 16:57:32 -04:00 |
|
Joey Hess
|
32ca119859
|
fix
|
2014-08-19 16:57:26 -04:00 |
|
Joey Hess
|
5b651cf818
|
Merge branch 'joeyconfig'
|
2014-08-19 16:56:24 -04:00 |
|
Joey Hess
|
b9f1e87604
|
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.
|
2014-08-19 16:55:44 -04:00 |
|
Joey Hess
|
922f916baf
|
Merge branch 'joeyconfig'
|
2014-08-19 16:47:06 -04:00 |
|
Joey Hess
|
1ada0f1014
|
fix ref name
|
2014-08-19 16:47:00 -04:00 |
|
Joey Hess
|
2ed83d6fcc
|
Merge branch 'joeyconfig'
|
2014-08-19 16:45:00 -04:00 |
|
Joey Hess
|
4ae9578e36
|
head file will end with a newline
|
2014-08-19 16:44:51 -04:00 |
|
Joey Hess
|
16c01b24ce
|
Merge branch 'joeyconfig'
|
2014-08-19 16:40:31 -04:00 |
|
Joey Hess
|
3c61c109fb
|
ugly workaround for lack of history in repo distributed with debian package
|
2014-08-19 16:40:04 -04:00 |
|
Joey Hess
|
c57ff0cb46
|
Merge branch 'joeyconfig'
|
2014-08-19 15:29:43 -04:00 |
|
Joey Hess
|
e0bbb776bf
|
final fixes
|
2014-08-19 15:29:32 -04:00 |
|
Joey Hess
|
c157fd4026
|
Merge branch 'joeyconfig'
|
2014-08-19 15:24:22 -04:00 |
|
Joey Hess
|
882872b1ec
|
typo
|
2014-08-19 15:24:18 -04:00 |
|
Joey Hess
|
4cb37fc564
|
Merge branch 'joeyconfig'
|
2014-08-19 15:23:33 -04:00 |
|
Joey Hess
|
8e45b0f77b
|
warnings
|
2014-08-19 15:23:29 -04:00 |
|
Joey Hess
|
77f79fa032
|
Merge branch 'joeyconfig'
|
2014-08-19 15:22:48 -04:00 |
|
Joey Hess
|
1830f501ee
|
debian upgrade handling
The /usr/bin/propellor wrapper will warn when ~/.propellor/ is out of date
and a newer version is available from origin.
|
2014-08-19 15:22:42 -04:00 |
|
Joey Hess
|
c3711ff09c
|
Merge branch 'joeyconfig'
|
2014-08-19 15:06:10 -04:00 |
|
Joey Hess
|
527ae1dc20
|
typo
|
2014-08-19 15:06:06 -04:00 |
|
Joey Hess
|
90a6b1f094
|
Merge branch 'joeyconfig'
|
2014-08-19 15:04:24 -04:00 |
|
Joey Hess
|
71ccd256da
|
stop removing privdata, it's no longer in master
|
2014-08-19 15:04:12 -04:00 |
|
Joey Hess
|
21897c955e
|
Merge branch 'joeyconfig'
|
2014-08-19 15:03:11 -04:00 |
|
Joey Hess
|
b86a482924
|
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 never merge master into joeyconfig so that's ok.
|
2014-08-19 15:02:28 -04:00 |
|
Joey Hess
|
7d59dee469
|
local repo fully working now
|
2014-08-19 15:02:12 -04:00 |
|
Joey Hess
|
c8b8582341
|
Merge branch 'joeyconfig'
|
2014-08-19 14:35:55 -04:00 |