From 21ebe03556d7030055644f46efd3c165396a7a75 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 1 Oct 2016 13:11:17 -0700 Subject: [PATCH] * Initial Debian upload. Closes: #820052. * Update Standards-Version. * Embed the newly-minted Debian CA certificate. * Vendorize debian/rules so that the same package can be used in both Debian and Ubuntu without modification. * Fix debian/copyright to match the spec (last match wins, not first) * Fix shim.efi to not be executable. * Add watchfile. * Support parallel builds, because eh why not * Update Vcs-Bzr. --- debian/changelog | 15 ++++++++++++++ debian/control | 7 +++---- debian/copyright | 36 ++++++++++++++++----------------- debian/debian-uefi-ca.der | Bin 0 -> 930 bytes debian/rules | 18 +++++++++++++++-- debian/source/include-binaries | 1 + debian/watch | 5 +++++ 7 files changed, 58 insertions(+), 24 deletions(-) create mode 100644 debian/debian-uefi-ca.der create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog index 6a2a198..6b9e44f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +shim (0.9+1465500757.14a5905-1) unstable; urgency=medium + + * Initial Debian upload. Closes: #820052. + * Update Standards-Version. + * Embed the newly-minted Debian CA certificate. + * Vendorize debian/rules so that the same package can be used in both + Debian and Ubuntu without modification. + * Fix debian/copyright to match the spec (last match wins, not first) + * Fix shim.efi to not be executable. + * Add watchfile. + * Support parallel builds, because eh why not + * Update Vcs-Bzr. + + -- Steve Langasek Tue, 23 Aug 2016 05:23:42 +0000 + shim (0.9+1465500757.14a5905-0ubuntu1) yakkety; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 0f71c7f..25b0b47 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,10 @@ Source: shim Section: admin Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Steve Langasek -Standards-Version: 3.9.3 +Maintainer: Steve Langasek +Standards-Version: 3.9.8 Build-Depends: debhelper (>= 9), gnu-efi (>= 3.0u), sbsigntool, openssl -Vcs-Bzr: lp:ubuntu/shim +Vcs-Bzr: lp:~ubuntu-core-dev/shim/trunk Package: shim Architecture: amd64 diff --git a/debian/copyright b/debian/copyright index b25a56d..50dabd2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,24 +3,6 @@ Upstream-Name: shim Upstream-Contact: Matthew Garrett Source: https://github.com/mjg59/shim.git -Files: debian/patches/* -Copyright: 2016 Canonical Ltd. -License: GPL-2 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see - . - On Debian systems, the complete text of the GNU General - Public License can be found in `/usr/share/common-licenses/GPL-2'. - Files: * Copyright: 2012 Red Hat, Inc 2009-2012 Intel Corporation @@ -49,3 +31,21 @@ License: BSD-2-Clause STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: debian/patches/* +Copyright: 2016 Canonical Ltd. +License: GPL-2 + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. diff --git a/debian/debian-uefi-ca.der b/debian/debian-uefi-ca.der new file mode 100644 index 0000000000000000000000000000000000000000..1dd6ee16693289ae2cfaa4fd9a7bc89e82075654 GIT binary patch literal 930 zcmXqLVxDKv#MHKcnTe5!Ns!@f$il1Z+dZcA&hIpOH>bwLfR~L^tIebBJ1-+6H!FjI zf}xy&3>$MO3$w7OOKMVPVxB^9YI12&s)AE~eu;v!qk)__uc4WNg`t_Dg@L7^MU*(N z36Kk7g1JPP(8Q>OY%L=z19KB2KZ8LNBNtN>BO}AysaLvZ-x64(cdE(!;F8l`hozk+ zAF9&4oOd^6eZ%@!X^W&2=QQ&i&E9FM`v2(f7n;uZ&UxD&6Y|~oUd?%G##t7@e}`0N z-xImf7Wl%#dGE$qqE9)pe}n{dZ}yJ=Bl5&FpoV+nBj%PBW*$!(Uc8$BYyVM+>bP?< z`*a#AJWWLpD4u_xcC~97hjyC2hxo?lZ<_kqpPhOTU#Makz}0uLNF!kBT*WVs6L)bk zr=7U(r)I`2%AYK+y?*r(jYVN8t-Z@a9oN}(Ouc&{_on9U8%Hv>{`nH#nJser!TWa( zyh-w}BCagHv5R@xbiJe5!b>KWFWb6SdHHKDPZ778vX}FWwsfu!uVi9oWMEv}c*&sg zyn!Pdhc+7{D=RxABa5klv4J6sZ@|>1no&|xP;8~IpHiHtmjaF~z5Jqd{bF#0=_Uaq zOgA~vKpq&KvdSzH24W2&Ip@yR`Q-4*CwhLqtA77X%x=ed3k^irI1}1D7~6h0F#^GV z78YhEhVKT#AZ@BFJO*4aE18)M_&|dEP(_Sw2K*qtFo@4;zzn1eWI+OaEMhF!twK$0 zz-VV=D4%BMe)1gW`R>khk#E)b)VO!9U8%iy;p>h{rvHZb{(a42f1fBUSRl85j$c~N z!z7{UjNz&7cfF2%|8j4|N8zM1&EacomQ560AF5WAsV8#wuJ7iH2`aiq{*pO@ai11{ zS{R?iZ?JCdM~}3WS~C}3HWORD^?h>>uRS#JhWUecRq;*M>3s}cN0!_-6+2XiD}o*$s