diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/explicit-lcrypto | 37 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rw-r--r-- | debian/patches/ship-telebt-fw | 37 |
3 files changed, 76 insertions, 0 deletions
diff --git a/debian/patches/explicit-lcrypto b/debian/patches/explicit-lcrypto new file mode 100644 index 00000000..fdecd9ef --- /dev/null +++ b/debian/patches/explicit-lcrypto @@ -0,0 +1,37 @@ +Description: <short summary of the patch> + 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 <bdale@gag.com> + +--- +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> + +--- 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 new file mode 100644 index 00000000..174a2e17 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +ship-telebt-fw +explicit-lcrypto diff --git a/debian/patches/ship-telebt-fw b/debian/patches/ship-telebt-fw new file mode 100644 index 00000000..25924985 --- /dev/null +++ b/debian/patches/ship-telebt-fw @@ -0,0 +1,37 @@ +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 + |