chiark / gitweb /
Merge branch 'master' into refs/top-bases/debian/locations
authorCarsten Hey <carsten@debian.org>
Mon, 26 Apr 2010 08:18:59 +0000 (10:18 +0200)
committerCarsten Hey <carsten@debian.org>
Mon, 26 Apr 2010 08:18:59 +0000 (10:18 +0200)
* master: (89 commits)
  adapt debian/changelog for 0.8-1.1
  do not fail if no quilt patches to pop
  tg-cleanexport is PHONY
  check for applied patches/uncommitted changes before tg-rmdir
  also remove the dpkgv3 patch stamp file
  simplify removal of files in tg-rmdir
  change section to vcs
  debian/changelog: new upstream release fixes #516188
  drop fixes/ensure-worktree
  debian/changelog: document new upstream release
  bump version number to 0.8
  Fix tg export --quilt --numbered w/ > 8 patches
  tg-push: add bash completion
  help: use pager
  tg-push: handle non-tgish branches
  tg-push: prevent handing branches more than once to git-push
  tg-push: remove useless warning about missing bases for non-tgish branches
  tg-update: fix user visible typo in info msg
  tg-remote: don't add push specs but warn about existing ones.
  tg-push: new command pushing a tgish branch
  ...

.topdeps [new file with mode: 0644]
.topmsg [new file with mode: 0644]

diff --git a/.topdeps b/.topdeps
new file mode 100644 (file)
index 0000000..0459513
--- /dev/null
+++ b/.topdeps
@@ -0,0 +1 @@
+upstream
diff --git a/.topmsg b/.topmsg
new file mode 100644 (file)
index 0000000..337e37f
--- /dev/null
+++ b/.topmsg
@@ -0,0 +1,7 @@
+From: martin f. krafft <madduck@debian.org>
+Subject: [PATCH] add DESTDIR support to Makefile
+
+This is needed for distros to be able to install files to a temporary root
+location, without affecting the PREFIX paths that are used at runtime.
+
+Signed-off-by: martin f. krafft <madduck@debian.org>