Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2012-01-04 07:25:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-prober (Old) and /work/SRC/openSUSE:Factory/.os-prober.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2011-10-04 18:14:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2012-01-04 07:25:44.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Dec 19 11:13:44 UTC 2011 - [email protected] + +- Clarify license. + +------------------------------------------------------------------- +Thu Dec 8 12:23:12 UTC 2011 - [email protected] + +- Update to 1.49: + * MeeGo detection support + * Bugfixes + +------------------------------------------------------------------- +Thu Dec 8 11:18:49 UTC 2011 - [email protected] + +- this seems to be "GPL" as it was understood 2004, so guessing + GPL-2.0+ + +------------------------------------------------------------------- Old: ---- os-prober_1.47.tar.gz New: ---- COPYING-note.txt os-prober_1.49.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ --- /var/tmp/diff_new_pack.k2FHzU/_old 2012-01-04 07:25:45.000000000 +0100 +++ /var/tmp/diff_new_pack.k2FHzU/_new 2012-01-04 07:25:45.000000000 +0100 @@ -18,14 +18,15 @@ Name: os-prober -Version: 1.47 -Release: 1 +Version: 1.49 +Release: 0 Summary: Probes disks on the system for installed operating systems +License: GPL-2.0+ +Group: System/Boot -License: GPL Url: http://kitenet.net/~joey/code/os-prober/ -Group: System/Boot Source0: http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{version}.tar.gz +Source1: COPYING-note.txt # move newns binary outside of os-prober subdirectory, so that debuginfo # can be automatically generated for it Patch0: os-prober-newnsdirfix.patch @@ -48,6 +49,7 @@ %prep %setup -q -n %{name} +cp %SOURCE1 . %patch0 -p1 %patch1 -p1 @@ -90,7 +92,7 @@ %files %defattr(-,root,root,-) -%doc README TODO debian/copyright debian/changelog +%doc README TODO debian/copyright debian/changelog COPYING-note.txt %{_bindir}/* %{_libexecdir}/linux-boot-probes %{_libexecdir}/newns ++++++ COPYING-note.txt ++++++ Version 1.50 of os-prober contains a license clarification, the license of the package is GPL-2+, see for example the following commits: http://anonscm.debian.org/gitweb/?p=d-i/os-prober.git;a=commitdiff;h=249d0814ae9c6e308baaaad4ec4e0a403a592ffd http://anonscm.debian.org/gitweb/?p=d-i/os-prober.git;a=commit;h=25024daeccd86cec17353455b99af677b3b83b16 http://anonscm.debian.org/gitweb/?p=d-i/os-prober.git;a=commit;h=cc0ce8e5ec252b10127ca3ebb71c12cd31d4ebc4 The copyright file reads as of 2011-12-19: The majority of code in os-prober is Copyright 2004-2011 by Joshua Kwan, Joey Hess, Christian Perrier, Colin Watson and Otavio Salvador. This is licensed under the terms of the GNU GPL, either version 2 or, at your option, any later version. Some portions of os-prober by other contributors has an unclear license of "GNU GPL", with the version not specified. On Debian systems, a copy of the GNU General Public License is available in /usr/share/common-licenses/GPL. ++++++ os-prober_1.47.tar.gz -> os-prober_1.49.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober/common.sh new/os-prober/common.sh --- old/os-prober/common.sh 2011-05-14 18:09:08.000000000 +0200 +++ new/os-prober/common.sh 2011-07-23 15:54:37.000000000 +0200 @@ -98,6 +98,7 @@ else q="" fi + [ -d "$2" ] || return 1 # find files with any case ls -1 "$2" | grep $q -i "^$1$" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober/debian/changelog new/os-prober/debian/changelog --- old/os-prober/debian/changelog 2011-05-15 22:49:10.000000000 +0200 +++ new/os-prober/debian/changelog 2011-08-29 13:34:22.000000000 +0200 @@ -1,3 +1,29 @@ +os-prober (1.49) unstable; urgency=low + + [ Robert Millan ] + * Depend on grub-mount-udeb only on architectures with FUSE support. + + [ Colin Watson ] + * Restrict grub-mount-udeb dependency to architectures where + grub-mount-udeb exists (closes: #639599). + + -- Colin Watson <[email protected]> Mon, 29 Aug 2011 12:34:21 +0100 + +os-prober (1.48) unstable; urgency=low + + [ Colin Watson ] + * Depend on grub-mount-udeb (see changelog for 1.45). + * item_in_dir: return 1 immediately if second argument is not a directory + (thanks, Daniel Richard G.; LP: #798447). + + [ Otavio Salvador ] + * add MeeGo detection support; thanks to Chengwei Yang + <[email protected]> for the patch. + * Fix Windows detection when there are more then one boot directories + (e.g boot and Boot). Closes: #634649. + + -- Otavio Salvador <[email protected]> Sat, 23 Jul 2011 17:46:13 +0200 + os-prober (1.47) unstable; urgency=low [ Joey Hess ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober/debian/control new/os-prober/debian/control --- old/os-prober/debian/control 2011-03-10 22:23:34.000000000 +0100 +++ new/os-prober/debian/control 2011-08-29 13:28:52.000000000 +0200 @@ -11,7 +11,7 @@ Package: os-prober-udeb XC-Package-Type: udeb Architecture: any -Depends: ${shlibs:Depends}, di-utils-mapdevfs, anna (>= 1.16) +Depends: ${shlibs:Depends}, di-utils-mapdevfs, anna (>= 1.16), grub-mount-udeb [i386 amd64 powerpc ppc64 sparc mipsel kfreebsd-i386 kfreebsd-amd64] Provides: os-prober Description: utility to detect other OSes on a set of drives This package is to be used by boot loader installers to detect other OSes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober/os-probes/mounted/common/90linux-distro new/os-prober/os-probes/mounted/common/90linux-distro --- old/os-prober/os-probes/mounted/common/90linux-distro 2011-05-14 18:09:08.000000000 +0200 +++ new/os-prober/os-probes/mounted/common/90linux-distro 2011-07-23 10:19:40.000000000 +0200 @@ -118,6 +118,9 @@ elif [ -e "$dir/etc/lfs-release" ]; then short="LFS" long="$(printf "Linux From Scratch (%s)\n" "$(cat "$dir/etc/lfs-release")")" + elif [ -e "$dir/etc/meego-release" ]; then + short="MeeGo" + long="$(head -1 "$dir/etc/meego-release")" else short="Linux" long="unknown Linux distribution" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober/os-probes/mounted/x86/20microsoft new/os-prober/os-probes/mounted/x86/20microsoft --- old/os-prober/os-probes/mounted/x86/20microsoft 2011-05-14 18:09:08.000000000 +0200 +++ new/os-prober/os-probes/mounted/x86/20microsoft 2011-07-24 11:16:41.000000000 +0200 @@ -16,27 +16,40 @@ *) debug "$1 is not a MS partition: exiting"; exit 1 ;; esac +found= # Vista (previously Longhorn) -if item_in_dir -q bootmgr "$2" && boot="$(item_in_dir boot "$2")" && - bcd="$(item_in_dir bcd "$2/$boot")"; then - if grep -qs "W.i.n.d.o.w.s. .7" "$2/$boot/$bcd"; then - long="Windows 7 (loader)" - elif grep -qs "W.i.n.d.o.w.s. .V.i.s.t.a" "$2/$boot/$bcd"; then - long="Windows Vista (loader)" - elif grep -qs "W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8. .R.2." "$2/$boot/$bcd"; then - long="Windows Server 2008 R2 (loader)" - elif grep -qs "W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8." "$2/$boot/$bcd"; then - long="Windows Server 2008 (loader)" - elif grep -qs "W.i.n.d.o.w.s. .R.e.c.o.v.e.r.y. .E.n.v.i.r.o.n.m.e.n.t" "$2/$boot/$bcd"; then - long="Windows Recovery Environment (loader)" - elif grep -qs "W.i.n.d.o.w.s. .S.e.t.u.p" "$2/$boot/$bcd"; then - long="Windows Recovery Environment (loader)" - else - long="Windows Vista (loader)" - fi - short=Windows +if item_in_dir -q bootmgr "$2"; then + # there might be different boot directories in different case as: + # boot Boot BOOT + for boot in $(item_in_dir boot "$2"); do + bcd=$(item_in_dir bcd "$2/$boot") + if [ -n "$bcd" ]; then + if grep -qs "W.i.n.d.o.w.s. .7" "$2/$boot/$bcd"; then + long="Windows 7 (loader)" + elif grep -qs "W.i.n.d.o.w.s. .V.i.s.t.a" "$2/$boot/$bcd"; then + long="Windows Vista (loader)" + elif grep -qs "W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8. .R.2." "$2/$boot/$bcd"; then + long="Windows Server 2008 R2 (loader)" + elif grep -qs "W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8." "$2/$boot/$bcd"; then + long="Windows Server 2008 (loader)" + elif grep -qs "W.i.n.d.o.w.s. .R.e.c.o.v.e.r.y. .E.n.v.i.r.o.n.m.e.n.t" "$2/$boot/$bcd"; then + long="Windows Recovery Environment (loader)" + elif grep -qs "W.i.n.d.o.w.s. .S.e.t.u.p" "$2/$boot/$bcd"; then + long="Windows Recovery Environment (loader)" + else + long="Windows Vista (loader)" + fi + short=Windows + + found=true + + break + fi + done +fi + # 2000/XP/NT4.0 -elif item_in_dir -q ntldr "$2" && item_in_dir -q ntdetect.com "$2"; then +if [ -z "$found" ] && item_in_dir -q ntldr "$2" && item_in_dir -q ntdetect.com "$2"; then long="Windows NT/2000/XP" short=Windows ini=$(item_in_dir boot.ini "$2") @@ -62,18 +75,30 @@ else long="Windows NT/2000/XP (loader)" fi + + found=true fi +fi + # MS-DOS -elif item_in_dir -q dos "$2" && +if [ -z "$found" ] && item_in_dir -q dos "$2" && [ -d "$2"/"$(item_in_dir dos "$2")" ]; then long="MS-DOS 5.x/6.x/Win3.1" short=MS-DOS + + found=true +fi + # 95/98/Me -elif item_in_dir -q windows "$2" && +if [ -z "$found" ] && item_in_dir -q windows "$2" && item_in_dir -q win.com "$2"/"$(item_in_dir windows "$2")"; then long="Windows 95/98/Me" short=Windows9xMe -else + + found=true +fi + +if [ -z "$found" ]; then exit 1 fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
