diff --git a/changelog.upstream b/changelog.upstream index 8c02d7c..cca62f0 100644 --- a/changelog.upstream +++ b/changelog.upstream @@ -1,3 +1,43 @@ +commit 7b0b9da32c660e527741a56543c78ee3ac93d541 +Merge: 6df7b3c 649878f +Author: Patrick Schleizer +Date: Sat Jul 6 07:06:54 2019 -0400 + + Merge remote-tracking branch 'origin/master' + +commit 649878fdcb81ac621af9bc1481a3b6b41d3e22a0 +Merge: 6df7b3c 8888147 +Author: Patrick Schleizer +Date: Sat Jul 6 11:06:25 2019 +0000 + + Merge pull request #20 from madaidan/patch-15 + + Blacklist HDLC and use "install" for blacklisting firewire/thunderbolt + +commit 8888147e1e1102fa852dce14c3ca1cb91cd1ff3b +Author: madaidan <50278627+madaidan@users.noreply.github.com> +Date: Thu Jul 4 14:26:31 2019 +0000 + + Update control + +commit 46409be8b664db730113b4495ef69bee0f41c53a +Author: madaidan <50278627+madaidan@users.noreply.github.com> +Date: Thu Jul 4 14:25:28 2019 +0000 + + Use install instead of blacklist + +commit eb7eaffba1f437763773b5c7f2b44ef51684ddcd +Author: madaidan <50278627+madaidan@users.noreply.github.com> +Date: Thu Jul 4 14:24:44 2019 +0000 + + Blacklist n-hdlc + +commit 6df7b3c295352d0d05070b3c0faf2a14e71b1264 +Author: Patrick Schleizer +Date: Mon Jul 1 15:23:49 2019 +0000 + + bumped changelog version + commit f82731698c20028531de673903faca10aa136416 Author: Patrick Schleizer Date: Mon Jul 1 14:53:01 2019 +0000 diff --git a/debian/changelog b/debian/changelog index 4081285..fff0209 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +security-misc (3:4.2-1) unstable; urgency=medium + + * New upstream version (local package). + + -- Patrick Schleizer Sat, 06 Jul 2019 13:53:10 +0000 + security-misc (3:4.1-1) unstable; urgency=medium * New upstream version (local package).