summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules23
2 files changed, 21 insertions, 4 deletions
diff --git a/debian/control b/debian/control
index 36096a2..4e1fefb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: netfilter maintainers <netfilter-maintainers@ned.snow-crash.org>
Uploaders: Max Kellermann <max@duempel.org>, Alexander Wirt <formorer@debian.org>
Homepage: http://conntrack-tools.netfilter.org/
Build-Depends: debhelper (>= 5), libnfnetlink-dev (>= 1.0.0),
- libnetfilter-conntrack-dev (>= 0.0.100), bison, flex
+ libnetfilter-conntrack-dev (>= 0.0.100), bison, flex, dpatch
Standards-Version: 3.8.3
Package: conntrack
diff --git a/debian/rules b/debian/rules
index 835a7c8..8fe7d91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ endif
CFLAGS += -DYY_NO_INPUT
build: debian/stamp-build
-debian/stamp-build:
+debian/stamp-build: patch
dh_testdir
# ./configure
@@ -32,7 +32,8 @@ debian/stamp-build:
touch $@
-clean:
+clean: clean1 unpatch
+clean1:
dh_testdir
dh_testroot
rm -f debian/stamp-*
@@ -52,6 +53,21 @@ debian/stamp-install: debian/stamp-build
touch $@
+# And now the simple things for dpatch. Here we only apply/unapply the patches.
+# You can do more things with dpatch, like having patches only applied on
+# a special architecture - see the non-dh version of the sample for this!
+patch: patch-stamp
+patch-stamp:
+ dpatch apply-all
+ dpatch cat-all >patch-stamp
+ touch patch-stamp
+
+unpatch:
+ dpatch deapply-all
+ rm -rf patch-stamp debian/patched
+
+
+
# Build architecture-independent files here.
binary-indep:
@@ -78,4 +94,5 @@ source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch \
+ clean1