diff --git a/debian/changelog b/debian/changelog index 1777375..cb050b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linbpq (6.0.24.77+repack-1~hibbian~TRIXIE+1) UNRELEASED; urgency=medium + + * New upstream version 6.0.24.77+repack + * MINI_BUILDD_OPTION: auto-ports=trixie-packetrepo-unstable,bookworm-packetrepo-unstable,bullseye-packetrepo-unstable,noble-packetrepo-unstable,jammy-packetrepo-unstable + + -- Dave Hibberd Tue, 22 Jul 2025 20:57:22 +0100 + linbpq (6.0.24.75+repack-1~hibbian~TRIXIE+2) trixie-hibbian-unstable; urgency=medium * First trixie release diff --git a/debian/patches/makefile b/debian/patches/makefile index 43c25cb..cd4bfd2 100644 --- a/debian/patches/makefile +++ b/debian/patches/makefile @@ -10,42 +10,46 @@ upnp.o APRSStdPages.o HSMODEM.o WinRPR.o KISSHF.o TNCEmulators.o bpqhdlc.o SerialPort.o\ adif.o WebMail.o utf8Routines.o VARA.o LzFind.o Alloc.o LzmaDec.o LzmaEnc.o LzmaLib.o \ Multicast.o ARDOP.o IPCode.o FLDigi.o linether.o CMSAuth.o APRSCode.o BPQtoAGW.o KAMPactor.o\ -@@ -18,9 +17,13 @@ - # Configuration: +@@ -19,7 +18,10 @@ - CC = gcc -- --all: CFLAGS = -DLINBPQ -MMD -g -rdynamic -fcommon -fasynchronous-unwind-tables --all: LDFLAGS = -l:libpaho-mqtt3a.a -l:libjansson.a + #Default to Linux + CC = gcc +- EXTRA_LDFLAGS = -Xlinker -Map=output.map -lrt -l:libpaho-mqtt3a.a -l:libjansson.a + -+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -+CFLAGS+=$(shell dpkg-buildflags --get CPPFLAGS) -+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -+ -+all: CFLAGS += -DLINBPQ -MMD -g -rdynamic -fcommon -fasynchronous-unwind-tables ++ CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) ++ CFLAGS+=$(shell dpkg-buildflags --get CPPFLAGS) ++ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) + + #other OS + +@@ -42,7 +44,8 @@ + + $(info OS_NAME is $(OS_NAME)) + +-all: CFLAGS = -DLINBPQ -MMD -g -fcommon -fasynchronous-unwind-tables $(EXTRA_CFLAGS) ++all: CFLAGS += -DLINBPQ -MMD -g -rdynamic -fcommon -fasynchronous-unwind-tables +all: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lrt -lm -lz -lpthread -lconfig -lpcap -lpng all: linbpq -@@ -32,12 +35,15 @@ +@@ -54,12 +57,16 @@ linbpq: $(OBJS) -- gcc $(OBJS) -Xlinker -Map=output.map -l:libminiupnpc.a -lrt -lm -lz $(LDFLAGS) -lpthread -lconfig -lpcap -o linbpq +- cc $(OBJS) $(EXTRA_LDFLAGS) -lminiupnpc -lm -lz $(LDFLAGS) -lpthread -lconfig -lpcap -o linbpq - sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq -+ gcc $(OBJS) $(CLFAGS) $(LDFLAGS) $(LIBS) -o linbpq -+ # sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq ++ gcc $(OBJS) $(CFLAGS) $(LDFLAGS) $(LIBS) -o linbpq ++ # sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq -include *.d --clean : ++install: ++ install -b -m 755 -D -d debian/linbpq/usr/sbin ++ install -b -m 755 -p linbpq debian/linbpq/usr/sbin ++ + clean : - rm *.d - rm linbpq $(OBJS) -- -+install: -+ install -b -m 755 -D -d debian/linbpq/usr/sbin -+ install -b -m 755 -p linbpq debian/linbpq/usr/sbin -+ -+clean: + $(RM) *.d + $(RM) linbpq $(OBJS) +