[hamradio-commits] [ampr-ripd] 05/07: Fixes man, compiler flags and watchfile

[Ana Custura]

This is an automated email from the git hooks/post-receive script.

ana.c-guest pushed a commit to branch master
in repository ampr-ripd.

commit e5fa9bf5517831bdda88c7d46b5e39ee116c219f
Author: Ana C. Custura <ana at netstat.org.uk>
Date:   Fri Sep 23 14:58:09 2016 +0100

    Fixes man, compiler flags and watchfile
---
 debian/patches/makefile_flags.patch | 21 +++++++++++++++++++++
 debian/patches/man.diff             | 11 -----------
 debian/patches/series               |  1 +
 debian/rules                        |  1 -
 debian/watch                        |  4 +---
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/debian/patches/makefile_flags.patch b/debian/patches/makefile_flags.patch
new file mode 100644
index 0000000..906cf5a
--- /dev/null
+++ b/debian/patches/makefile_flags.patch
@@ -0,0 +1,21 @@
+Description: Adds compiler flags to Makefile
+Author: Ana Custura <ana at netstat.org.uk>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Makefile
++++ b/Makefile
+@@ -23,11 +23,10 @@
+ # Full debug
+ #DOPT = -Wall -O2 -D HAVE_DEBUG
+ 
+-COPT = -Wall -O2
+-LOPT =
+-
++CFLAGS ?= -Wall -O2
++LDFLAGS ?=
+ ampr-ripd:	ampr-ripd.c
+-	$(CC) $(COPT) $(DOPT) $(LOPT) -o ampr-ripd ampr-ripd.c
++	$(CC) $(CFLAGS) $(DOPT) $(LDFLAGS) $(CPPFLAGS) -o ampr-ripd ampr-ripd.c
+ 
+ all:	ampr-ripd
+ 
diff --git a/debian/patches/man.diff b/debian/patches/man.diff
index 116acdc..db8f048 100644
--- a/debian/patches/man.diff
+++ b/debian/patches/man.diff
@@ -29,14 +29,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  .TP
  \fB\-f\fR <interface>
  Interface for RIP forwarding, defaults to none/disabled
---- a/Makefile
-+++ b/Makefile
-@@ -18,7 +18,7 @@
- #
- 
- # Full debug including Netlink
--#DOPT = -Wall -O2 -D HAVE_DEBUG -D NL_DEBUG
-+DOPT = -Wall -O2 -D HAVE_DEBUG -D NL_DEBUG
- 
- # Full debug
- #DOPT = -Wall -O2 -D HAVE_DEBUG
diff --git a/debian/patches/series b/debian/patches/series
index f84fe50..16c3b2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 man.diff
+makefile_flags.patch
diff --git a/debian/rules b/debian/rules
index 4cfa4a6..399d7bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE = 1
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
 %:
 	dh $@ --with=systemd 
 
diff --git a/debian/watch b/debian/watch
index 6fd75bd..72d36f5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
 version=4
-
-http://www.yo2loj.ro/hamprojects/ \
-ampr-ripd-([\d\.]+)[\d\.]\.tgz
+http://www.yo2loj.ro/hamprojects ampr-ripd-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/ampr-ripd.git