summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMehdi Dogguy <mehdi@debian.org>2009-10-05 23:25:01 +0200
committerMehdi Dogguy <mehdi@debian.org>2009-10-05 23:25:01 +0200
commit25413972ac22f653c596cd1853dfdfc39cfc5c7c (patch)
treed63f37400c8a7e499067f59b5d2e6ce033fddc5a
parenta11c43140fead84507095b196bd5898a3b7bb191 (diff)
Swap the include order of debhelper.mk and dpatch.mk to workaround a CDBS bug.
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 9052228..af6ca2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xmlrpc-light (0.6.1-1.1) UNRELEASED; urgency=low
* Use ocaml.mk as a CDBS "rules" file (Closes: #549723)
+ * Swap the include order of debhelper.mk and dpatch.mk to workaround
+ a CDBS bug.
-- Mehdi Dogguy <mehdi@debian.org> Mon, 05 Oct 2009 23:22:01 +0200
diff --git a/debian/rules b/debian/rules
index 94bea67..4782447 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1301, USA.
-include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/ocaml.mk