Merge branch 'debian-sid' into debian-experimental
commitca6b7f2fb106d3c3ae768da0624b233f1247dc18
authorJonathan Nieder <jrnieder@gmail.com>
Wed, 2 Nov 2011 05:28:14 +0000 (2 00:28 -0500)
committerJonathan Nieder <jrnieder@gmail.com>
Wed, 2 Nov 2011 05:28:14 +0000 (2 00:28 -0500)
tree8fe93b75e6075213629c22f0e8914ea6ee691f74
parent09c898371aecff58d7b2dbf912feee11547c6cb8
parent789d2fe0a3baed3d7ab193a4b5183786996d1349
Merge branch 'debian-sid' into debian-experimental

* debian-sid:
  debian: prepare for upload
  debian/rules: use dpkg-buildflags to retrieve compiler flags
  debian/rules: separate build-arch and build-indep targets
  debian: new upstream point release
  Git 1.7.7.2
  t7511: avoid use of reserved filename on Windows.

Conflicts:
GIT-VERSION-GEN
RelNotes
debian/changelog
debian/changelog.upstream
debian/versions.upstream
debian/changelog
debian/changelog.upstream
debian/versions.upstream