diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-11-09 15:05:08 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-11-09 15:05:08 -0400 |
| commit | 75d29250823326c8b4894a855927f65b5fdf4e13 (patch) | |
| tree | a888b86d8e0569b9e1c388700dd6717aaa175834 /debian | |
| parent | 377bf24d9a951186b374cd7a3f920b6bc9deb8f1 (diff) | |
| parent | 8d5374f4a33f398baa166035e5fafb716a78fd1d (diff) | |
Merge branch 'master' into checkout
Conflicts:
debian/changelog
doc/backends.mdwn
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 9205dbe06..fa8bb0f93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,19 @@ git-annex (0.04) UNRELEASED; urgency=low * Add checkout subcommand, which allows checking out file content in preparation of changing it. * Add uncheckout subcommand. + * Add build dep on libghc6-testpack-dev. + * Add annex.version, which will be used to automate upgrades + between incompatable versions. + * Reorganised the layout of .git/annex/ + * The new layout will be automatically upgraded to the first time + git-annex is used in a repository with the old layout. + * Note that git-annex 0.04 cannot transfer content from old repositories + that have not yet been upgraded. + * Annexed file contents are now made unwritable and put in unwriteable + directories, to avoid them accidentially being removed or modified. + (Thanks Josh Triplett for the idea.) - -- Joey Hess <joeyh@debian.org> Sun, 07 Nov 2010 21:01:29 -0400 + -- Joey Hess <joeyh@debian.org> Mon, 08 Nov 2010 12:36:39 -0400 git-annex (0.03) unstable; urgency=low diff --git a/debian/control b/debian/control index d8abc487c..3fba36742 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: git-annex Section: utils Priority: optional -Build-Depends: debhelper (>= 7.0.50), ghc6, libghc6-missingh-dev, ikiwiki +Build-Depends: debhelper (>= 7.0.50), ghc6, libghc6-missingh-dev, libghc6-testpack-dev, ikiwiki Maintainer: Joey Hess <joeyh@debian.org> Standards-Version: 3.9.1 Vcs-Git: git://git.kitenet.net/git-annex |