[hamradio-commits] [direwolf] 02/02: Use dh to do the install instead of patching the Makefile

Iain Learmonth irl-guest at moszumanska.debian.org
Thu Jun 11 10:42:45 UTC 2015 

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

irl-guest pushed a commit to branch master
in repository direwolf.

commit 18908bf697c4d88e3034b076367fb3cc2b3bc847
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Thu Jun 11 11:42:29 2015 +0100

    Use dh to do the install instead of patching the Makefile
---
 debian/direwolf-docs.docs             |  6 ++++
 debian/direwolf.desktop               |  9 +++++
 debian/direwolf.docs                  |  3 ++
 debian/direwolf.install               | 15 ++++++++
 debian/patches/fix_desktop_file.patch | 27 --------------
 debian/patches/makefile_install.patch | 66 -----------------------------------
 debian/patches/series                 |  2 --
 debian/rules                          |  3 +-
 8 files changed, 34 insertions(+), 97 deletions(-)

diff --git a/debian/direwolf-docs.docs b/debian/direwolf-docs.docs
new file mode 100644
index 0000000..b403184
--- /dev/null
+++ b/debian/direwolf-docs.docs
@@ -0,0 +1,6 @@
+User-Guide.pdf
+Raspberry-Pi-APRS.pdf
+Raspberry-Pi-APRS-Tracker.pdf
+APRStt-Implementation-Notes.pdf
+A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
+A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
diff --git a/debian/direwolf.desktop b/debian/direwolf.desktop
new file mode 100644
index 0000000..92f5fcd
--- /dev/null
+++ b/debian/direwolf.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Exec=/usr/bin/direwolf
+Name=Dire Wolf
+Comment=APRS Soundcard TNC
+Icon=/usr/share/direwolf/dw-icon.png
+Terminal=true
+Categories=Network;HamRadio
+Keywords=Ham Radio;APRS;Soundcard TNC;KISS;AGWPE;AX.25
diff --git a/debian/direwolf.docs b/debian/direwolf.docs
new file mode 100644
index 0000000..99f9806
--- /dev/null
+++ b/debian/direwolf.docs
@@ -0,0 +1,3 @@
+CHANGES.txt
+LICENSE-dire-wolf.txt
+LICENSE-other.txt
diff --git a/debian/direwolf.install b/debian/direwolf.install
new file mode 100644
index 0000000..52a1440
--- /dev/null
+++ b/debian/direwolf.install
@@ -0,0 +1,15 @@
+direwolf	usr/bin
+decode_aprs	usr/bin
+text2tt		usr/bin
+tt2text		usr/bin
+aclients	usr/bin
+log2gpx		usr/bin
+gen_packets	usr/bin
+atest		usr/bin
+ttcalc		usr/bin
+dwespeak.sh	usr/bin
+tocalls.txt	usr/share/direwolf
+symbols-new.txt	usr/share/direwolf
+symbolsX.txt	usr/share/direwolf
+dw-icon.png	usr/share/direwolf
+debian/direwolf.desktop	usr/share/applications
diff --git a/debian/patches/fix_desktop_file.patch b/debian/patches/fix_desktop_file.patch
deleted file mode 100644
index ffaf73e..0000000
--- a/debian/patches/fix_desktop_file.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Update .desktop file with correct paths, category and line endings
-Author: Iain R. Learmonth <irl at fsfe.org>
-Last-Update: 2014-09-08
-
---- direwolf.orig/direwolf.desktop
-+++ direwolf/direwolf.desktop
-@@ -1,10 +1,9 @@
--[Desktop Entry]
--Type=Application
--Exec=lxterminal -t "Dire Wolf" -e "/usr/local/bin/direwolf"
--Name=Dire Wolf
--Comment=APRS Soundcard TNC
--Icon=/usr/share/direwolf/dw-icon.png
--Path=/home/pi
--#Terminal=true
--Categories=HamRadio
--Keywords=Ham Radio;APRS;Soundcard TNC;KISS;AGWPE;AX.25
-\ No newline at end of file
-+[Desktop Entry]
-+Type=Application
-+Exec=/usr/bin/direwolf
-+Name=Dire Wolf
-+Comment=APRS Soundcard TNC
-+Icon=/usr/share/direwolf/dw-icon.png
-+Terminal=true
-+Categories=Network;HamRadio
-+Keywords=Ham Radio;APRS;Soundcard TNC;KISS;AGWPE;AX.25
diff --git a/debian/patches/makefile_install.patch b/debian/patches/makefile_install.patch
deleted file mode 100644
index a2873d3..0000000
--- a/debian/patches/makefile_install.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Install things in the correct place and don't use sudo
-Author: Iain R. Learmonth <irl at fsfe.org>
-Last-Update: 2014-09-08
-
---- direwolf.orig/Makefile.linux
-+++ direwolf/Makefile.linux
-@@ -144,33 +144,37 @@
- 	$(CC) $(CFLAGS) -c -o $@ $^
- 
- 
--# Optional installation into /usr/local/...
-+# Optional installation into /usr/...
- # Needs to be run as root or with sudo.
- 
- # TODO: Review file locations.
- 
- install : direwolf decode_aprs tocalls.txt symbols-new.txt symbolsX.txt dw-icon.png direwolf.desktop
--	install direwolf /usr/local/bin
--	install decode_aprs /usr/local/bin
--	install text2tt /usr/local/bin
--	install tt2text /usr/local/bin
--	install ll2utm /usr/local/bin
--	install utm2ll /usr/local/bin
--	install aclients /usr/local/bin
--	install log2gpx /usr/local/bin
--	install -D --mode=644 tocalls.txt /usr/share/direwolf/tocalls.txt
--	install -D --mode=644 symbols-new.txt /usr/share/direwolf/symbols-new.txt
--	install -D --mode=644 symbolsX.txt /usr/share/direwolf/symbolsX.txt
--	install -D --mode=644 dw-icon.png /usr/share/direwolf/dw-icon.png
--	install -D --mode=644 direwolf.desktop /usr/share/applications/direwolf.desktop
--	install -D --mode=644 CHANGES.txt /usr/local/share/doc/direwolf/CHANGES.txt
--	install -D --mode=644 LICENSE-dire-wolf.txt /usr/local/share/doc/direwolf/LICENSE-dire-wolf.txt
--	install -D --mode=644 LICENSE-other.txt /usr/local/share/doc/direwolf/LICENSE-other.txt
--	install -D --mode=644 User-Guide.pdf /usr/local/share/doc/direwolf/User-Guide.pdf
--	install -D --mode=644 Raspberry-Pi-APRS.pdf /usr/local/share/doc/direwolf/Raspberry-Pi-APRS.pdf
--	install -D --mode=644 Raspberry-Pi-APRS-Tracker.pdf /usr/local/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
--	install -D --mode=644 APRStt-Implementation-Notes.pdf /usr/local/share/doc/direwolf/APRStt-Implementation-Notes.pdf
--	install -D --mode=644 Quick-Start-Guide-Windows.pdf /usr/local/share/doc/direwolf/Quick-Start-Guide-Windows.pdf
-+	mkdir -p debian/direwolf/usr/bin
-+	mkdir -p debian/direwolf/usr/share/direwolf
-+	mkdir -p debian/direwolf/usr/share/doc/direwolf
-+	mkdir -p debian/direwolf/usr/share/applications
-+	install direwolf debian/direwolf/usr/bin
-+	install decode_aprs debian/direwolf/usr/bin
-+	install text2tt debian/direwolf/usr/bin
-+	install tt2text debian/direwolf/usr/bin
-+	#install ll2utm debian/direwolf/usr/bin
-+	#install utm2ll debian/direwolf/usr/bin
-+	install aclients debian/direwolf/usr/bin
-+	install log2gpx debian/direwolf/usr/bin
-+	install -D --mode=644 tocalls.txt debian/direwolf/usr/share/direwolf/tocalls.txt
-+	install -D --mode=644 symbols-new.txt debian/direwolf/usr/share/direwolf/symbols-new.txt
-+	install -D --mode=644 symbolsX.txt debian/direwolf/usr/share/direwolf/symbolsX.txt
-+	install -D --mode=644 dw-icon.png debian/direwolf/usr/share/direwolf/dw-icon.png
-+	install -D --mode=644 direwolf.desktop debian/direwolf/usr/share/applications/direwolf.desktop
-+	#install -D --mode=644 CHANGES.txt debian/direwolf/usr/share/doc/direwolf/CHANGES.txt
-+	install -D --mode=644 LICENSE-dire-wolf.txt debian/direwolf/usr/share/doc/direwolf/LICENSE-dire-wolf.txt
-+	install -D --mode=644 LICENSE-other.txt debian/direwolf/usr/share/doc/direwolf/LICENSE-other.txt
-+	install -D --mode=644 User-Guide.pdf debian/direwolf-docs/usr/share/doc/direwolf/User-Guide.pdf
-+	install -D --mode=644 Raspberry-Pi-APRS.pdf debian/direwolf-docs/usr/share/doc/direwolf/Raspberry-Pi-APRS.pdf
-+	install -D --mode=644 Raspberry-Pi-APRS-Tracker.pdf debian/direwolf-docs/usr/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
-+	install -D --mode=644 APRStt-Implementation-Notes.pdf debian/direwolf-docs/usr/share/doc/direwolf/APRStt-Implementation-Notes.pdf
-+	install -D --mode=644 Quick-Start-Guide-Windows.pdf debian/direwolf-docs/usr/share/doc/direwolf/Quick-Start-Guide-Windows.pdf
- 
- 
- # The Raspberry Pi has ~/Desktop but Ubuntu does not.
diff --git a/debian/patches/series b/debian/patches/series
index 90db87e..ab9aef9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-fix_desktop_file.patch
-makefile_install.patch
 fix_start_script_paths.patch
 fix_documentation_path.patch
 fix_hardening-no-relro.patch
diff --git a/debian/rules b/debian/rules
index 445d9aa..5b6b382 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,8 @@ override_dh_auto_build:
 	make -f Makefile.linux
 
 override_dh_auto_install:
-	make -f Makefile.linux install
+	@echo "Skipping the install to /usr/local"
 
 override_dh_auto_clean:
 	make -f Makefile.linux clean
-	-rm aclients gen_fff
 

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

More information about the pkg-hamradio-commits mailing list