diff -pruN 2.0.4-1/config.guess 2.0.4-1ubuntu1/config.guess --- 2.0.4-1/config.guess 2009-07-27 11:23:05.000000000 +0100 +++ 2.0.4-1ubuntu1/config.guess 2009-07-27 11:20:32.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2009-06-10' +timestamp='2009-04-27' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ELF__ + | grep __ELF__ >/dev/null then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -656,7 +656,7 @@ EOF # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ + grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -822,9 +822,6 @@ EOF [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -885,17 +882,40 @@ EOF m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:* | mips64:Linux:*:*) + mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el + #undef mips + #undef mipsel #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el + CPU=mipsel #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 #else CPU= #endif @@ -927,7 +947,7 @@ EOF EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac - objdump --private-headers /bin/sh | grep -q ld.so.1 + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; @@ -981,6 +1001,14 @@ EOF elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -1046,7 +1074,7 @@ EOF i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1154,7 +1182,7 @@ EOF rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) diff -pruN 2.0.4-1/config.sub 2.0.4-1ubuntu1/config.sub --- 2.0.4-1/config.sub 2009-07-27 11:23:05.000000000 +0100 +++ 2.0.4-1ubuntu1/config.sub 2009-07-27 11:20:32.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2009-06-11' +timestamp='2009-04-17' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -153,9 +153,6 @@ case $os in os= basic_machine=$1 ;; - -bluegene*) - os=-cnk - ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -470,10 +467,6 @@ case $basic_machine in basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; - bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; c90) basic_machine=c90-cray os=-unicos @@ -1267,7 +1260,7 @@ case $os in # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ @@ -1620,7 +1613,7 @@ case $basic_machine in -sunos*) vendor=sun ;; - -cnk*|-aix*) + -aix*) vendor=ibm ;; -beos*) diff -pruN 2.0.4-1/debian/changelog 2.0.4-1ubuntu1/debian/changelog --- 2.0.4-1/debian/changelog 2009-07-27 11:23:05.000000000 +0100 +++ 2.0.4-1ubuntu1/debian/changelog 2009-07-27 11:20:32.000000000 +0100 @@ -1,3 +1,11 @@ +libraw1394 (2.0.4-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #404802 + - debian/README.Debian: Corrected file to use sudo instead of running + as root + + -- Bhavani Shankar Sun, 26 Jul 2009 13:37:53 +0530 + libraw1394 (2.0.4-1) unstable; urgency=low * New upstream release. Closes: #535826 @@ -6,6 +14,14 @@ libraw1394 (2.0.4-1) unstable; urgency=l -- Guus Sliepen Sat, 25 Jul 2009 17:16:11 +0200 +libraw1394 (2.0.2-2ubuntu1) karmic; urgency=low + + * Merge from Debian unstable (LP: #311804), remaining changes: + - debian/README.Debian: Corrected file to use sudo instead of running + as root + + -- Артём Попов Mon, 04 May 2009 10:12:18 +0700 + libraw1394 (2.0.2-2) unstable; urgency=low * Upload to unstable. @@ -19,6 +35,13 @@ libraw1394 (2.0.2-1) experimental; urgen -- Guus Sliepen Sun, 20 Jul 2008 19:52:07 +0200 +libraw1394 (1.3.0-4ubuntu1) jaunty; urgency=low + + * debian/README.Debian: Corrected file to use sudo instead of running as + root (LP: #183813) + + -- Michael W. Koehler Thu, 07 Feb 2008 16:22:50 -0500 + libraw1394 (1.3.0-4) unstable; urgency=low * Drop dependency on makedev and use /dev/MAKEDEV if available. diff -pruN 2.0.4-1/debian/control 2.0.4-1ubuntu1/debian/control --- 2.0.4-1/debian/control 2009-07-27 11:23:05.000000000 +0100 +++ 2.0.4-1ubuntu1/debian/control 2009-07-27 11:20:32.000000000 +0100 @@ -1,6 +1,7 @@ Source: libraw1394 Priority: optional -Maintainer: Guus Sliepen +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Guus Sliepen Build-Depends: debhelper (>= 7), autotools-dev, docbook-utils Standards-Version: 3.8.2 Section: libs diff -pruN 2.0.4-1/debian/README.Debian 2.0.4-1ubuntu1/debian/README.Debian --- 2.0.4-1/debian/README.Debian 2009-07-27 11:23:05.000000000 +0100 +++ 2.0.4-1ubuntu1/debian/README.Debian 2009-07-27 11:20:32.000000000 +0100 @@ -20,14 +20,14 @@ is used by applications to access FireWi The default access permissions allows only users in the "disk" group. This restrictive setting was chosen since raw1394 allows almost full access to the FireWire bus and all connected devices are accessible, which -may include hard disks. -You can add your user in the "disk" group with this command (executed as the root user): - adduser disk +may include hard disks. You can add your user in the "disk" group with this +command: + sudo adduser disk If you don't intend to connect sensitive devices and e.g. only want to get video streams out of a camera, you can relax the permissions. If you don't have malicious users on your system, you can allow access for all -users with this command (executed as the root user): - chmod 666 /dev/raw1394 +users with this command: + sudo chmod 666 /dev/raw1394 -- Ludovic RESLINGER , Sun, 10 Sep 2006 16:08:19 +0200