--- nautilus-cd-burner-2.25.3.orig/debian/copyright +++ nautilus-cd-burner-2.25.3/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Ross Burton on +Tue, 18 Feb 2003 13:26:42 +0000. + +It was downloaded from ftp://ftp.gnome.org/ + +Upstream Author and Copyright Holder: Alexander Larsson + +License: + + 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; version 2 dated June, 1991. + + This package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- nautilus-cd-burner-2.25.3.orig/debian/control.in +++ nautilus-cd-burner-2.25.3/debian/control.in @@ -0,0 +1,62 @@ +Source: nautilus-cd-burner +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Ross Burton +Build-Depends: debhelper (>= 4.1.87), + cdbs (>= 0.4.41), + gnome-pkg-tools (>= 0.10), + intltool (>= 0.35.0), + autotools-dev, + gtk-doc-tools (>=1.8), + libbonobo2-dev (>= 2.16), + libnautilus-extension-dev (>= 1:2.22.2), + libgnomeui-dev (>= 2.16.0-2), + libhal-dev (>= 0.5.7) [!kfreebsd-i386 !kfreebsd-amd64], + libcam-dev [kfreebsd-i386 kfreebsd-amd64], + libgtk2.0-dev (>= 2.6.0), + libdbus-glib-1-dev (>= 0.60), + libglib2.0-dev (>= 2.17.4), + libglade2-dev, + dpkg-dev (>= 1.13.19) +Uploaders: @GNOME_TEAM@ +Standards-Version: 3.7.2 + +Package: nautilus-cd-burner +Architecture: any +Depends: ${shlibs:Depends}, + genisoimage, + wodim, + ${misc:Depends}, + cdrdao, + nautilus, + dvd+rw-tools +Description: CD Burning front-end for Nautilus + Lets you burn CDs and DVDs easily with GNOME, by drag-and-dropping files in the + GNOME file manager. + +Package: libnautilus-burn4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Recommends: gnome-mount (>= 0.4) +Description: Nautilus Burn Library - runtime version + Lets you burn CDs and DVDs easily with GNOME, by drag-and-dropping files in the + GNOME file manager. + . + This package contains the shared library. + +Package: libnautilus-burn-dev +Architecture: any +Depends: libnautilus-burn4 (= ${binary:Version}), + libnautilus-extension-dev, + libeel2-dev, + ${libhal-dev}, + libdbus-glib-1-dev (>= 0.60), + ${misc:Depends} +Description: Nautilus Burn Library - development version + Lets you burn CDs and DVDs easily with GNOME, by drag-and-dropping files in the + GNOME file manager. + . + This package contains the development headers. --- nautilus-cd-burner-2.25.3.orig/debian/nautilus-cd-burner.install +++ nautilus-cd-burner-2.25.3/debian/nautilus-cd-burner.install @@ -0,0 +1,5 @@ +debian/tmp/etc +debian/tmp/usr/bin +debian/tmp/usr/share +debian/tmp/usr/lib/nautilus/extensions-2.0 +src/.libs/list_cddrives usr/lib/nautilus-cd-burner --- nautilus-cd-burner-2.25.3.orig/debian/libnautilus-burn-dev.install +++ nautilus-cd-burner-2.25.3/debian/libnautilus-burn-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/*.so +debian/tmp/usr/include +debian/tmp/usr/lib/pkgconfig --- nautilus-cd-burner-2.25.3.orig/debian/libnautilus-burn4.install +++ nautilus-cd-burner-2.25.3/debian/libnautilus-burn4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/*.so.* --- nautilus-cd-burner-2.25.3.orig/debian/watch +++ nautilus-cd-burner-2.25.3/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/nautilus-cd-burner/([\d\.]+)[02468]/ \ + nautilus-cd-burner-(.*)\.tar\.gz \ + debian uupdate --- nautilus-cd-burner-2.25.3.orig/debian/rules +++ nautilus-cd-burner-2.25.3/debian/rules @@ -0,0 +1,28 @@ +#! /usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + +DEB_CONFIGURE_EXTRA_FLAGS += --enable-gnome-mount + +binary-post-install/nautilus-cd-burner:: + find debian/nautilus-cd-burner/usr/lib -name \*.la -exec rm {} \; + +binary-predeb/libnautilus-burn-dev:: +ifeq (linux,$(DEB_HOST_ARCH_OS)) + echo "libhal-dev=libhal-dev (>= 0.5.7)" >> debian/libnautilus-burn-dev.substvars +else +ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) + echo "libhal-dev=libcam-dev" >> debian/libnautilus-burn-dev.substvars +endif +endif + +clean:: + rm -f intltool-update intltool-merge intltool-extract --- nautilus-cd-burner-2.25.3.orig/debian/control +++ nautilus-cd-burner-2.25.3/debian/control @@ -0,0 +1,62 @@ +Source: nautilus-cd-burner +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Ross Burton +Build-Depends: debhelper (>= 4.1.87), + cdbs (>= 0.4.41), + gnome-pkg-tools (>= 0.10), + intltool (>= 0.35.0), + autotools-dev, + gtk-doc-tools (>=1.8), + libbonobo2-dev (>= 2.16), + libnautilus-extension-dev (>= 1:2.22.2), + libgnomeui-dev (>= 2.16.0-2), + libhal-dev (>= 0.5.7) [!kfreebsd-i386 !kfreebsd-amd64], + libcam-dev [kfreebsd-i386 kfreebsd-amd64], + libgtk2.0-dev (>= 2.6.0), + libdbus-glib-1-dev (>= 0.60), + libglib2.0-dev (>= 2.17.4), + libglade2-dev, + dpkg-dev (>= 1.13.19) +Uploaders: Debian GNOME Maintainers , Sebastian Dröge +Standards-Version: 3.7.2 + +Package: nautilus-cd-burner +Architecture: any +Depends: ${shlibs:Depends}, + genisoimage, + wodim, + ${misc:Depends}, + cdrdao, + nautilus, + dvd+rw-tools +Description: CD Burning front-end for Nautilus + Lets you burn CDs and DVDs easily with GNOME, by drag-and-dropping files in the + GNOME file manager. + +Package: libnautilus-burn4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Recommends: gnome-mount (>= 0.4) +Description: Nautilus Burn Library - runtime version + Lets you burn CDs and DVDs easily with GNOME, by drag-and-dropping files in the + GNOME file manager. + . + This package contains the shared library. + +Package: libnautilus-burn-dev +Architecture: any +Depends: libnautilus-burn4 (= ${binary:Version}), + libnautilus-extension-dev, + libeel2-dev, + ${libhal-dev}, + libdbus-glib-1-dev (>= 0.60), + ${misc:Depends} +Description: Nautilus Burn Library - development version + Lets you burn CDs and DVDs easily with GNOME, by drag-and-dropping files in the + GNOME file manager. + . + This package contains the development headers. --- nautilus-cd-burner-2.25.3.orig/debian/compat +++ nautilus-cd-burner-2.25.3/debian/compat @@ -0,0 +1 @@ +4 --- nautilus-cd-burner-2.25.3.orig/debian/changelog +++ nautilus-cd-burner-2.25.3/debian/changelog @@ -0,0 +1,764 @@ +nautilus-cd-burner (2.25.3-0ubuntu1) jaunty; urgency=low + + * New upstream version (LP: #345168) + - Use GIO to detect whether burn:// contains a Video-DVD + - Remove tenious eel dependency + - Remove unnecessary headings and blank labels in the UI + - Add API documentation + - Remove "CD/DVD creator" from the Places menu, and add it to the + System Tools + - Show the same drives as nautilus in the file chooser, as expected + - Add a hint and icon to the nautilus "clue" bar + - Detect some errors from wodim + - When copying a disc, make the button say "Copy", not "Write" + (LP: #47889) + - Avoid crashes when HAL isn't running + - Make "Enter" trigger the default action + - Fix build with the single GTK+ include + - show "places" in safe-dialogue (LP: #53498) + * debian/control.in + - remove build-depend on libeel2-dev, no longer needed + - update build-depend for libglib2.0-dev to >=2.17.4 + - add build-depend on gtk-doc-tools (>=1.8) + - added depends on ${misc:Depends} for libnautilus-burn-dev and + libnautilus-burn4 (lintian warning) + * debian/patches + - updated 01_enable_gnome_mount_force.patch to apply cleanly + - updated 03_wodim.patch to apply cleanly + - updated 05_genisoimage.patch to apply cleanly + - added 06_fix_warnings_on_build.patch from svn, fixes build-issue + + -- Andreas Moog Thu, 19 Mar 2009 00:43:46 +0100 + +nautilus-cd-burner (2.24.0-0ubuntu1) intrepid; urgency=low + + * New upstream version + + -- Sebastien Bacher Wed, 24 Sep 2008 11:11:04 +0200 + +nautilus-cd-burner (2.23.90-0ubuntu1) intrepid; urgency=low + + * New upstream version: + - Add ability to inhibit the SessionManager + * debian/control.in: + - updated nautilus requirement + * debian/patches/99_ltmain_as-needed.patch: + - new version update + + -- Sebastien Bacher Wed, 20 Aug 2008 21:05:53 +0200 + +nautilus-cd-burner (2.22.1-0ubuntu1) hardy; urgency=low + + * New upstream version: + - Fixed #524467, Right-click menu of DVD writer does not have + "Copy Disk" option (lp: #209080) + * debian/patches/06_dont_do_sync_calls.patch: + - dropped, fixed in the new version + + -- Sebastien Bacher Tue, 08 Apr 2008 09:32:32 +0200 + +nautilus-cd-burner (2.22.0-0ubuntu3) hardy; urgency=low + + * debian/nautilus-cd-burner.preinst: + - remove mapping-modules.conf gnome-vfs conffile on upgrade + + -- Sebastien Bacher Mon, 31 Mar 2008 17:41:42 +0200 + +nautilus-cd-burner (2.22.0-0ubuntu2) hardy; urgency=low + + * debian/patches/06_dont_do_sync_calls.patch: + - don't do sync calls, those are slow and can block nautilus when + the network disconnects, thanks Christian Kellner (lp: #523146) + + -- Sebastien Bacher Wed, 19 Mar 2008 10:01:43 +0100 + +nautilus-cd-burner (2.22.0-0ubuntu1) hardy; urgency=low + + * New upstream version + + -- Sebastien Bacher Tue, 11 Mar 2008 00:47:04 +0100 + +nautilus-cd-burner (2.21.6-0ubuntu1) hardy; urgency=low + + * New upstream version: + - Get HAL udi from GIO for disc copy function. + - Remove some straggling gnome-vfs references. + * debian/control.in: + - updated libglib requirement + + -- Sebastien Bacher Thu, 31 Jan 2008 09:09:53 +0100 + +nautilus-cd-burner (2.21.5-0ubuntu1) hardy; urgency=low + + * New upstream version: + - Inihibit power management while burning + - Add support for creating DVD Video + - Updated CD spin icons + - Add nautilus_burn_drive_can_eject + - Add x-content support + - Initial port to GIO + - Use pkg-config to determine nautilus extension dir + * debian/control.in: + - ubuntu maintainer change + - don't Build-Depends on libgnomevfs + - updated libglib and nautilus requirement + * debian/nautilus-cd-burner.install: + - updated to the new version changes + * debian/patches/02_pmount.patch: + - dropped since gnome-mount is used now + * debian/patches/03_wodim.patch: + - new version update + * debian/patches/04_readom.patch: + - new version update + * debian/patches/05_genisoimage.patch: + - new version update + + -- Sebastien Bacher Tue, 22 Jan 2008 09:16:42 +0000 + +nautilus-cd-burner (2.20.0-1) unstable; urgency=low + + [ Josselin Mouette ] + * 99_ltmain_as-needed.patch: make --as-needed work for libraries too. + + [ Kilian Krause ] + * Use binary:version and source:Version for binnNMU-safe uploads as + added in dpkg-dev 1.13.19. Add to Build-Depends accordingly + + [ Sebastian Dröge ] + * New upstream release, with no API/ABI changes. + * debian/rules, + debian/control.in, + debian/patches/01_enable_gnome_mount_force.patch: + + Build with gnome-mount support. Patch taken from Ubuntu to not + indirectly depend on hal which fails to install in some buildd chroots. + + -- Sebastian Dröge Mon, 24 Sep 2007 20:02:46 +0200 + +nautilus-cd-burner (2.18.2-1) unstable; urgency=low + + [ Loic Minier ] + * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on + cdbs >= 0.4.41. + * Prepend -z defs to LDFLAGS for additional safety. + * Wrap build-deps and deps. + + [ Josselin Mouette ] + * New upstream bugfix and translation release. + + -- Josselin Mouette Sun, 03 Jun 2007 18:53:35 +0200 + +nautilus-cd-burner (2.18.1-1) unstable; urgency=low + + * New upstream release. + * Upload to unstable, drop check-dist include. + * 01_menu_tooltip.patch dropped, this is fixed upstream now. + + -- Sebastian Dröge Wed, 25 Apr 2007 11:35:47 +0200 + +nautilus-cd-burner (2.16.3-1) experimental; urgency=low + + * New upstream release. + + -- Josselin Mouette Sun, 4 Mar 2007 01:12:46 +0100 + +nautilus-cd-burner (2.16.2-4) experimental; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + + -- Loic Minier Sun, 4 Feb 2007 14:43:32 +0100 + +nautilus-cd-burner (2.16.2-3) experimental; urgency=low + + [ Loic Minier ] + * Merge changes of 2.14.3-2 up-to 2.14.3-7; SVN revs 6880:8249. + * Drop patches 04_wodim and 06_readom as these were added in the 2.16 branch + as well. + * Drop patch 05_kfreebsd-gnu; doesn't apply anymore and needs deeper work. + + [ Josselin Mouette ] + * 05_genisoimage.patch: call genisoimage instead of mkisofs + (closes: #405742). + + -- Josselin Mouette Sun, 7 Jan 2007 14:37:04 +0100 + +nautilus-cd-burner (2.16.2-2) experimental; urgency=low + + * 04_readom.patch: call readom instead of readcd (closes: #404839). + + -- Josselin Mouette Thu, 28 Dec 2006 23:07:31 +0100 + +nautilus-cd-burner (2.16.2-1) experimental; urgency=low + + * New upstream release. + + -- Josselin Mouette Sat, 9 Dec 2006 00:03:20 +0100 + +nautilus-cd-burner (2.16.1-1) experimental; urgency=low + + * New upstream release; no API change. + * Reorder build-deps to please pbuilder. + * Bump libgnomeui-dev build-dep to >= 2.16.0-2 for gtk+2.0 >= 2.10. + * Build-depend on libbonobo2-dev >= 2.16. + + -- Loic Minier Thu, 5 Oct 2006 18:08:23 +0200 + +nautilus-cd-burner (2.16.0-1) experimental; urgency=low + + [ Josselin Mouette ] + * New upstream release. + * 01_menu_tooltip.patch, 02_pmount.patch: update for new version. + * 03_incorrectly_encoded_filenames_listed.patch: removed, integrated + upstream. + * 03_wodim.patch: use wodim instead of cdrecord. + * Depend on wodim, not cdrecord. + * Bump build-dependencies appropriately. + * The library is now libnautilus-burn4. + * Remove pre-sarge replaces/conflicts, they are now useless. + * Fix libnautilus-burn-dev dependencies. + * Require gnome-pkg-tools 0.7 and use clean-la.mk. + * nautilus-cd-burner.install: list_cddrives has moved. + * libnautilus-burn-dev.install: there is no static library to install. + * Make dvd+rw-tools a hard dependency. + + [ Loic Minier ] + * The new upstream release above: + - Ships a .desktop file to handle the MIME type. (Closes: #199495) + - Checks for the charset of pathnames. (Closes: #291385) + - Displays progress dialog. (Closes: #196102) + + -- Loic Minier Sun, 17 Sep 2006 13:36:53 +0200 + +nautilus-cd-burner (2.14.3-7) unstable; urgency=medium + + * Depend on genisoimage instead of mkisofs; thanks Stephen Liebbe; + closes: #405742. + * Urgency medium to get this in etch. + + -- Loic Minier Sun, 7 Jan 2007 11:28:24 +0100 + +nautilus-cd-burner (2.14.3-6) unstable; urgency=high + + * 06_readom.patch: call readom instead of readcd (closes: #404839). + + -- Josselin Mouette Thu, 28 Dec 2006 23:09:09 +0100 + +nautilus-cd-burner (2.14.3-5) unstable; urgency=low + + * Fix previous patch by using libcam-dev instead of libgeom-dev (please call + that a fix for the fix of the fix, thanks), from Petr Salinger for + GNU/kFreeBSD; closes: #398764. + + -- Loic Minier Thu, 16 Nov 2006 10:31:54 +0100 + +nautilus-cd-burner (2.14.3-4) unstable; urgency=low + + * Merge patch from Petr Salinger to fix the previous patch which caused + FTBFS (spaces instead of tabs) and missed a build-dep on libgeom-dev for + kfreebsd; closes: #398764. + + -- Loic Minier Wed, 15 Nov 2006 15:48:42 +0100 + +nautilus-cd-burner (2.14.3-3) unstable; urgency=low + + * GNU/kFreeBSD support thanks to Aurelien Jarno; closes: #390764. + - Do not build-depend on libhal-dev on kfreebsd-i386 and kfreebsd-amd64. + - Let libnautilus-burn-dev depend on libhal-dev only on linux via a + ${libhal-dev} substvars. + - New patch, 05_kfreebsd-gnu, to use sys/cdio.h, sys/cdrio.h, and camlib.h + syscalls under FreeBSD kernels. + + -- Loic Minier Mon, 6 Nov 2006 18:05:21 +0100 + +nautilus-cd-burner (2.14.3-2) unstable; urgency=low + + * 04_wodim.patch: use wodim instead of cdrecord. + * Depend on wodim, not cdrecord. + * Make dvd+rw-tools a hard dependency. + + -- Josselin Mouette Wed, 27 Sep 2006 16:09:35 +0200 + +nautilus-cd-burner (2.14.3-1) unstable; urgency=low + + * New upstream release; no API changes. + + -- Loic Minier Tue, 8 Aug 2006 12:59:49 +0200 + +nautilus-cd-burner (2.14.2-1) unstable; urgency=low + + * Move nautilus from a suggestion to a dependency (closes: #345474). + * Remove obsolete Suggests on gnome-mime-data. + * New upstream release. + + -- Josselin Mouette Sun, 18 Jun 2006 12:22:20 +0200 + +nautilus-cd-burner (2.14.1-1) unstable; urgency=low + + [ Loic Minier ] + * Stop shipping /usr/lib/*.la in libnautilus-burn-dev. + [debian/libnautilus-burn-dev.install] + + [ Ondřej Surý ] + * New upstream release. + * Sync with Ubuntu. + * Install list_cddrives into /usr/lib/nautilus-cd-burner + + [ Marco Cabizza ] + * Standards-version is 3.7.2. + + -- Marco Cabizza Fri, 12 May 2006 21:08:58 +0200 + +nautilus-cd-burner (2.14.1-0ubuntu2) dapper; urgency=low + + * debian/patches/03_incorrectly_encoded_filenames_listed.patch: + - patch from CVS, list the filenames when there is an encoding issue, + the patch is not perfect since it lists only the first incorrectly + encoded though (Ubuntu: #21544) + + -- Sebastien Bacher Tue, 9 May 2006 21:37:29 +0200 + +nautilus-cd-burner (2.14.1-0ubuntu1) dapper; urgency=low + + * New upstream version: + nautilus-cd-burner: + - Strip unsafe characters from filenames + libnautilus-burn: + - Make the estimated time to finish less erratic + - More accurately estimate the total size of disc to write + - Unref drive instead of freeing + + -- Sebastien Bacher Mon, 10 Apr 2006 19:05:08 +0200 + +nautilus-cd-burner (2.14.0.2-0ubuntu2) dapper; urgency=low + + * debian/patches/01_menu_tooltip.patch: + - use "Create new CDs and DVDs" instead of "Open the CD/DVD Creator" + for the menu tooltip + + -- Sebastien Bacher Thu, 16 Mar 2006 14:13:17 +0100 + +nautilus-cd-burner (2.14.0.2-0ubuntu1) dapper; urgency=low + + * New upstream version: + libnautilus-burn + - Fix the operation of the NAUTILUS_BURN_CHECK_VERSION macro + + -- Sebastien Bacher Wed, 15 Mar 2006 18:47:21 +0100 + +nautilus-cd-burner (2.14.0.1-0ubuntu1) dapper; urgency=low + + * New upstream version: + libnautilus-burn + - Fix crash in drive selection widget + * debian/rules: + - updated shlibs version + + -- Sebastien Bacher Mon, 13 Mar 2006 23:00:45 +0100 + +nautilus-cd-burner (2.14.0-0ubuntu1) dapper; urgency=low + + * New upstream version: + nautilus-cd-burner + - Fix crash of test program + libnautilus-burn + - Emit the notify signal when changing the drive property + * debian/rules: + - updated shlibs version + * debian/watch: + - updated + + -- Sebastien Bacher Mon, 13 Mar 2006 16:40:20 +0100 + +nautilus-cd-burner (2.13.92-0ubuntu2) dapper; urgency=low + + * debian/nautilus-cd-burner.install: + - install list_cddrives, it can be useful + + -- Sebastien Bacher Tue, 28 Feb 2006 22:40:27 +0100 + +nautilus-cd-burner (2.13.92-0ubuntu1) dapper; urgency=low + + * New upstream release: + - nautilus-cd-burner: + - Fix writing of single ISO in burn:// + - libnautilus-burn: + - Check for gnome-mount at compile time + - Translations: cy, da, de, el, eu, hu, ja, ka, lt. + + -- Daniel Holbach Mon, 27 Feb 2006 20:23:42 +0100 + +nautilus-cd-burner (2.13.91-0ubuntu1) dapper; urgency=low + + * New upstream version: + nautilus-cd-burner: + - Try harder to unmount volumes before use + libnautilus-burn: + - Add mount detection + * debian/patches/03_fix_unmount_exec.patch: + - fixed with the new version + * debian/patches/04_fix_busy_detection.patch: + - fixed with the new version + + -- Sebastien Bacher Tue, 14 Feb 2006 17:16:22 +0100 + +nautilus-cd-burner (2.13.90-0ubuntu2) dapper; urgency=low + + * Add debian/patches/03_fix_unmount_exec.patch: + - Append NULL string array terminators to the command pointer array. The + array is passed to g_spawn_async(), which needs it. + * Add debian/patches/04_fix_busy_detection.patch: + - Improve 'drive is busy' detection in request_media() a bit: Since the + disc type is read from hal, it will never be + NAUTILUS_BURN_MEDIA_TYPE_BUSY. OTOH, the capacity is not (yet) read from + hal, so we need to check it for NAUTILUS_BURN_MEDIA_SIZE_BUSY, and call + unmount in that case. + - Re-read the media size if the drive was busy, otherwise it will never be + set. + - NB that this is still not a proper way to detect busy CDs. As soon as + hal supports volume.disc.capacity, this will break again. + + -- Martin Pitt Thu, 9 Feb 2006 18:42:13 +0100 + +nautilus-cd-burner (2.13.90-0ubuntu1) dapper; urgency=low + + * New upstream version: + nautilus-cd-burner: + - Display only the supported write speeds (Ubuntu: #14464) + - Use gnome-vfs to glob and tilde expand the source iso and cue files + - Add eject button to write finished dialog + - Add eject button to media request dialog + - Use disc label as default label for writing ISO + libnautilus-burn: + - New API nautilus_burn_drive_get_write_speeds + - New HAL only API nautilus_burn_drive_get_media_label + - Use HAL volume.disc.capacity if available + - Use gnome-mount if available + - Get media type information even if the volume is mounted + * debian/rules: + - updated the shlibs version + + -- Sebastien Bacher Tue, 31 Jan 2006 09:26:49 +0000 + +nautilus-cd-burner (2.13.5-0ubuntu1) dapper; urgency=low + + * Sync with Debian + * New upstream versions: + nautilus extension: + - Add location specific widget to nautilus window + -Remove toolbar button now in favor of location widget + libnautilus-burn: + - Try non-HAL lookup when HAL lookup fails + - Try to detect media type from capabilities + - Use gnome-mount if available + - Add library version checking capability + mapping-daemon: + - Make buffered protocol not lose events + - Fix removing wrong file monitor + - Remove file monitor directly when connection drops + * debian/control.in: + - updated the Build-Depends/Depends and for the new soname + * debian/patches/02_pmount.patch: + - updated + * debian/patches/10_support-for-mmc1-drives.patch: + - fixed with the new version + * debian/rules: + - shlibs update + * debian/watch: + - updated + + -- Sebastien Bacher Mon, 16 Jan 2006 22:08:31 +0100 + +nautilus-cd-burner (2.12.3-2) unstable; urgency=low + + * Simple rebuild to get rid of references to Xcursor.la and Xrender.la. + + -- Loic Minier Tue, 2 May 2006 15:31:49 +0200 + +nautilus-cd-burner (2.12.3-1) unstable; urgency=low + + * New upstream release + * debian/patches/10_support-for-mmc1-drives.patch + + Removed. Fixed upstream + + -- Sjoerd Simons Mon, 20 Feb 2006 23:00:11 +0100 + +nautilus-cd-burner (2.12.2-3) unstable; urgency=low + + * Upload to unstable. + + -- Josselin Mouette Sun, 8 Jan 2006 00:41:38 +0100 + +nautilus-cd-burner (2.12.2-2) experimental; urgency=low + + * Built against dbus >= 0.60 + + -- Sjoerd Simons Sun, 18 Dec 2005 20:10:40 +0100 + +nautilus-cd-burner (2.12.2-1) experimental; urgency=low + + * New upstream release. + * Backport patch from CVS to support MMC1 drives, submitted by Jason D. + Hildebrand; upstream GNOME bug #317529. (Closes: #330660) + - Try to sniff the disc type from the capabilities. + - Always fallback to low level method of determining media type + when HAL is unable to. + [debian/patches/10_support-for-mmc1-drives.patch] + + -- Loic Minier Fri, 16 Dec 2005 22:45:49 +0100 + +nautilus-cd-burner (2.12.1-2) experimental; urgency=high + + [ Josselin Mouette ] + * Add ${misc:Depends}. + * Standards-version is 3.6.2. + + [ Loic Minier ] + * Update FSF address. + * Clarify "Copyright" versus "License". + * Add CDBS' utils. + * Acknowledge NMU. (Closes: #322973) + + -- Loic Minier Sat, 29 Oct 2005 19:28:59 +0200 + +nautilus-cd-burner (2.12.1-1) experimental; urgency=low + + * New upstream release. + + -- Josselin Mouette Sun, 9 Oct 2005 15:08:41 +0200 + +nautilus-cd-burner (2.12.0-1) experimental; urgency=low + + [ Josselin Mouette ] + * Don't overwrite DEB_CONFIGURE_SCRIPT_ENV completely. + + [ Sjoerd Simons ] + * New upstream release + * debian/patches/00_hal05.patch + + Removed. Not needed anymore + + -- Sjoerd Simons Wed, 14 Sep 2005 19:04:41 +0200 + +nautilus-cd-burner (2.10.1-2hal0) experimental; urgency=low + + * debian/patches/00_hal05.patch + + Work with the hal 0.5 API (from gnome cvs) + + -- Sjoerd Simons Tue, 21 Jun 2005 21:03:52 +0200 + +nautilus-cd-burner (2.10.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Sebastien Bacher Fri, 10 Jun 2005 15:54:31 +0200 + +nautilus-cd-burner (2.10.1-1) experimental; urgency=low + + * New upstream version. + * debian/patches/03_unlock.patch: + - fixed with the new version. + + -- Sebastien Bacher Wed, 13 Apr 2005 22:44:26 +0200 + +nautilus-cd-burner (2.10.0-1) experimental; urgency=low + + * New upstream version. + * Update for the soname change. + * debian/control.in: + - updated the names and requirements. + * debian/patches/02_pmount.patch: + - updated. + * debian/patches/03_unlock.patch: + - fix the device unlocking. + * debian/rules: + - updated the shlibs. + * debian/watch: + - updated. + + -- Sebastien Bacher Sat, 9 Apr 2005 16:42:49 +0200 + +nautilus-cd-burner (2.8.7-3) unstable; urgency=medium + + * Use --as-needed option in LDFLAGS to reduce the dependencies. + + Incidentally removes the dependency upon libhowl0 (closes: #298868). + + -- Josselin Mouette Thu, 10 Mar 2005 23:18:49 +0100 + +nautilus-cd-burner (2.8.7-2) unstable; urgency=low + + * Rebuild without experimental packages (closes: #295609) + + -- Ross Burton Thu, 17 Feb 2005 09:15:40 +0000 + +nautilus-cd-burner (2.8.7-1) unstable; urgency=low + + * New upstream release + - remove patches/01_amd64.patch, changes are upstream now + + -- Ross Burton Wed, 16 Feb 2005 11:30:01 +0000 + +nautilus-cd-burner (2.8.6-3) unstable; urgency=low + + * debian/patches/02_pmount.patch: + - updated, should use pmount only if the user has the right to run it. + + -- Sebastien Bacher Thu, 6 Jan 2005 00:54:21 +0100 + +nautilus-cd-burner (2.8.6-2) unstable; urgency=low + + * debian/control.in: + - Build-Depends on libhal-dev (>= 0.2.98). + - updated the libnautilus-burn-dev Depends. + * debian/patches/01_amd64.patch: + - patch from Andreas Jochens to fix the build on amd64 + with gcc-3.4 (Closes: #287748). + * debian/patches/02_pmount.patch: + - add pumount to the list of known commands, should fix the bug with + busy drives. + + -- Sebastien Bacher Wed, 5 Jan 2005 22:50:54 +0100 + +nautilus-cd-burner (2.8.6-1) unstable; urgency=low + + * New upstream release + * Update README.Debian + + -- Ross Burton Tue, 21 Dec 2004 10:43:46 +0000 + +nautilus-cd-burner (2.8.5-1) unstable; urgency=low + + * New upstream release. + * Upload to unstable. + + -- Sebastien Bacher Fri, 19 Nov 2004 17:36:50 +0100 + +nautilus-cd-burner (2.8.3-2) experimental; urgency=low + + * Now libnautilus-burn has its own packages. + * debian/control.in: + - added the libnautilus-burn0 and libnautilus-burn-dev packages. + * debian/*.install: + - new files. + * debian/rules: + - set the shlib to 2.8.3. + + -- Sebastien Bacher Mon, 18 Oct 2004 12:11:40 +0200 + +nautilus-cd-burner (2.8.3-1) experimental; urgency=low + + * New upstream release: + - implement burning with "Burnproof" mode (Closes: #215196). + J.H.M. Dassen (Ray) + * [debian/watch] Updated. + + -- Sebastien Bacher Fri, 8 Oct 2004 10:44:13 +0200 + +nautilus-cd-burner (2.7.3-1) experimental; urgency=low + + * GNOME team upload. + * New (development) upstream release. + + -- Sebastien Bacher Wed, 23 Jun 2004 21:32:09 +0200 + +nautilus-cd-burner (2.6.1-3) unstable; urgency=low + + * Mention we can write DVDs and recommend dvd+rw-tools (closes: #249434) + * Handles unicode disc labels (closes: #210636) + * Mention the sg module must be loaded (closes: #198446) + * The French disc name is valid for CDs (closes: #217881) + * Standards 3.6.1 + + -- Ross Burton Tue, 8 Jun 2004 11:17:09 +0100 + +nautilus-cd-burner (2.6.1-2) unstable; urgency=low + + * GNOME Team Upload. + * Upload in unstable. + + -- Sebastien Bacher Thu, 27 May 2004 21:05:27 +0200 + +nautilus-cd-burner (2.6.1-1) experimental; urgency=low + + * New upstream release. + * debian/watch: + + added. + * Gnome Team Upload. + + -- Sebastien Bacher Sun, 16 May 2004 01:39:21 +0200 + +nautilus-cd-burner (2.6.0-1) experimental; urgency=low + + * New upstream release + * debian/control: bump Nautilus deps to 2.6.0. + * debian/README.Debian: s/Go/Places/ + * debian/rules: remove unneeded hacks + + -- Ross Burton Mon, 5 Apr 2004 09:49:34 +0100 + +nautilus-cd-burner (0.6.1-2) unstable; urgency=low + + * Move to GNOME Team repository + * Build-Depend on intltool (closes: #235022) + * Up requirement on debhelper to ensure dh_gconf + * Apply a quick patch to fix DVD detection (closes: #235033) + + -- Ross Burton Fri, 27 Feb 2004 08:03:05 +0000 + +nautilus-cd-burner (0.6.1-1) unstable; urgency=low + + * New upstream release + * Updated README.Debian + + -- Ross Burton Tue, 16 Dec 2003 08:47:39 +0000 + +nautilus-cd-burner (0.5.3-2) unstable; urgency=low + + * Fix typo in description (closes: #210950) + + -- Ross Burton Tue, 16 Sep 2003 12:11:15 +0100 + +nautilus-cd-burner (0.5.3-1) unstable; urgency=low + + * New upstream release + * Make the description more verbose (closes: #210144) + + -- Ross Burton Thu, 11 Sep 2003 11:27:59 +0100 + +nautilus-cd-burner (0.5.0-1) unstable; urgency=low + + * New upstream release + * Switch to CDBS + * Update to Standards 3.6.0 + + -- Ross Burton Fri, 8 Aug 2003 18:16:01 +0100 + +nautilus-cd-burner (0.4.3-1) unstable; urgency=low + + * New upstream release + * Can write audio CDs (closes: #196023) + + -- Ross Burton Mon, 23 Jun 2003 15:06:05 +0100 + +nautilus-cd-burner (0.4.2-1) unstable; urgency=low + + * New upstream release + * Can blank CDRWs (closes: #191469) + * Suggest gnome-mime-data >= 2.3.0 for the relevant MIME types + + -- Ross Burton Tue, 20 May 2003 16:09:29 +0100 + +nautilus-cd-burner (0.4.1-1) unstable; urgency=low + + * New upstream release + * debian/compat: Set to 4 + * debian/control: Bump to Standards 3.5.9 + * debian/control: Depend on mkisofs and cdrecord (closes: #191901) + + -- Ross Burton Wed, 7 May 2003 12:42:50 +0100 + +nautilus-cd-burner (0.4.0-1) unstable; urgency=low + + * Initial Release (closes: #181498) + + -- Ross Burton Tue, 18 Feb 2003 13:26:42 +0000 + --- nautilus-cd-burner-2.25.3.orig/debian/README.Debian +++ nautilus-cd-burner-2.25.3/debian/README.Debian @@ -0,0 +1,19 @@ +Nautilus CD Burner + +To create a new CD, insert a blank CD and if you have magicdev or +gnome-volume-manager installed, the CD Creator window will appear. Otherwise, +select Places->CD Creator or go to burn:///. Drag and drop the files you want to +burn into that location and when you have finished, select File -> Write to CD. + +To burn an existing ISO image, right-clicking on it will produce a +"Write to CD..." entry. + +This code detects available CD writers by examining files in /proc. It will try +/proc/sys/dev/cdrom/info which is created by the 'cdrom' module, and +/proc/scsi/sg/devices which is created by the 'sg' module. One of these modules +must be loaded for nautilus-cd-burner to work. + +Please don't say "n-c-b should use cdrecord -scanbus", as that operation takes +far too long and the files in /proc contain all of the information required. + + -- Ross Burton , Tue Dec 21 10:48:20 2004 --- nautilus-cd-burner-2.25.3.orig/debian/nautilus-cd-burner.preinst +++ nautilus-cd-burner-2.25.3/debian/nautilus-cd-burner.preinst @@ -0,0 +1,28 @@ +#!/bin/sh +set -e + +# Remove a no-longer used conffile +rm_conffile() { + PKGNAME="$1" + CONFFILE="$2" + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} +case "$1" in +install|upgrade) + if dpkg --compare-versions "$2" le "2.22.0-0ubuntu2"; then + rm_conffile nautilus-cd-burner "/etc/gnome-vfs-2.0/modules/mapping-modules.conf" + fi +esac + +#DEBHELPER# --- nautilus-cd-burner-2.25.3.orig/debian/docs +++ nautilus-cd-burner-2.25.3/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- nautilus-cd-burner-2.25.3.orig/debian/patches/99_ltmain_as-needed.patch +++ nautilus-cd-burner-2.25.3/debian/patches/99_ltmain_as-needed.patch @@ -0,0 +1,31 @@ +diff -Nur -x '*.orig' -x '*~' nautilus-cd-burner-2.23.90/ltmain.sh nautilus-cd-burner-2.23.90.new/ltmain.sh +--- nautilus-cd-burner-2.23.90/ltmain.sh 2008-08-18 17:06:11.000000000 +0200 ++++ nautilus-cd-burner-2.23.90.new/ltmain.sh 2008-08-20 21:12:53.000000000 +0200 +@@ -1806,7 +1806,10 @@ + IFS="$save_ifs" + arg=`$echo "X$arg" | $Xsed -e "s/^ //"` + ;; +- ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; + -Wl,*) + args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` + arg= +@@ -2147,6 +2150,15 @@ + lib= + found=no + case $deplib in ++ -Wl,--as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" --- nautilus-cd-burner-2.25.3.orig/debian/patches/04_readom.patch +++ nautilus-cd-burner-2.25.3/debian/patches/04_readom.patch @@ -0,0 +1,30 @@ +diff -Nur -x '*.orig' -x '*~' nautilus-cd-burner-2.21.5/src/make-iso.c nautilus-cd-burner-2.21.5.new/src/make-iso.c +--- nautilus-cd-burner-2.21.5/src/make-iso.c 2008-01-21 16:14:52.000000000 +0000 ++++ nautilus-cd-burner-2.21.5.new/src/make-iso.c 2008-01-22 09:46:01.000000000 +0000 +@@ -719,7 +719,7 @@ + char *pos; + + if (line && iso->priv->debug) { +- g_print ("readcd stderr: %s", line); ++ g_print ("readom stderr: %s", line); + } + + pos = strstr (line, "addr:"); +@@ -1379,7 +1379,7 @@ + device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_device (drive)); + + argv = g_ptr_array_new (); +- g_ptr_array_add (argv, "readcd"); ++ g_ptr_array_add (argv, "readom"); + g_ptr_array_add (argv, "-sectors=0-0"); + g_ptr_array_add (argv, device_arg); + g_ptr_array_add (argv, "-f=/dev/null"); +@@ -1561,7 +1561,7 @@ + dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); + + argv = g_ptr_array_new (); +- g_ptr_array_add (argv, "readcd"); ++ g_ptr_array_add (argv, "readom"); + g_ptr_array_add (argv, (char *)dev_arg); + g_ptr_array_add (argv, (char *)filename_arg); + g_ptr_array_add (argv, NULL); --- nautilus-cd-burner-2.25.3.orig/debian/patches/03_wodim.patch +++ nautilus-cd-burner-2.25.3/debian/patches/03_wodim.patch @@ -0,0 +1,48 @@ +diff -Nur -x '*.orig' -x '*~' nautilus-cd-burner-2.21.5/src/nautilus-burn-recorder.c nautilus-cd-burner-2.21.5.new/src/nautilus-burn-recorder.c +--- nautilus-cd-burner-2.21.5/src/nautilus-burn-recorder.c 2008-01-21 16:16:16.000000000 +0000 ++++ nautilus-cd-burner-2.21.5.new/src/nautilus-burn-recorder.c 2008-01-22 09:43:03.000000000 +0000 +@@ -374,7 +374,7 @@ + int tmp; + + if (line && process->debug) { +- g_print ("cdrecord stdout: %s", line); ++ g_print ("wodim stdout: %s", line); + } + + if (sscanf (line, "Track %2u: %d of %d MB written (fifo %d%%) [buf %d%%] %fx.", +@@ -482,7 +482,7 @@ + NautilusBurnRecorder *recorder = data; + + if (line && process->debug) { +- g_print ("cdrecord blank stdout: %s", line); ++ g_print ("wodim blank stdout: %s", line); + } + + if (g_str_has_prefix (line, "Re-load disk and hit ") || +@@ -674,7 +674,7 @@ + NautilusBurnRecorder *recorder = data; + + if (line && process->debug) { +- g_print ("cdrecord stderr: %s", line); ++ g_print ("wodim stderr: %s", line); + } + + if (strstr (line, "No disk / Wrong disk!") != NULL) { +@@ -1381,7 +1381,7 @@ + err_line_func = cdrdao_stderr_line; + } else { + argv = g_ptr_array_new (); +- g_ptr_array_add (argv, "cdrecord"); ++ g_ptr_array_add (argv, "wodim"); + + g_ptr_array_add (argv, "fs=16m"); + +@@ -1498,7 +1498,7 @@ + } + + argv = g_ptr_array_new (); +- g_ptr_array_add (argv, "cdrecord"); ++ g_ptr_array_add (argv, "wodim"); + + dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); + g_ptr_array_add (argv, dev_str); --- nautilus-cd-burner-2.25.3.orig/debian/patches/01_enable_gnome_mount_force.patch +++ nautilus-cd-burner-2.25.3/debian/patches/01_enable_gnome_mount_force.patch @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' nautilus-cd-burner-2.25.3/configure nautilus-cd-burner-2.25.3.new/configure +--- nautilus-cd-burner-2.25.3/configure 2009-03-19 01:03:51.217338000 +0100 ++++ nautilus-cd-burner-2.25.3.new/configure 2009-03-19 01:07:51.457340404 +0100 +@@ -24080,7 +24080,7 @@ + (exit $ac_status); }; then + pkg_cv_GNOME_MOUNT_LIBS=`$PKG_CONFIG --libs "gnome-mount >= 0.4" 2>/dev/null` + else +- pkg_failed=yes ++ pkg_failed=no + fi + else + pkg_failed=untried --- nautilus-cd-burner-2.25.3.orig/debian/patches/06_fix_warnings_on_build.patch +++ nautilus-cd-burner-2.25.3/debian/patches/06_fix_warnings_on_build.patch @@ -0,0 +1,20 @@ +diff -Nur -x '*.orig' -x '*~' nautilus-cd-burner-2.25.3/src/burn-extension.c nautilus-cd-burner-2.25.3.new/src/burn-extension.c +--- nautilus-cd-burner-2.25.3/src/burn-extension.c 2008-12-16 15:54:47.000000000 +0100 ++++ nautilus-cd-burner-2.25.3.new/src/burn-extension.c 2009-03-19 00:58:50.201340018 +0100 +@@ -129,12 +129,12 @@ + &error)) { + + +- dialog = gtk_message_dialog (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, +- GTK_BUTTONS_OK, _("Unable to launch the cd burner application")); ++ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, ++ GTK_BUTTONS_OK, _("Unable to launch the cd burner application")); + +- gtk_message_dialog_format_secondary_text (dialog, "%s", error->message); ++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message); + +- gtk_dialog_run (dialog); ++ gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + + g_error_free (error); --- nautilus-cd-burner-2.25.3.orig/debian/patches/05_genisoimage.patch +++ nautilus-cd-burner-2.25.3/debian/patches/05_genisoimage.patch @@ -0,0 +1,83 @@ +diff -Nur -x '*.orig' -x '*~' nautilus-cd-burner-2.21.5/src/make-iso.c nautilus-cd-burner-2.21.5.new/src/make-iso.c +--- nautilus-cd-burner-2.21.5/src/make-iso.c 2008-01-22 09:53:29.000000000 +0000 ++++ nautilus-cd-burner-2.21.5.new/src/make-iso.c 2008-01-22 09:54:50.000000000 +0000 +@@ -837,22 +837,8 @@ + static gboolean + ncb_mkisofs_supports_utf8 (void) + { +- static gboolean first = TRUE; +- static gboolean supported; +- +- if (first) { +- char *standard_error; +- gboolean res; +- res = g_spawn_command_line_sync ("mkisofs -input-charset utf8", NULL, &standard_error, NULL, NULL); +- if (res && !g_strrstr (standard_error, "Unknown charset")) { +- supported = TRUE; +- } else { +- supported = FALSE; +- } +- g_free (standard_error); +- } +- +- return supported; ++ /* genisoimage always supports utf8 */ ++ return TRUE; + } + + static char * +@@ -972,7 +958,7 @@ + } + argv = g_ptr_array_new (); + +- g_ptr_array_add (argv, "mkisofs"); ++ g_ptr_array_add (argv, "genisoimage"); + g_ptr_array_add (argv, "-r"); + if (use_joliet) { + g_ptr_array_add (argv, "-J"); +@@ -1139,7 +1125,7 @@ + utf8_filename = ncb_make_valid_utf8 (filename->str); + msg = g_strdup_printf (_("Some files have invalid filenames: \n%s"), utf8_filename); + if (iso->priv->debug) { +- g_print ("mkisofs error: %s\n", msg); ++ g_print ("genisoimage error: %s\n", msg); + } + + process_error (iso, msg); +@@ -1253,7 +1239,7 @@ + } + + argv = g_ptr_array_new (); +- g_ptr_array_add (argv, "mkisofs"); ++ g_ptr_array_add (argv, "genisoimage"); + g_ptr_array_add (argv, "-r"); + if (use_joliet) { + g_ptr_array_add (argv, "-J"); +diff -Nur -x '*.orig' -x '*~' nautilus-cd-burner-2.21.5/src/nautilus-burn-recorder.c nautilus-cd-burner-2.21.5.new/src/nautilus-burn-recorder.c +--- nautilus-cd-burner-2.21.5/src/nautilus-burn-recorder.c 2008-01-22 09:53:29.000000000 +0000 ++++ nautilus-cd-burner-2.21.5.new/src/nautilus-burn-recorder.c 2008-01-22 09:54:00.000000000 +0000 +@@ -1069,22 +1069,8 @@ + static gboolean + ncb_mkisofs_supports_utf8 (void) + { +- static gboolean first = TRUE; +- static gboolean supported; +- +- if (first) { +- char *standard_error; +- gboolean res; +- res = g_spawn_command_line_sync ("mkisofs -input-charset utf8", NULL, &standard_error, NULL, NULL); +- if (res && !g_strrstr (standard_error, "Unknown charset")) { +- supported = TRUE; +- } else { +- supported = FALSE; +- } +- g_free (standard_error); +- } +- +- return supported; ++ /* genisoimage always supports utf8 */ ++ return TRUE; + } + + static int