Update to 2.10.0:

==============
Version 2.10.0
==============

This is a stable release to coincide with the release of Gnome 2.10.0.
The only differences between this version and 2.9.8 are some
translation updates and a new README.

Translators

	* Vladimir Petkov (bg)
	* Jordi Mallach (ca)
	* Miloslav Trmac (cs)
	* Martin Willemoes Hansen (da)
	* Hendrik Brandt (de)
	* Nikos Charonitakis (el)
	* Adam Weinberger (en_CA)
	* David Lodge (en_GB)
	* Francisco Javier F. Serrador (es)
	* Priit Laes (et)
	* Ilkka Tuohela (fi)
	* Baptiste Mille-Mathias (fr)
	* Ankit Patel (gu)
	* Gabor Kelemen (hu)
	* Luca Ferretti (it)
	* Takeshi AIHANA (ja)
	* Changwoo Ryu (ko)
	* Žygimantas Beručka (lt)
	* Kjartan Maraas (nb)
	* Reinout van Schouwen (nl)
	* Kjartan Maraas (no)
	* Gnome PL Team (pl)
	* Raphael Higino (pt_BR)
	* Duarte Loreto (pt)
	* Mugurel Tudor (ro)
	* Leonid Kanter (ru)
	* Marcel Telka (sk)
	* Laurent Dhima (sq)
	* Данило Шеган (sr)
	* Christian Rose (sv)
	* Emrah Ünal (tr)
	* Maxim Dziumanenko (uk)
	* Liu Songhe (zh_CN)
	* Woodman Tuen (zh_TW)

2.9.8:

Don't hang on pipe EOF on BSD
Identify blank non-DVD discs in the no-HAL case

2.9.7:

Report the correct capacity for sequential DVD-RW discs
Fix missing warning about overwriting data on disc
Get blank status correctly for systems without HAL
Only use UTF8 with mkisofs if it is patched to support it
Don't hang on unknown errors from mkisofs
Make wording in interrupt confirmation dialog less ambiguious
Fallback to opening devices read-only on Linux 2.4 systems

2.9.6:

Improve error reporting from make_iso process
Try to unmount busy volumes before asking for media

2.9.5:

Clarify language in message dialogs
Use consistent size units in user visible strings

2.9.4:

Give a better error message when an ISO image isn't readable
Use gnome-vfs to check the space left on a partition
Add blanking support to libnautilus-burn
Ask the user if he wants to erase an already used disc
Correctly namespace all the libnautilus-burn functions
Tell the user that the data possibly won't fit on the disc
Warn the user if he's trying to write a CD with an ISO image inside

7 files changed, 72 insertions, 22 deletions

diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 0d42c411dbf..6467498abb2 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2005/02/26 17:26:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2005/03/22 16:33:55 jmmv Exp $
 #
 
-DISTNAME=	nautilus-cd-burner-2.8.7
+DISTNAME=	nautilus-cd-burner-2.10.0
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.8/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.10/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
@@ -42,6 +42,7 @@ GCONF2_SCHEMAS=		ncb.schemas
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
diff --git a/sysutils/nautilus-cd-burner/PLIST b/sysutils/nautilus-cd-burner/PLIST
index b4959ae8b81..bd2a8a9b3db 100644
--- a/sysutils/nautilus-cd-burner/PLIST
+++ b/sysutils/nautilus-cd-burner/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:54 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/03/22 16:33:55 jmmv Exp $
 bin/nautilus-cd-burner
-include/libnautilus-burn/bacon-cd-selection.h
-include/libnautilus-burn/cd-drive.h
-include/libnautilus-burn/cd-recorder.h
+include/libnautilus-burn/nautilus-burn-drive-selection.h
+include/libnautilus-burn/nautilus-burn-drive.h
+include/libnautilus-burn/nautilus-burn-recorder.h
 lib/gnome-vfs-2.0/modules/libmapping.la
 lib/libnautilus-burn.la
 lib/nautilus/extensions-1.0/libnautilus-burn-extension.la
@@ -44,10 +44,12 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/or/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/nautilus-cd-burner.mo
@@ -62,6 +64,7 @@ ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/nautilus-cd-burner.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/nautilus-cd-burner.mo
@@ -83,6 +86,5 @@ share/nautilus-cd-burner/cdspin8.png
 @dirrm share/examples/nautilus-cd-burner/gnome-vfs-2.0
 @dirrm share/examples/nautilus-cd-burner
 @comment in nautilus: @dirrm lib/nautilus/extensions-1.0
-@comment in nautilus: @dirrm lib/nautilus
 @comment in gnome-vfs2: @dirrm lib/gnome-vfs-2.0/modules
 @dirrm include/libnautilus-burn
diff --git a/sysutils/nautilus-cd-burner/buildlink3.mk b/sysutils/nautilus-cd-burner/buildlink3.mk
new file mode 100644
index 00000000000..960dd2c4d14
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2005/03/22 16:33:55 jmmv Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+NAUTILUS_CD_BURNER_BUILDLINK3_MK:=	${NAUTILUS_CD_BURNER_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	nautilus-cd-burner
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnautilus-cd-burner}
+BUILDLINK_PACKAGES+=	nautilus-cd-burner
+
+.if !empty(NAUTILUS_CD_BURNER_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.nautilus-cd-burner+=		nautilus-cd-burner>=2.10.0
+BUILDLINK_PKGSRCDIR.nautilus-cd-burner?=	../../sysutils/nautilus-cd-burner
+.endif	# NAUTILUS_CD_BURNER_BUILDLINK3_MK
+
+.include "../../sysutils/nautilus/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 2ec0247632f..200b62ee506 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.8 2005/03/16 13:18:34 rillig Exp $
+$NetBSD: distinfo,v 1.9 2005/03/22 16:33:55 jmmv Exp $
 
-SHA1 (nautilus-cd-burner-2.8.7.tar.bz2) = 84d33dc0a8561283ebc867fc39f2e1a3787ce776
-RMD160 (nautilus-cd-burner-2.8.7.tar.bz2) = 1a4ec3c2a64b150e352727cf1e9101616b083872
-Size (nautilus-cd-burner-2.8.7.tar.bz2) = 561727 bytes
+SHA1 (nautilus-cd-burner-2.10.0.tar.bz2) = 477fec627fd2797b6bc74c758a6be1313ddd0e6f
+RMD160 (nautilus-cd-burner-2.10.0.tar.bz2) = 1b1d274f6b8e6f67b8111832ea23d69e2123a62a
+Size (nautilus-cd-burner-2.10.0.tar.bz2) = 623320 bytes
 SHA1 (patch-aa) = e3a00bb52a0327f0f7587c4ea7030128adc70fb8
-SHA1 (patch-ab) = df9449617dcb2d759af503d054d29bee9f1234b4
+SHA1 (patch-ab) = 3482a773976bb011f5a6b26a42672aa65be068a1
 SHA1 (patch-ac) = b4eb3f033e23e0f2764bcd01c2bf0185593e587a
 SHA1 (patch-ad) = 1afd01abaac1abc9973166d7b25e950a1ada4e15
+SHA1 (patch-ae) = fcb78f12175441dba3fcdb729309a16e2d05d866
+SHA1 (patch-af) = 60b32582bcb95ee063d6c9e0f48f595af0a3b599
diff --git a/sysutils/nautilus-cd-burner/patches/patch-ab b/sysutils/nautilus-cd-burner/patches/patch-ab
index 7080a5d7e1a..964c03edb9d 100644
--- a/sysutils/nautilus-cd-burner/patches/patch-ab
+++ b/sysutils/nautilus-cd-burner/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2004/09/21 17:15:35 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2005/03/22 16:33:55 jmmv Exp $
 
---- cd-drive.c.orig	2004-08-09 22:04:30.000000000 +0200
-+++ cd-drive.c
-@@ -688,8 +688,9 @@ lookup_scsi_unit (int bus, int id, int l
+--- nautilus-burn-drive.c.orig	2005-02-23 01:34:17.000000000 +0100
++++ nautilus-burn-drive.c
+@@ -1112,8 +1112,9 @@ lookup_scsi_unit (int               bus,
  	}
  	return NULL;
  }
@@ -13,7 +13,7 @@ $NetBSD: patch-ab,v 1.1 2004/09/21 17:15:35 jmmv Exp $
  static int
  get_device_max_read_speed (char *device)
  {
-@@ -710,7 +711,6 @@ get_device_max_read_speed (char *device)
+@@ -1134,7 +1135,6 @@ get_device_max_read_speed (char *device)
  
  	return max_speed;
  }
@@ -21,13 +21,13 @@ $NetBSD: patch-ab,v 1.1 2004/09/21 17:15:35 jmmv Exp $
  
  static int
  get_device_max_write_speed (char *device)
-@@ -732,6 +732,9 @@ get_device_max_write_speed (char *device
+@@ -1156,7 +1156,9 @@ get_device_max_write_speed (char *device
  
  	return max_speed;
  }
 +#endif
-+
-+#if defined(__linux__)
  
++#if defined(__linux__)
  static char *
- get_scsi_cd_name (int bus, int id, int lun, const char *dev,
+ get_scsi_cd_name (int               bus,
+ 		  int               id,
diff --git a/sysutils/nautilus-cd-burner/patches/patch-ae b/sysutils/nautilus-cd-burner/patches/patch-ae
new file mode 100644
index 00000000000..76d9b12e7a5
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2005/03/22 16:33:55 jmmv Exp $
+
+--- config.h.in.orig	2005-03-07 19:56:08.000000000 +0100
++++ config.h.in
+@@ -105,3 +105,7 @@
+ 
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
++
++/* Define to 1 if you have the `statvfs' function. */
++#undef HAVE_STATVFS
++
diff --git a/sysutils/nautilus-cd-burner/patches/patch-af b/sysutils/nautilus-cd-burner/patches/patch-af
new file mode 100644
index 00000000000..f6073fc74b5
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2005/03/22 16:33:55 jmmv Exp $
+
+--- configure.orig	2005-03-07 19:55:52.000000000 +0100
++++ configure
+@@ -22185,7 +22185,7 @@ fi
+           glib_save_LIBS="$LIBS"
+           LIBS="$LIBS $INTLLIBS"
+ 
+-for ac_func in dcgettext
++for ac_func in dcgettext statvfs
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5