--- ivman-0.6.14.orig/config.guess +++ ivman-0.6.14/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-05-13' +timestamp='2007-03-06' # 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 @@ -139,16 +139,6 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_MACHINE}" in - i?86) - test -z "$VENDOR" && VENDOR=pc - ;; - *) - test -z "$VENDOR" && VENDOR=unknown - ;; -esac -test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -171,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -221,7 +212,7 @@ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -790,7 +781,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -800,12 +791,15 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[345]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -839,7 +833,10 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu @@ -848,16 +845,16 @@ echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-${VENDOR}-linux-gnu + echo frv-unknown-linux-gnu exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; mips:Linux:*:*) eval $set_cc_for_build @@ -880,7 +877,7 @@ s: ::g p }'`" - test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -903,16 +900,16 @@ s: ::g p }'`" - test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-${VENDOR}-linux-gnu + echo or32-unknown-linux-gnu exit ;; ppc:Linux:*:*) - echo powerpc-${VENDOR}-linux-gnu + echo powerpc-unknown-linux-gnu exit ;; ppc64:Linux:*:*) - echo powerpc64-${VENDOR}-linux-gnu + echo powerpc64-unknown-linux-gnu exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -926,36 +923,39 @@ esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;; - PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;; - *) echo hppa-${VENDOR}-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-${VENDOR}-linux-gnu + echo hppa64-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-${VENDOR}-linux-gnu + echo x86_64-unknown-linux-gnu + exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -970,18 +970,18 @@ p'` case "$ld_supported_targets" in elf32-i386) - TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu" + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; a.out-i386-linux) - echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout" + echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; coff-i386) - echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff" + echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. - echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld" + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" exit ;; esac # Determine whether the default compiler is a.out or elf @@ -1015,7 +1015,7 @@ p }'`" test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit } test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } @@ -1215,6 +1215,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; --- ivman-0.6.14.orig/config.sub +++ ivman-0.6.14/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-05-13' +timestamp='2007-01-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -241,16 +241,16 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -276,6 +276,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ + | score \ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ @@ -284,7 +285,7 @@ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -317,13 +318,13 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -367,7 +368,7 @@ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) @@ -909,6 +910,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -920,6 +925,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1214,7 +1222,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1366,6 +1374,9 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; spu-*) os=-elf ;; @@ -1406,6 +1417,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; --- ivman-0.6.14.orig/debian/dirs +++ ivman-0.6.14/debian/dirs @@ -0,0 +1,4 @@ +usr/bin +var/run/ivman +etc/default +etc/X11/Xsession.d \ No newline at end of file --- ivman-0.6.14.orig/debian/docs +++ ivman-0.6.14/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- ivman-0.6.14.orig/debian/control +++ ivman-0.6.14/debian/control @@ -0,0 +1,18 @@ +Source: ivman +Section: utils +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Mike O'Connor +Build-Depends: quilt (>= 0.40), autotools-dev, debhelper (>= 5.0.0), docbook2x, libdbus-glib-1-dev (>= 0.60), libxml2-dev, libhal-dev +Standards-Version: 3.7.2 +Homepage: http://ivman.sourceforge.net/ + +Package: ivman +Architecture: any +Depends: ${shlibs:Depends}, adduser, pmount, hal +Description: daemon to auto-mount and manage media devices + ivman is a daemon that acts as a policy agent on top of HAL. It + listens to HAL events and reacts with user-configurable + actions. Currently it supports automount of new media and hot-plugged + devices, autorun, autoplay for CDs and DVDs, and automatic camera + management. --- ivman-0.6.14.orig/debian/prerm +++ ivman-0.6.14/debian/prerm @@ -0,0 +1,44 @@ +#! /bin/sh +# prerm script for ivman +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|deconfigure) + if [ -x "/etc/init.d/ivman" ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d ivman stop + fi + fi +# End automatically added section + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- ivman-0.6.14.orig/debian/rules +++ ivman-0.6.14/debian/rules @@ -0,0 +1,92 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +include /usr/share/quilt/quilt.make + +CFLAGS = -Wall +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: configure + dh_testdir + CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc + + +build: build-stamp + +build-stamp: $(QUILT_STAMPFN) config.status + dh_testdir + $(MAKE) + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + [ ! -f Makefile ] || $(MAKE) distclean + find -name semantic.cache -exec rm {} \; +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/ivman + install -m 644 debian/ivman.Xsession debian/ivman/etc/X11/Xsession.d/70ivman_launch + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installinit + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- ivman-0.6.14.orig/debian/watch +++ ivman-0.6.14/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/ivman/ivman-([\d.]*)\.tar\.bz2 --- ivman-0.6.14.orig/debian/changelog +++ ivman-0.6.14/debian/changelog @@ -0,0 +1,158 @@ +ivman (0.6.14-3.1ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/init.d: make sure that /var/run/ivman exists. + - debian/control: update Maintainer field as per spec. + + -- Luca Falavigna Mon, 05 May 2008 17:03:40 +0200 + +ivman (0.6.14-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Fixed dependency information in LSB header in init.d script + (Closes: #471096) + + -- Peter Eisentraut Sat, 05 Apr 2008 15:13:45 +0200 + +ivman (0.6.14-3ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/init.d: make sure that /var/run/ivman exists + - debian/control: update Maintainer field as per spec + + -- Luca Falavigna Wed, 21 Nov 2007 18:56:07 +0000 + +ivman (0.6.14-3) unstable; urgency=low + + * fix for non-existant-cdrom (Closes: #425887) + - Thanks Simon Effenberg + * added watch file + * added Homepage: field to control file + + -- Mike O'Connor Wed, 14 Nov 2007 06:11:44 -0500 + +ivman (0.6.14-2ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + * Modify Maintainer value to match Debian-Maintainer-Field Spec + * debian/init.d: make sure that /var/run/ivman exists + + -- Andrea Veri Sun, 6 May 2007 22:52:51 +0200 + +ivman (0.6.14-2) unstable; urgency=low + + * Added /etc/default/ivman enabling the user to disable the daemon (Closes: + 400913) + * Fixed bug where if checkOnInit is enabled, the checks are run before ivman + drops privileges + + -- Mike O'Connor Fri, 27 Apr 2007 17:11:19 -0400 + +ivman (0.6.14-1) experimental; urgency=low + + * New upstream release + * Switched packging to using quilt + + -- Mike O'Connor Wed, 7 Mar 2007 02:56:41 -0500 + +ivman (0.6.12-5ubuntu1) feisty; urgency=low + + * Merge with Debian unstable keeping: + - debian/init.d:make sure that /var/run/ivman exists + + -- Joseph Jackson IV Tue, 19 Dec 2006 16:57:29 -0500 + +ivman (0.6.12-5) unstable; urgency=low + + * fix prerm for 3.7.2 policy compliance + * add LSB header to init.d script + * turn off configOnInit in default config + + -- Mike O'Connor Sat, 7 Oct 2006 22:17:39 -0400 + +ivman (0.6.12-4) unstable; urgency=low + + * stopped ignoring warning when invoke-rc.d failes in prerm + + -- Mike O'Connor Mon, 24 Jul 2006 10:36:58 -0400 + +ivman (0.6.12-3ubuntu2) edgy; urgency=low + + * Rebuild against dbus 0.90 + + -- Sebastian Dröge Wed, 30 Aug 2006 22:03:58 +0200 + +ivman (0.6.12-3ubuntu1) edgy; urgency=low + + * Merge with debian unstable + * debian/init.d: make sure that /var/run/ivman exists + + -- Gauvain Pocentek Wed, 26 Jul 2006 06:53:14 -0400 + +ivman (0.6.12-3) unstable; urgency=high + + * re-libtoolize to fix build-dep on zlib1g-dev (Closes: #379389) + + -- stew Mon, 24 Jul 2006 10:22:49 -0400 + +ivman (0.6.12-2) unstable; urgency=low + + * altered ivman-launch adding support for Xsession.d (Closes: 366228) + * got rid of bashisms in manager.c (Closes: 366240) + + -- Mike O'Connor Wed, 10 May 2006 05:05:37 -0400 + +ivman (0.6.12-1) unstable; urgency=low + + * new upstream release + * fixed error in initscript stopping ivman when it wasn't started + + -- Mike O'Connor Wed, 10 May 2006 04:58:56 -0400 + +ivman (0.6.10-1) unstable; urgency=low + + * Initial release (Closes: #292841) + + -- Mike O'Connor Mon, 13 Mar 2006 10:22:45 -0500 + +ivman (0.6.10-0ubuntu1) dapper; urgency=low + + * New upstream release + * Fix malone bug (#32623) + * Upstream added GPL-2, fix debian copyright too + + -- Daniele Favara Wed, 5 Apr 2006 20:15:45 +0200 + +ivman (0.6.8-0ubuntu1) dapper; urgency=low + + * New upstream release + + -- Jani Monoses Wed, 18 Jan 2006 11:44:19 +0200 + +ivman (0.6.7-0ubuntu1) dapper; urgency=low + + * New upstream version + * Drop Kubuntu patches, this is part of Xubuntu now. + + -- Jani Monoses Thu, 22 Dec 2005 16:11:44 +0200 + +ivman (0.6.3-0ubuntu3) dapper; urgency=low + + * rebuild against latest dbus, updated the dependencies + + -- Michael Vogt Tue, 20 Dec 2005 21:29:53 +0100 + +ivman (0.6.3-0ubuntu2) breezy; urgency=low + + * Add pmount and hal to Depends + * Bump Standards-Version to 3.6.2 + * Sponsored upload for Jani Monoses + + -- Jonathan Riddell Mon, 10 Oct 2005 23:25:22 +0100 + +ivman (0.6.3-0ubuntu1) breezy; urgency=low + + * Initial release + + -- Jonathan Riddell Tue, 14 Jun 2005 17:48:26 +0000 + --- ivman-0.6.14.orig/debian/postinst +++ ivman-0.6.14/debian/postinst @@ -0,0 +1,51 @@ +#! /bin/sh +# postinst script for ivman +# +# see: dh_installdeb(1) + +USER=ivman +GROUP=plugdev + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# + +case "$1" in + + configure) + if [ -z "$(getent passwd $USER)" ]; then + echo Creating a user \'$USER\'... + adduser --quiet --system --home /var/run/ivman \ + --disabled-password --ingroup $GROUP $USER + fi + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- ivman-0.6.14.orig/debian/compat +++ ivman-0.6.14/debian/compat @@ -0,0 +1 @@ +5 --- ivman-0.6.14.orig/debian/ivman.Xsession +++ ivman-0.6.14/debian/ivman.Xsession @@ -0,0 +1,16 @@ +# In order to activate the ivman volume manager at X session launch +# simply place use-session-ivman into your /etc/X11/Xsession.options file +# + +STARTIVMAN= +IVMANLAUNCH=/usr/bin/ivman-launch + +if grep -qs ^use-session-ivman "$OPTIONFILE"; then + if [ -x "$IVMANLAUNCH" ]; then + STARTIVMAN=yes + fi +fi + +if [ -n "$STARTIVMAN" ]; then + STARTUP="$IVMANLAUNCH $STARTUP" +fi --- ivman-0.6.14.orig/debian/init.d +++ ivman-0.6.14/debian/init.d @@ -0,0 +1,76 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: ivman +# Required-Start: $remote_fs +# Required-Stop: $remote_fs +# Should-Start: dbus +# Should-Stop: dbus +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: start the ivman daemon +### END INIT INFO + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/bin/ivman +NAME=ivman +DESC=ivman +PIDFILE=/var/run/ivman/ivman.pid + +test -x $DAEMON || exit 0 + + +START_DAEMON=yes + +# Include ivman defaults if available +if [ -f /etc/default/ivman ] ; then + . /etc/default/ivman +fi + +# Make sure that /var/run/ivman exists +[ ! -d /var/run/ivman ] && mkdir /var/run/ivman + +set -e + +case "$1" in + start) + echo -n "Starting $DESC: " + + # dont start if START_DAEMON was overridden in /etc/default/ivman + if [ "$START_DAEMON" != "yes" ]; then + exit 0 + fi + + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE \ + --exec $DAEMON + echo "$NAME." + ;; + restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon --stop --quiet --pidfile \ + $PIDFILE --exec $DAEMON + + # dont start if START_DAEMON was overridden in /etc/default/ivman + if [ "$START_DAEMON" != "yes" ]; then + exit 0 + fi + + sleep 1 + start-stop-daemon --start --quiet --pidfile \ + $PIDFILE --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 --- ivman-0.6.14.orig/debian/README.Debian +++ ivman-0.6.14/debian/README.Debian @@ -0,0 +1,22 @@ +ivman for Debian +---------------- + +ivman can be run both as a system-wide daemon, or by an individual +user. When run as a daemon, it will use the configuration in +/etc/ivman. Whn ivman is run as a user, the configuration will be read +from ~/.ivman. The first time ivman is run by a user, if no ~/.ivman +exists, one will be created with a default config. + +By default, ivman is run as the user ivman from an init script. You +can additionally run ivman as a user by running ivman-launch(8). You +can run ivman-launch as part of Xsession by adding "use-session-ivman" +to /etc/X11/Xsession.options + +If you want ivman to automount volumes (such as partitions on usb +drives), the user running ivman must be in the plugdev group, and +there must be a hal policy allowing the volume or storage device to be +mounted. I recommend creating a putting a file in /etc/hal/fdi/policy +and adding local policy there. I have included a sample in +/usr/share/doc/ivman/examples/mountpolicies.fdi + + -- Mike O'Connor , Mon, 13 Mar 2006 10:22:45 -0500 --- ivman-0.6.14.orig/debian/postrm +++ ivman-0.6.14/debian/postrm @@ -0,0 +1,40 @@ +#! /bin/sh +# postrm script for ivman +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge) + rm -rf /var/run/ivman + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- ivman-0.6.14.orig/debian/patches/checkOnInit.diff +++ ivman-0.6.14/debian/patches/checkOnInit.diff @@ -0,0 +1,13 @@ +Index: ivman-0.6.14/src/userconfigs.h +=================================================================== +--- ivman-0.6.14.orig/src/userconfigs.h 2007-03-07 03:48:18.000000000 -0500 ++++ ivman-0.6.14/src/userconfigs.h 2007-03-07 03:48:38.000000000 -0500 +@@ -7,7 +7,7 @@ + \n\ + \n\ + \n\ +- \n\ ++ \n\ + \n\ + \n\ + \n\ --- ivman-0.6.14.orig/debian/patches/drop-privs-before-checkOnInit +++ ivman-0.6.14/debian/patches/drop-privs-before-checkOnInit @@ -0,0 +1,45 @@ +Index: ivman-0.6.14/src/manager.c +=================================================================== +--- ivman-0.6.14.orig/src/manager.c 2007-04-27 16:52:01.000000000 -0400 ++++ ivman-0.6.14/src/manager.c 2007-04-27 16:54:27.000000000 -0400 +@@ -1222,7 +1222,15 @@ + (GDestroyNotify) hal_free_property_set); + #endif + +- // Now try to watch all properties, if necessary. ++ ivm_check_dbus_error(&dbus_error); ++} ++ ++void maybeCheckOnInit() ++{ ++ DBusError dbus_error; ++ dbus_error_init(&dbus_error); ++ ++ // Try to watch all properties, if necessary. + char * propfile = ivm_get_config_file("IvmConfigProperties.xml"); + IvmConfigProperties *prop_cfg = + parseIvmConfigProperties(propfile, NULL, NULL); +@@ -1292,12 +1300,8 @@ + + free(actionfile); + free(propfile); +- +- ivm_check_dbus_error(&dbus_error); + } + +- +- + /** + * Parse command-line options. + */ +@@ -1476,6 +1480,10 @@ + return 1; + } + ++ // if checkOnInit was specified in IvmConfigActions or IvmConfigProperties ++ // check every device ++ maybeCheckOnInit(); ++ + loop = g_main_loop_new(NULL, FALSE); + if ( !loop ) { + DEBUG( _("Error creating main loop!\n") ); --- ivman-0.6.14.orig/debian/patches/fix-mountpoint-loop.diff +++ ivman-0.6.14/debian/patches/fix-mountpoint-loop.diff @@ -0,0 +1,27 @@ +Index: ivman-0.6.14/src/manager.c +=================================================================== +--- ivman-0.6.14.orig/src/manager.c 2007-03-07 04:01:36.000000000 -0500 ++++ ivman-0.6.14/src/manager.c 2007-03-07 04:03:07.000000000 -0500 +@@ -1042,19 +1042,19 @@ + "volume.mount_point", + NULL); + +- while (( !mount_point || (strlen(mount_point) < 2) ) ++ while (( !mount_point || (strlen(mount_point) < 1) ) + && (i < 5)) + { + sleep(1); + mount_point = (char *) + libhal_device_get_property_string(hal_ctx, udi, +- " volume.mount_point ", ++ "volume.mount_point", + NULL); + i++; + } + + +- if ( !mount_point || strlen(mount_point) < 2) ++ if ( !mount_point || strlen(mount_point) < 1) + { + DEBUG(_("Couldn't get mount point of device %s after " + "5 seconds\n"), device); --- ivman-0.6.14.orig/debian/patches/less-verbose.diff +++ ivman-0.6.14/debian/patches/less-verbose.diff @@ -0,0 +1,13 @@ +Index: ivman-0.6.14/src/IvmConfig/IvmConfigBase.xml +=================================================================== +--- ivman-0.6.14.orig/src/IvmConfig/IvmConfigBase.xml 2007-03-07 03:56:19.000000000 -0500 ++++ ivman-0.6.14/src/IvmConfig/IvmConfigBase.xml 2007-03-07 03:56:26.000000000 -0500 +@@ -7,7 +7,7 @@ + + +- ++ + + --- ivman-0.6.14.orig/debian/patches/series +++ ivman-0.6.14/debian/patches/series @@ -0,0 +1,6 @@ +pidfile.diff +less-verbose.diff +checkOnInit.diff +fix-mountpoint-loop.diff +drop-privs-before-checkOnInit +fix-nonexisting-cdrom.diff --- ivman-0.6.14.orig/debian/patches/fix-nonexisting-cdrom.diff +++ ivman-0.6.14/debian/patches/fix-nonexisting-cdrom.diff @@ -0,0 +1,13 @@ +Index: ivman-0.6.14/src/manager.c +=================================================================== +--- ivman-0.6.14.orig/src/manager.c 2007-05-28 10:30:10.000000000 +0200 ++++ ivman-0.6.14/src/manager.c 2007-05-28 10:31:29.000000000 +0200 +@@ -1411,7 +1411,9 @@ + } + + // Permanently unlock CD / DVD drive +- if ( geteuid() == 0 ) ++ // Silently ignore not existing CD / DVD drive ++ struct stat statistic; ++ if ( geteuid() == 0 && stat("/proc/sys/dev/cdrom/lock",&statistic) == 0 ) + ivm_run_command( "echo 0 > /proc/sys/dev/cdrom/lock", NULL, FALSE ); --- ivman-0.6.14.orig/debian/patches/pidfile.diff +++ ivman-0.6.14/debian/patches/pidfile.diff @@ -0,0 +1,13 @@ +Index: ivman-0.6.14/src/IvmConfig/IvmConfigBase.xml +=================================================================== +--- ivman-0.6.14.orig/src/IvmConfig/IvmConfigBase.xml 2007-03-07 03:54:03.000000000 -0500 ++++ ivman-0.6.14/src/IvmConfig/IvmConfigBase.xml 2007-03-07 03:55:33.000000000 -0500 +@@ -17,7 +17,7 @@ + + +- ++ + + --- ivman-0.6.14.orig/debian/copyright +++ ivman-0.6.14/debian/copyright @@ -0,0 +1,118 @@ +This package was debianized by stew > on +Mon, 13 Mar 2006 10:22:45 -0500. + +It was downloaded from http://ivman.sourceforge.net/ + +Copyright Holders: + +Copyright (C) 2004 Ikke - http://www.eikke.com - Nicolas Trangez , +Rohan McGovern +Bruno Haible , 2000-2003. +Copyright 1995-1997, 2000-2005 Ulrich Drepper + +License: + +This software is distributable under the terms of either: + - The GNU General Public License version 2, see /usr/share/common-licenses/GPL-2 + - The Q Public License: + + THE Q PUBLIC LICENSE + version 1.0 + + Copyright (C) 1999 Troll Tech AS, Norway. + Everyone is permitted to copy and + distribute this license document. + +The intent of this license is to establish freedom to share and change the +software regulated by this license under the open source model. + +This license applies to any software containing a notice placed by the +copyright holder saying that it may be distributed under the terms of +the Q Public License version 1.0. Such software is herein referred to as +the Software. This license covers modification and distribution of the +Software, use of third-party application programs based on the Software, +and development of free software which uses the Software. + + Granted Rights + +1. You are granted the non-exclusive rights set forth in this license + provided you agree to and comply with any and all conditions in this + license. Whole or partial distribution of the Software, or software + items that link with the Software, in any form signifies acceptance of + this license. + +2. You may copy and distribute the Software in unmodified form provided + that the entire package, including - but not restricted to - copyright, + trademark notices and disclaimers, as released by the initial developer + of the Software, is distributed. + +3. You may make modifications to the Software and distribute your + modifications, in a form that is separate from the Software, such as + patches. The following restrictions apply to modifications: + + a. Modifications must not alter or remove any copyright notices in + the Software. + + b. When modifications to the Software are released under this + license, a non-exclusive royalty-free right is granted to the + initial developer of the Software to distribute your modification + in future versions of the Software provided such versions remain + available under these terms in addition to any other license(s) of + the initial developer. + +4. You may distribute machine-executable forms of the Software or + machine-executable forms of modified versions of the Software, provided + that you meet these restrictions: + + a. You must include this license document in the distribution. + + b. You must ensure that all recipients of the machine-executable forms + are also able to receive the complete machine-readable source code + to the distributed Software, including all modifications, without + any charge beyond the costs of data transfer, and place prominent + notices in the distribution explaining this. + + c. You must ensure that all modifications included in the + machine-executable forms are available under the terms of this + license. + +5. You may use the original or modified versions of the Software to + compile, link and run application programs legally developed by you + or by others. + +6. You may develop application programs, reusable components and other + software items that link with the original or modified versions of the + Software. These items, when distributed, are subject to the following + requirements: + + a. You must ensure that all recipients of machine-executable forms of + these items are also able to receive and use the complete + machine-readable source code to the items without any charge + beyond the costs of data transfer. + + b. You must explicitly license all recipients of your items to use + and re-distribute original and modified versions of the items in + both machine-executable and source code forms. The recipients must + be able to do so without any charges whatsoever, and they must be + able to re-distribute to anyone they choose. + + + c. If the items are not available to the general public, and the + initial developer of the Software requests a copy of the items, + then you must supply one. + + Limitations of Liability + +In no event shall the initial developers or copyright holders be liable +for any damages whatsoever, including - but not restricted to - lost +revenue or profits or other direct, indirect, special, incidental or +consequential damages, even if they have been advised of the possibility +of such damages, except to the extent invariable law, if any, provides +otherwise. + + No Warranty + +The Software and this license document are provided AS IS with NO WARRANTY +OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE. + --- ivman-0.6.14.orig/debian/examples +++ ivman-0.6.14/debian/examples @@ -0,0 +1 @@ +debian/mountpolicies.fdi --- ivman-0.6.14.orig/debian/mountpolicies.fdi +++ ivman-0.6.14/debian/mountpolicies.fdi @@ -0,0 +1,26 @@ + + + + + + + + + true + + + true + + + true + + + true + + + true + + + + + --- ivman-0.6.14.orig/debian/ivman.default +++ ivman-0.6.14/debian/ivman.default @@ -0,0 +1,4 @@ +# Default settings for ivman + +START_DAEMON=yes +VERBOSE=no \ No newline at end of file