diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-14 15:37:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-14 15:37:24 -0400 |
| commit | ea7f916c04e0b1ee022b3e4987be749db28fa2fa (patch) | |
| tree | 0698a987c4b475fdccfe48bb2a8f1abebf55b844 /debian | |
| parent | c2f6f82a146339bb4b94acff1aae4f12ad023a08 (diff) | |
| parent | 724d5185d48aee309af1a6d13927c4f7108610fd (diff) | |
Merge branch 'master' into windows
Conflicts:
Annex/Environment.hs
Build/Configure.hs
Git/Construct.hs
Utility/FileMode.hs
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | debian/rules | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 9b485d13b..6b94c4559 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ git-annex (4.20130502) UNRELEASED; urgency=low * Android: The webapp is ported and working. + * Windows: There is a very rough Windows port. Do not trust it with + important data. * git-annex-shell: Ensure that received files can be read. Files transferred from some Android devices may have very broken permissions as received. @@ -21,6 +23,7 @@ git-annex (4.20130502) UNRELEASED; urgency=low * rsync special remotes: When sending from a crippled filesystem, use the destination's default file permissions, as the local ones can be arbitrarily broken. (Ie, ----rwxr-x for files on Android) + * migrate: Detect if a file gets corrupted while it's being migrated. -- Joey Hess <joeyh@debian.org> Thu, 02 May 2013 20:39:19 -0400 diff --git a/debian/rules b/debian/rules index da5596871..3a0511fa6 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ export CABAL=./Setup # Do use the changelog's version number, rather than making one up. -export VERSION_FROM_CHANGELOG=1 +export RELEASE_BUILD=1 %: dh $@ |