Package: topgit Version: 0.5-1 Severity: normal File: /usr/share/topgit/tg2quilt.mk Tags: patch
The Makefile snippet tg2quilt.mk is meant to be used together with /usr/share/quilt/quilt.make , which define the default value of QUILT_PATCH_DIR. However, CDBS users do not reqly on quilt.make, but rather on /usr/share/cdbs/1/rules/patchsys-quilt.mk , which neither include quilt.make nor provide the same "API" by the means of QUILT_PATCH_DIR. To have compatibility for both system, it is enough to provide a default value for QUILT_PATCH_DIR, which will be relied upon only if quilt.make is not included (hence looks like a win-win). Trivial patch attached, please consider it. The patch also documents what to do for CDBS users. Cheers -- System Information: Debian Release: 5.0 APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.26-1-amd64 (SMP w/2 CPU cores) Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages topgit depends on: ii git-core 1:1.5.6.5-2 fast, scalable, distributed revisi topgit recommends no packages. topgit suggests no packages. -- no debconf information
--- /usr/share/topgit/tg2quilt.mk 2009-02-02 19:51:32.000000000 +0100 +++ /tmp/tg2quilt.mk 2009-02-02 19:53:38.042218065 +0100 @@ -10,6 +10,12 @@ # include /usr/share/quilt/quilt.make # -include /usr/share/topgit/tg2quilt.mk # +# CDBS users can rely on the usual quilt integration, and just +# additionally include tg2quilt.mk, like so: +# +# include /usr/share/cdbs/1/rules/patchsys-quilt.mk +# -include /usr/share/topgit/tg2quilt.mk +# # The snippet exports the following targets. These targets only perform the # describe behaviour when invoked from a TopGit repository (`tg summary -t` # returns a non-empty set); used outside, they simply output informational @@ -61,6 +67,7 @@ # We are in a TopGit branch, so let the fun begin. +QUILT_PATCH_DIR ?= debian/patches PATCHES_DIR ?= $(QUILT_PATCH_DIR) # Hook tg-export into quilt's make(1) snippet such that it gets executed
