--- devicekit-disks-007.orig/debian/rules +++ devicekit-disks-007/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +DEB_DH_MAKESHLIBS_ARGS_ALL := -Xusr/lib/polkit-1/ +DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc + --- devicekit-disks-007.orig/debian/devicekit-disks.install +++ devicekit-disks-007/debian/devicekit-disks.install @@ -0,0 +1,11 @@ +etc/dbus-1/ +lib/udev/ +sbin +usr/bin +usr/lib/devicekit-disks/ +usr/lib/polkit-1/extensions/*.so +usr/share/dbus-1/ +usr/share/polkit-1/ +usr/share/locale +usr/share/man +usr/share/pkgconfig --- devicekit-disks-007.orig/debian/changelog +++ devicekit-disks-007/debian/changelog @@ -0,0 +1,51 @@ +devicekit-disks (007-1karmic1) karmic; urgency=low + + * Debian git head snapshot to get the bug fix below. + * debian/rules: Enable quilt patch system. Add quilt build dependency. + * Add mkfs-tempdir.patch: Daemon does not create /var/run/DeviceKit-disks/, + so mkfs jobs fail. Just create the directory in /tmp, this is what /tmp is + for, after all. (See https://bugs.freedesktop.org/show_bug.cgi?id=24265) + + -- Martin Pitt Mon, 05 Oct 2009 10:32:15 +0200 + +devicekit-disks (007-1) unstable; urgency=low + + * New upstream release: + - Drop usage of DeviceKit, talk directly to udev now. + - Port to PolicyKit 1 API. + - Lots of bug fixes. + * debian/control: + - libpolkit-dbus-dev → libpolkit-gobject-1-dev, libpolkit-backend-1-dev + build dependency. (PolicyKit 1 API) + - libdevkit-gobject-dev → libgudev-1.0-dev build dependency, drop + devicekit dependency (death to DeviceKit). + - Bump libatasmart-dev build dependency to >= 0.14 as required by + upstream. + - Bump libudev-dev build dependency to >= 0.142 as required by upstream. + - Drop libsqlite3-dev build-dependency, not necessary any more. + - Add libsgutils2-dev build dependency as required by upstream. + * debian/devicekit-disks.install: + - Update path for new policykit-1 files. + - Add new pkgconfig file. + - Install usr/share/locale and usr/share/man. + * debian/rules: Ignore usr/lib/polkit-1/ for dh_makeshlibs, they are backends + for PolicyKit. + * debian/rules: Explicitly enable gtk-doc, not done by default any more. + * debian/control: Bump Standards-Version to 3.8.3 (no changes necessary). + * Add debian/devicekit-disks.postinst: Kill the old devkit-disks-daemon on + upgrade, to ensure that the new version will be used at the next occasion. + (LP: #403192) + * debian/control: Add Breaks to GDU libraries << 2.28, since the D-Bus API + changed. + * debian/*.install: Drop debian/tmp/ prefix, since we use dh compat 7. + Also, simplify and sort the file lists. + * Drop reduntant debian/devicekit-disks.manpages, already done in *.install. + * debian/control: Add myself to Uploaders: with Michael's consent. + + -- Martin Pitt Mon, 28 Sep 2009 16:58:46 +0200 + +devicekit-disks (004-1) experimental; urgency=low + + * Initial release. (Closes: #521364) + + -- Michael Biebl Tue, 19 May 2009 04:08:00 +0200 --- devicekit-disks-007.orig/debian/devicekit-disks.dirs +++ devicekit-disks-007/debian/devicekit-disks.dirs @@ -0,0 +1 @@ +/var/lib/DeviceKit-disks --- devicekit-disks-007.orig/debian/watch +++ devicekit-disks-007/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://hal.freedesktop.org/releases/DeviceKit-disks-(\d+)\.tar\.gz --- devicekit-disks-007.orig/debian/copyright +++ devicekit-disks-007/debian/copyright @@ -0,0 +1,26 @@ +Name: DeviceKit-disks +Maintainer: David Zeuthen +Source: http://hal.freedesktop.org/releases/ + +Files: * +Copyright: 2008 David Zeuthen +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; either version 2 of the License, or + (at your option) any later version. + . + The full text of the GPL is distributed as in + /usr/share/common-licenses/GPL-2 on Debian systems. + +Files: doc/* +Copyright: 2008 David Zeuthen +License: GFDL-1.1+ + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation + License (GFDL), Version 1.1 or any later version published + by the Free Software Foundation with no Invariant Sections, + no Front-Cover Texts, and no Back-Cover Texts. + . + The full text of the GFDL is distributed as in + /usr/share/common-licenses/GFDL on Debian systems. --- devicekit-disks-007.orig/debian/compat +++ devicekit-disks-007/debian/compat @@ -0,0 +1 @@ +7 --- devicekit-disks-007.orig/debian/devicekit-disks-doc.install +++ devicekit-disks-007/debian/devicekit-disks-doc.install @@ -0,0 +1 @@ +usr/share/gtk-doc/ --- devicekit-disks-007.orig/debian/devicekit-disks.postinst +++ devicekit-disks-007/debian/devicekit-disks.postinst @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "$1" = "configure" ]; then + kill `pidof /usr/lib/devicekit-disks/devkit-disks-daemon` 2>/dev/null || true +fi + +#DEBHELPER# --- devicekit-disks-007.orig/debian/control +++ devicekit-disks-007/debian/control @@ -0,0 +1,53 @@ +Source: devicekit-disks +Section: admin +Priority: optional +Maintainer: Utopia Maintenance Team +Uploaders: Michael Biebl , Martin Pitt +Build-Depends: debhelper (>= 7), + cdbs, + autotools-dev, + pkg-config, + quilt, + xsltproc, + gtk-doc-tools, + intltool (>= 0.40.0), + libdbus-glib-1-dev (>= 0.74-4), + libdbus-1-dev (>= 1.0), + libglib2.0-dev (>= 2.15), + libgudev-1.0-dev, + libpolkit-gobject-1-dev (>= 0.92), + libpolkit-backend-1-dev (>= 0.92), + libparted1.8-dev (>= 1.8.8), + libdevmapper-dev (>= 2:1.02), + libatasmart-dev (>= 0.14), + libsgutils2-dev, + zlib1g-dev, + libudev-dev (>= 0.142), + uuid-dev, + libselinux-dev +Standards-Version: 3.8.3 +Vcs-Git: git://git.debian.org/git/pkg-utopia/devicekit-disks.git +Vcs-Browser: http://git.debian.org/?p=pkg-utopia/devicekit-disks.git;a=summary +Homepage: http://hal.freedesktop.org/docs/DeviceKit-disks + +Package: devicekit-disks +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: libgdu0 (<< 2.28), libgdu-gtk0 (<< 2.28) +Description: abstraction for enumerating block devices + DeviceKit-disks is an abstraction for enumerating block devices and performing + operations on them. Any application can access the + org.freedesktop.DeviceKit.Disks service on the system message bus. + Some operations (such as formatting disks etc.) are restricted using PolicyKit. + +Package: devicekit-disks-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: devhelp +Description: abstraction for enumerating block devices - documentation + DeviceKit-disks is an abstraction for enumerating block devices and performing + operations on them. Any application can access the + org.freedesktop.DeviceKit.Disks service on the system message bus. + Some operations (such as formatting disks etc.) are restricted using PolicyKit. + --- devicekit-disks-007.orig/debian/patches/series +++ devicekit-disks-007/debian/patches/series @@ -0,0 +1 @@ +mkfs-tempdir.patch --- devicekit-disks-007.orig/debian/patches/mkfs-tempdir.patch +++ devicekit-disks-007/debian/patches/mkfs-tempdir.patch @@ -0,0 +1,16 @@ +# Description: Daemon does not create /var/run/DeviceKit-disks/, so mkfs jobs fail. Just create the directory in /tmp, this is what /tmp is for, after all. +# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=24265 + +Index: devicekit-disks/src/job-mkfs.c +=================================================================== +--- devicekit-disks.orig/src/job-mkfs.c 2009-10-05 10:12:00.000000000 +0200 ++++ devicekit-disks/src/job-mkfs.c 2009-10-05 10:13:45.000000000 +0200 +@@ -304,7 +304,7 @@ + + /* take ownership of the device if requested */ + if (take_ownership_uid != 0 || take_ownership_gid != 0) { +- char dir[256] = PACKAGE_LOCALSTATE_DIR "/run/DeviceKit-disks/job-mkfs-XXXXXX"; ++ char dir[256] = "/tmp/job-mkfs-XXXXXX"; + + if (mkdtemp (dir) == NULL) { + g_printerr ("cannot create directory %s: %m\n", dir);