[Pkg-nagios-changes] [SCM] Debian packaging for nagircbot branch, master, updated. f0aea80aa670697af6e60ce7600689f189279898

[John Morrissey]

The following commit has been merged in the master branch:
commit a034cc984581e7f2e2a45f8be134456151253643
Author: John Morrissey <jwm at horde.net>
Date:   Wed May 25 13:27:14 2011 -0400

    don't rely on default patch creation

diff --git a/debian/patches/10add-destdir-support b/debian/patches/10add-destdir-support
new file mode 100644
index 0000000..041720a
--- /dev/null
+++ b/debian/patches/10add-destdir-support
@@ -0,0 +1,39 @@
+Description: 
+Author: John Morrissey <jwm at horde.net>
+Forwarded: <20101217190359.GA25969 at boost.horde.net>
+Last-Update: 2010-12-13
+
+--- nagircbot-0.0.32.orig/Makefile
++++ nagircbot-0.0.32/Makefile
+@@ -2,12 +2,16 @@
+ 
+ VERSION=0.0.32
+ 
+-DEBUG= -g  -D_DEBUG #-fprofile-arcs -ftest-coverage # -pg -g
+-CXXFLAGS+=-Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG)
+-CFLAGS+=${CXXFLAGS}
+-LDFLAGS+=$(DEBUG) -lcrypto -lssl -lstdc++
++DEBUG=-g -D_DEBUG #-fprofile-arcs -ftest-coverage #-pg -g
++CXXFLAGS += -Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG)
++CFLAGS += ${CXXFLAGS}
++LDFLAGS += $(DEBUG) -lcrypto -lssl -lstdc++
++
++DESTDIR ?=
++prefix ?= /usr/local
++bindir ?= $(prefix)/bin
+ 
+-OBJS= ssl.o error.o log.o utils.o br.o pl.o anna.o
++OBJS=ssl.o error.o log.o utils.o br.o pl.o anna.o
+ 
+ all: nagircbot
+ 
+@@ -15,7 +19,8 @@ nagircbot: $(OBJS)
+ 	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o nagircbot
+ 
+ install: nagircbot
+-	cp nagircbot /usr/local/bin
++	cp nagircbot $(DESTDIR)$(bindir)/nagircbot
++	chmod 0755 $(DESTDIR)$(bindir)/nagircbot
+ 
+ clean:
+ 	rm -f $(OBJS) nagircbot core *.da *.gcov *.bb*
diff --git a/debian/patches/debian-changes-0.0.32-1 b/debian/patches/debian-changes-0.0.32-1
deleted file mode 100644
index 329c7b3..0000000
--- a/debian/patches/debian-changes-0.0.32-1
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: Upstream changes introduced in version 0.0.32-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- nagircbot (0.0.32-1) unstable; urgency=low
- .
-   * Initial release. (Closes: #546481)
- .
- The person named in the Author field signed this changelog entry.
-Author: John Morrissey <jwm at horde.net>
-Bug-Debian: http://bugs.debian.org/546481
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- nagircbot-0.0.32.orig/Makefile
-+++ nagircbot-0.0.32/Makefile
-@@ -2,12 +2,16 @@
- 
- VERSION=0.0.32
- 
--DEBUG= -g  -D_DEBUG #-fprofile-arcs -ftest-coverage # -pg -g
--CXXFLAGS+=-Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG)
--CFLAGS+=${CXXFLAGS}
--LDFLAGS+=$(DEBUG) -lcrypto -lssl -lstdc++
-+DEBUG=-g -D_DEBUG #-fprofile-arcs -ftest-coverage #-pg -g
-+CXXFLAGS += -Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG)
-+CFLAGS += ${CXXFLAGS}
-+LDFLAGS += $(DEBUG) -lcrypto -lssl -lstdc++
-+
-+DESTDIR ?=
-+prefix ?= /usr/local
-+bindir ?= $(prefix)/bin
- 
--OBJS= ssl.o error.o log.o utils.o br.o pl.o anna.o
-+OBJS=ssl.o error.o log.o utils.o br.o pl.o anna.o
- 
- all: nagircbot
- 
-@@ -15,7 +19,8 @@ nagircbot: $(OBJS)
- 	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o nagircbot
- 
- install: nagircbot
--	cp nagircbot /usr/local/bin
-+	cp nagircbot $(DESTDIR)$(bindir)/nagircbot
-+	chmod 0755 $(DESTDIR)$(bindir)/nagircbot
- 
- clean:
- 	rm -f $(OBJS) nagircbot core *.da *.gcov *.bb*
diff --git a/debian/patches/series b/debian/patches/series
index df321de..65fa9ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-debian-changes-0.0.32-1
+10add-destdir-support

-- 
Debian packaging for nagircbot