From 192791171c93c2008fa11a9f3bf1a2da2e14ea08 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 19 Dec 2013 01:53:11 -0700 Subject: [PATCH] patches no longer needed --- debian/patches/explicit-lcrypto | 37 --------------------------------- debian/patches/series | 2 -- debian/patches/ship-telebt-fw | 37 --------------------------------- 3 files changed, 76 deletions(-) delete mode 100644 debian/patches/explicit-lcrypto delete mode 100644 debian/patches/series delete mode 100644 debian/patches/ship-telebt-fw diff --git a/debian/patches/explicit-lcrypto b/debian/patches/explicit-lcrypto deleted file mode 100644 index fdecd9ef..00000000 --- a/debian/patches/explicit-lcrypto +++ /dev/null @@ -1,37 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - altos (1.2.1-3) unstable; urgency=low - . - [ Keith Packard ] - * altos: Make FAT test program link explicitly against libcrypto -Author: Bdale Garbee - ---- -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: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- altos-1.2.1.orig/src/test/Makefile -+++ altos-1.2.1/src/test/Makefile -@@ -69,7 +69,7 @@ ao_micropeak_test: ao_micropeak_test.c a - cc $(CFLAGS) -o $@ ao_micropeak_test.c -lm - - ao_fat_test: ao_fat_test.c ao_fat.c ao_bufio.c -- cc $(CFLAGS) -o $@ ao_fat_test.c -lssl -+ cc $(CFLAGS) -o $@ ao_fat_test.c -lssl -lcrypto - - ao_aes_test: ao_aes_test.c ao_aes.c ao_aes_tables.c - cc $(CFLAGS) -o $@ ao_aes_test.c diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 174a2e17..00000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -ship-telebt-fw -explicit-lcrypto diff --git a/debian/patches/ship-telebt-fw b/debian/patches/ship-telebt-fw deleted file mode 100644 index 25924985..00000000 --- a/debian/patches/ship-telebt-fw +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/altosui/Makefile.am b/altosui/Makefile.am -index d59e308..78e29cd 100644 ---- a/altosui/Makefile.am -+++ b/altosui/Makefile.am -@@ -148,7 +148,10 @@ FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2) - FIRMWARE_TELEMINI_1_0=$(top_srcdir)/src/telemini-v1.0-$(VERSION).ihx - FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0) - --FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) -+FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0-$(VERSION).ihx -+FIRMWARE_TBT=$(FIRMWARE_TBT_1_0) -+ -+FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) - - ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf - ALTOS_DOC=$(top_srcdir)/doc/altos.pdf -diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in -index 9886e4a..81506bb 100644 ---- a/altosui/altos-windows.nsi.in -+++ b/altosui/altos-windows.nsi.in -@@ -111,7 +111,7 @@ Section "AltosUI Desktop Shortcut" - CreateShortCut "$DESKTOP\AltusMetrum.lnk" "$INSTDIR\altosui-fat.jar" "" "$INSTDIR\altus-metrum.ico" - SectionEnd - --Section "TeleMetrum and TeleDongle Firmware" -+Section "TeleMetrum, TeleDongle and TeleBT Firmware" - - SetOutPath $INSTDIR - -@@ -120,6 +120,7 @@ Section "TeleMetrum and TeleDongle Firmware" - File "../src/telemetrum-v1.2/telemetrum-v1.2-${VERSION}.ihx" - File "../src/telemini-v1.0/telemini-v1.0-${VERSION}.ihx" - File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx" -+ File "../src/telebt-v1.0/telebt-v1.0-${VERSION}.ihx" - - SectionEnd - -- 2.47.2