From: srs5694 Date: Sun, 29 Nov 2015 19:01:13 +0000 (-0500) Subject: Merge remote-tracking branch 'tianon/master' X-Git-Url: https://code.delx.au/refind/commitdiff_plain/1ecb53a60573127a4cc976980053adda3bb5e089?hp=0240b648949d78c71d8da6ce5ba019a57f974dee Merge remote-tracking branch 'tianon/master' Conflicts: debian/changelog debian/control debian/copyright debian/rules --- diff --git a/debian/changelog b/debian/changelog index 824545f..aaa3946 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,84 +1,5 @@ -refind (0.10.0-0ppa1) trusty; urgency=medium +refind (0.10.0-1) UNRELEASED; urgency=medium - * Version bump + * Initial release (Closes: #715426) - -- Roderick Smith Sun, 08 Nov 2015 16:53:35 -0500 - -refind (0.9.2-0ppa1) trusty; urgency=medium - - * Version bump - - -- Roderick Smith Sat, 19 Sep 2015 10:42:58 -0400 - -refind (0.9.1-0ppa1) trusty; urgency=medium - - * Version bump - - -- Roderick Smith Sun, 13 Sep 2015 17:14:29 -0400 - -refind (0.9.0-0ppa1) trusty; urgency=medium - - * Version bump - - -- Roderick Smith Sun, 26 Jul 2015 12:36:11 -0400 - -refind (0.8.7-0ppa2) trusty; urgency=medium - - * Fix Debian packaging error affecting IA32 platforms - - -- Roderick Smith Thu, 19 Mar 2015 20:25:03 -0400 - -refind (0.8.7-0ppa1) trusty; urgency=medium - - * Version bump - - -- Roderick Smith Sun, 01 Mar 2015 18:32:25 -0500 - -refind (0.8.6-0ppa1) trusty; urgency=medium - - * Version bump - - -- Roderick Smith Sun, 08 Feb 2015 09:38:43 -0500 - -refind (0.8.4-0ppa1) trusty; urgency=medium - - * Version bump - - -- Rod Smith Mon, 08 Dec 2014 12:28:56 -0400 - -refind (0.8.3-0ppa1) trusty; urgency=medium - - * Version bump - - -- Rod Smith Sun, 06 Jul 2014 12:28:56 -0400 - -refind (0.8.2-0ppa3) trusty; urgency=medium - - * Removed stray debugging code that caused pause during startup - - -- Rod Smith Sun, 08 Jun 2014 16:48:48 -0400 - -refind (0.8.2-0ppa2) trusty; urgency=medium - - * Version bump - - -- Rod Smith Sun, 08 Jun 2014 12:32:48 -0400 - -refind (0.8.1-0ppa2) trusty; urgency=medium - - * Revised Debian package to not use version numbers in /usr/share directory names - - -- Rod Smith Fri, 16 May 2014 14:57:11 -0400 - -refind (0.8.0-0ppa1) trusty; urgency=medium - - * Updated for version 0.8.0 - - -- Rod Smith Fri, 16 May 2014 09:01:45 -0400 - -refind (0.7.8-0ppa1) trusty; urgency=low - - [ Roderick W. Smith ] - * Initial release. (Closes: #1136112) - - -- Rod Smith Sun, 9 Mar 2014 07:59:50 -0500 + -- Tianon Gravi Wed, 25 Nov 2015 09:07:15 -0800 diff --git a/debian/control b/debian/control index 1f5e219..3c130f3 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,17 @@ Source: refind -Maintainer: Rod Smith +Maintainer: Tianon Gravi +Uploaders: Rod Smith Section: admin Priority: optional Standards-Version: 3.9.6 Build-Depends: debhelper (>= 9), gnu-efi +Homepage: http://www.rodsbooks.com/refind +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/refind.git +Vcs-Git: git://anonscm.debian.org/collab-maint/refind.git Package: refind -Architecture: i386 amd64 -Depends: ${misc:Depends}, efibootmgr, openssl, sbsigntool, parted +Architecture: amd64 i386 +Depends: efibootmgr, openssl, parted, ${misc:Depends} Description: boot manager for EFI-based computers A graphical boot manager for EFI- and UEFI-based computers, such as all Intel-based Macs and recent (most 2011 and later) PCs. rEFInd presents a diff --git a/debian/copyright b/debian/copyright index e187d06..5da3488 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,54 +1,7 @@ -This package was debianized by Roderick W. Smith Wed, -29 Jan 2014 10:25:54 -0500. - -It was downloaded from http://sourceforge.net/p/refind/code/ci/master/tree/ - -Upstream Authors: - Roderick W. Smith - Christoph Pfisterer - Dave Vasilevsky - John Bressler - Stefan Agner - James Bottomley - Kay Sievers - Harald Hoyer - Mark Adler - Markus Franz Xaver Johannes Oberhumer - Peter Anvin - Lode Vandevenne - Gary S. Brown - Dan Rabbit - Alessandro Roncone - Debian Project - Intel Corporation - Regents of the University of California - UNIX System Laboratories, Inc. - Oracle Corporation - Tencent, Inc. - Apple, Inc. - -Copyright: - -This package builds two EFI application programs and several drivers. -Documentation and icons are also included. - -* The main rEFInd binary (refind_x64.efi or refind_ia32.efi) uses source - code with various licenses, all of which are compatible with the GPL-3, - which is the overarching license. -* The gptsync binary uses source files that all use the BSD 2-clause - license. -* Drivers all rely on a BSD 2-clause base. Beyond that, things diverge: - * The HFS+ and ISO-9660 drivers use GPL-2 source files - * The Btrfs driver uses GPL-2+ and GPL-3+ source files - * The ext2fs, ext4fs, ReiserFS, and NTFS drivers all use GPL-2+ - source files. -* The documentation is licensed under the FDL 1.3 -* Icons use the CC-SA 3.0, LGPLv3+, or GPLv2 licenses. - -File-by-file details are described below. - -Files Used to Create Main rEFInd Binary ---------------------------------------- +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: rEFInd +Upstream-Contact: Roderick W. Smith +Source: http://www.rodsbooks.com/refind Files: refind/* libeg/image.c @@ -110,9 +63,6 @@ Files: include/RemovableMedia.h Copyright: 2005 Apple Computer, Inc. License: See comments in file -Files Used to Create gptsync Binary ------------------------------------ - Files: gptsync/* Copyright: 2006 Christoph Pfisterer License: BSD 2-clause @@ -122,9 +72,6 @@ Copyright: 2006 Christoph Pfisterer 2013 Roderick W. Smith License: BSD 2-clause -Base Filesystem Driver Files ----------------------------- - Files: filesystems/fsw_core.[ch] filesystems/fsw_efi.[ch] filesystems/fsw_efi_lib.c @@ -137,10 +84,6 @@ Files: filesystems/fsw_efi_edk2_base.h Copyright: 2012 Stefan Agner License BSD 3-clause -Files Used by ext2fs, ext4fs, ReiserFS, NTFS Filesystem Drivers -(Used in addition to Base Filesystem Driver Files) ---------------------------------------------------------------- - Files: filesystems/fsw_ext2.[ch] filesystems/fsw_ext2_disk.h filesystems/fsw_reiserfs.[ch] @@ -167,10 +110,6 @@ Files: filesystems/fsw_ntfs.c Copyright: Samuel Liao License: GPL-2+ -Files Used by Btrfs Filesystem Driver -(Used in addition to Base Filesystem Driver Files) --------------------------------------------------- - Files: filesystems/crc32c.c filesystems/gzio.c Copyright: 2008 Free Software Foundation, Inc. @@ -189,10 +128,6 @@ Files: filesystems/scandisk.c Copyright: 2013 Tencent, Inc. (Samuel Liao) License: GPL-3+ -Files Used by HFS+ & ISO-9660 Filesystem Drivers -(Used in addition to Base Filesystem Driver Files) --------------------------------------------------- - Files: filesystems/fsw_hfs.[ch] Copyright: 2010 Oracle Corporation License: GPL-2 @@ -202,16 +137,10 @@ Copyright: 2006 Christoph Pfisterer 2010 Oracle Corporation License: BSD 3-clause & GPL-2 -Files Used to Build iPXE (not built by default) ------------------------------------------------ - Files: net/* Copyright: 2009 Michael Brown License: GPL-2+ -Icons ------ - Files: icons/arrow_left.png icons/arrow_right.png icons/boot_linux.png @@ -257,9 +186,6 @@ License: Creative Commons Attribution-Share Alike 3.0 (CC-SA 3.0) Note: tool_windows_rescue is combination of os_win8.png with tool_rescue.png. -Mappings of files to original AwOken package filenames is in the -icons/README file. - Files: icons/boot_win.png icons/func_csr_rotate.png icons/os_clover.png @@ -284,7 +210,6 @@ License: LGPLv3+ or Creative Commons Attribution-Share Alike 3.0 Note: tool_windows_rescue is combination of os_win8.png with tool_rescue.png. - File: icons/os_debian.png Copyright: 1999 by Debian Project License: LGPLv3+ or Creative Commons Attribution-Share Alike 3.0 @@ -294,30 +219,8 @@ File: icons/os_elementary.png Copyright: 2008 Dan Rabbit License: GPLv2 -SVG forms of some icons appear in the icons/svg subdirectory. When present, -they have the same copyrights and licenses as the PNG versions noted above. - -Documentation -------------- - Files: docs/* Copyright: 2012-2015 Roderick W. Smith License: FDL 1.3 -License: GPL-3 - - This package 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, either version 3 of the License, or - (at your option) any later version. - - This program 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'. +# TODO clean up names in "License:" headers and list all license texts here diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..68e4d73 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +pristine-tar = True +merge = False diff --git a/debian/refind.docs b/debian/refind.docs new file mode 100644 index 0000000..6f05494 --- /dev/null +++ b/debian/refind.docs @@ -0,0 +1,4 @@ +CREDITS.txt +README.txt +docs/Styles +docs/refind diff --git a/debian/refind.install b/debian/refind.install new file mode 100644 index 0000000..0d7031f --- /dev/null +++ b/debian/refind.install @@ -0,0 +1,16 @@ +drivers_* usr/share/refind/refind +refind.conf-sample usr/share/refind/refind +refind/refind*.efi usr/share/refind/refind + +icons/*.png usr/share/refind/refind/icons +icons/README usr/share/refind/refind/icons + +banners usr/share/refind +fonts usr/share/refind + +mkrlconf usr/sbin +mvrefind usr/sbin +refind-install usr/share/refind +# refind-install symlink is added to usr/sbin as well (see refind.links) + +keys etc/refind diff --git a/debian/refind.links b/debian/refind.links new file mode 100644 index 0000000..f12d564 --- /dev/null +++ b/debian/refind.links @@ -0,0 +1 @@ +usr/share/refind/refind-install usr/sbin/refind-install diff --git a/debian/refind.manpages b/debian/refind.manpages new file mode 100644 index 0000000..e229709 --- /dev/null +++ b/debian/refind.manpages @@ -0,0 +1 @@ +docs/man/* diff --git a/debian/rules b/debian/rules index ab1f351..6f9c7f2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,37 @@ #!/usr/bin/make -f -DH_VERBOSE=1 + +export DH_VERBOSE := 1 + +DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null) +ifeq (amd64, $(DEB_HOST_ARCH_CPU)) + EFI_ARCH := x64 +else +ifeq (i386, $(DEB_HOST_ARCH_CPU)) + EFI_ARCH := ia32 +else + $(warning EFI architecture for $(DEB_HOST_ARCH_CPU) is unknown) + EFI_ARCH := $(DEB_HOST_ARCH_CPU) +endif +endif + %: dh $@ override_dh_auto_clean: - rm -rf $$(pwd)/debian/files $$(pwd)/debian/refind.* $$(pwd)/debian/refind - $(MAKE) clean - rm -f $$(pwd)/drivers*/* + dh_auto_clean + rm -rf drivers_*/ override_dh_auto_build: $(MAKE) gnuefi $(MAKE) fs_gnuefi override_dh_auto_install: - $$(pwd)/debian/debinstall $$(pwd)/debian/refind + # "make install" actually runs "efi-install" for the current system, so let's not do that :) + +override_dh_install: + dh_install + mkdir -p debian/refind/usr/share/refind/refind/tools_$(EFI_ARCH) + cp gptsync/gptsync_$(EFI_ARCH).efi debian/refind/usr/share/refind/refind/tools_$(EFI_ARCH)/ + +override_dh_installchangelogs: + dh_installchangelogs NEWS.txt diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..b753084 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/refind/refind-src-(\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))