GNOME.org
 

brasero r1725 - in trunk: . brasero-media docs/reference libbrasero-media po src src/plugins/cdrdao src/plugins/cdrkit src/plugins/cdrtools src/plugins/checksum src/plugins/dvdauthor src/plugins/dvdcss src/plugins/growisofs src/plugins/libburnia src/plugins/local-track src/plugins/transcode src/plugins/vcdimager

Author: philippr
Date: Sat Jan 10 14:31:56 2009
New Revision: 1725
URL: http://svn.gnome.org/viewvc/brasero?rev=1725&view=rev

Log:
2009-01-10  Philippe Rouquier  <ykw localhost localdomain>

	Rename brasero-media directory to libbrasero-media
	and fix a build problem

	* Makefile.am:
	* brasero-media/Makefile.am:
	* brasero-media/brasero-drive-selection.c:
	* brasero-media/brasero-drive-selection.h:
	* brasero-media/brasero-drive.c:
	* brasero-media/brasero-drive.h:
	* brasero-media/brasero-media.c:
	* brasero-media/brasero-media.h:
	* brasero-media/brasero-medium-monitor.c:
	* brasero-media/brasero-medium-monitor.h:
	* brasero-media/brasero-medium-selection.c:
	* brasero-media/brasero-medium-selection.h:
	* brasero-media/brasero-medium.c:
	* brasero-media/brasero-medium.h:
	* brasero-media/brasero-units.c:
	* brasero-media/brasero-units.h:
	* brasero-media/brasero-volume.c:
	* brasero-media/brasero-volume.h:
	* brasero-media/burn-hal-watch.c:
	* brasero-media/burn-hal-watch.h:
	* brasero-media/burn-iso-field.c:
	* brasero-media/burn-iso-field.h:
	* brasero-media/burn-iso9660.c:
	* brasero-media/burn-iso9660.h:
	* brasero-media/burn-susp.c:
	* brasero-media/burn-susp.h:
	* brasero-media/burn-volume-source.c:
	* brasero-media/burn-volume-source.h:
	* brasero-media/burn-volume.c:
	* brasero-media/burn-volume.h:
	* brasero-media/libbrasero-marshal.list:
	* brasero-media/scsi-base.h:
	* brasero-media/scsi-cam.c:
	* brasero-media/scsi-command.h:
	* brasero-media/scsi-device.h:
	* brasero-media/scsi-dvd-structures.h:
	* brasero-media/scsi-eject.c:
	* brasero-media/scsi-error.c:
	* brasero-media/scsi-error.h:
	* brasero-media/scsi-get-configuration.c:
	* brasero-media/scsi-get-configuration.h:
	* brasero-media/scsi-get-performance.c:
	* brasero-media/scsi-get-performance.h:
	* brasero-media/scsi-mech-status.c:
	* brasero-media/scsi-mech-status.h:
	* brasero-media/scsi-mmc1.h:
	* brasero-media/scsi-mmc2.h:
	* brasero-media/scsi-mmc3.h:
	* brasero-media/scsi-mode-pages.h:
	* brasero-media/scsi-mode-select.c:
	* brasero-media/scsi-mode-sense.c:
	* brasero-media/scsi-opcodes.h:
	* brasero-media/scsi-q-subchannel.h:
	* brasero-media/scsi-read-capacity.c:
	* brasero-media/scsi-read-capacity.h:
	* brasero-media/scsi-read-cd.c:
	* brasero-media/scsi-read-cd.h:
	* brasero-media/scsi-read-disc-info.c:
	* brasero-media/scsi-read-disc-info.h:
	* brasero-media/scsi-read-disc-structure.c:
	* brasero-media/scsi-read-disc-structure.h:
	* brasero-media/scsi-read-format-capacities.c:
	* brasero-media/scsi-read-format-capacities.h:
	* brasero-media/scsi-read-toc-pma-atip.c:
	* brasero-media/scsi-read-toc-pma-atip.h:
	* brasero-media/scsi-read-track-information.c:
	* brasero-media/scsi-read-track-information.h:
	* brasero-media/scsi-read10.c:
	* brasero-media/scsi-sbc.h:
	* brasero-media/scsi-sense-data.c:
	* brasero-media/scsi-sense-data.h:
	* brasero-media/scsi-sg.c:
	* brasero-media/scsi-spc1.h:
	* brasero-media/scsi-status-page.h:
	* brasero-media/scsi-test-unit-ready.c:
	* brasero-media/scsi-uscsi.c:
	* brasero-media/scsi-utils.h:
	* brasero-media/scsi-write-page.h:
	* configure.in:
	* docs/reference/Makefile.am:
	* libbrasero-media/brasero-drive-selection.c:
	* libbrasero-media/brasero-drive-selection.h:
	* src/Makefile.am:
	* src/plugins/cdrdao/Makefile.am:
	* src/plugins/cdrkit/Makefile.am:
	* src/plugins/cdrtools/Makefile.am:
	* src/plugins/checksum/Makefile.am:
	* src/plugins/dvdauthor/Makefile.am:
	* src/plugins/dvdcss/Makefile.am:
	* src/plugins/growisofs/Makefile.am:
	* src/plugins/libburnia/Makefile.am:
	* src/plugins/local-track/Makefile.am:
	* src/plugins/transcode/Makefile.am:
	* src/plugins/vcdimager/Makefile.am:

Added:
   trunk/libbrasero-media/   (props changed)
      - copied from r1719, /trunk/brasero-media/
   trunk/libbrasero-media/Makefile.am
      - copied unchanged from r1723, /trunk/brasero-media/Makefile.am
   trunk/libbrasero-media/brasero-drive-selection.c
      - copied, changed from r1723, /trunk/brasero-media/brasero-drive-selection.c
   trunk/libbrasero-media/brasero-drive-selection.h
      - copied, changed from r1723, /trunk/brasero-media/brasero-drive-selection.h
   trunk/libbrasero-media/brasero-drive.c
      - copied unchanged from r1723, /trunk/brasero-media/brasero-drive.c
   trunk/libbrasero-media/brasero-drive.h
      - copied unchanged from r1723, /trunk/brasero-media/brasero-drive.h
   trunk/libbrasero-media/brasero-media.c
      - copied unchanged from r1723, /trunk/brasero-media/brasero-media.c
   trunk/libbrasero-media/brasero-media.h
      - copied unchanged from r1723, /trunk/brasero-media/brasero-media.h
   trunk/libbrasero-media/brasero-medium-monitor.c
      - copied unchanged from r1723, /trunk/brasero-media/brasero-medium-monitor.c
   trunk/libbrasero-media/brasero-medium-monitor.h
      - copied unchanged from r1723, /trunk/brasero-media/brasero-medium-monitor.h
   trunk/libbrasero-media/brasero-medium-selection.c
      - copied unchanged from r1723, /trunk/brasero-media/brasero-medium-selection.c
   trunk/libbrasero-media/brasero-medium-selection.h
      - copied unchanged from r1723, /trunk/brasero-media/brasero-medium-selection.h
   trunk/libbrasero-media/brasero-medium.c
      - copied unchanged from r1723, /trunk/brasero-media/brasero-medium.c
   trunk/libbrasero-media/brasero-medium.h
      - copied unchanged from r1723, /trunk/brasero-media/brasero-medium.h
   trunk/libbrasero-media/brasero-units.c
      - copied unchanged from r1723, /trunk/brasero-media/brasero-units.c
   trunk/libbrasero-media/brasero-units.h
      - copied unchanged from r1723, /trunk/brasero-media/brasero-units.h
   trunk/libbrasero-media/brasero-volume.c
      - copied unchanged from r1723, /trunk/brasero-media/brasero-volume.c
   trunk/libbrasero-media/brasero-volume.h
      - copied unchanged from r1723, /trunk/brasero-media/brasero-volume.h
   trunk/libbrasero-media/burn-hal-watch.c
      - copied unchanged from r1723, /trunk/brasero-media/burn-hal-watch.c
   trunk/libbrasero-media/burn-iso9660.c
      - copied unchanged from r1723, /trunk/brasero-media/burn-iso9660.c
   trunk/libbrasero-media/burn-volume-source.c
      - copied unchanged from r1723, /trunk/brasero-media/burn-volume-source.c
   trunk/libbrasero-media/burn-volume.c
      - copied unchanged from r1723, /trunk/brasero-media/burn-volume.c
   trunk/libbrasero-media/scsi-error.c
      - copied unchanged from r1723, /trunk/brasero-media/scsi-error.c
   trunk/libbrasero-media/scsi-utils.h
      - copied unchanged from r1723, /trunk/brasero-media/scsi-utils.h
Removed:
   trunk/brasero-media/
   trunk/libbrasero-media/burn-drive.c
   trunk/libbrasero-media/burn-drive.h
   trunk/libbrasero-media/burn-media.c
   trunk/libbrasero-media/burn-media.h
   trunk/libbrasero-media/burn-medium-monitor.c
   trunk/libbrasero-media/burn-medium-monitor.h
   trunk/libbrasero-media/burn-medium.c
   trunk/libbrasero-media/burn-medium.h
   trunk/libbrasero-media/burn-units.c
   trunk/libbrasero-media/burn-units.h
   trunk/libbrasero-media/burn-volume-obj.c
   trunk/libbrasero-media/burn-volume-obj.h
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/docs/reference/Makefile.am
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/src/Makefile.am
   trunk/src/plugins/cdrdao/Makefile.am
   trunk/src/plugins/cdrkit/Makefile.am
   trunk/src/plugins/cdrtools/Makefile.am
   trunk/src/plugins/checksum/Makefile.am
   trunk/src/plugins/dvdauthor/Makefile.am
   trunk/src/plugins/dvdcss/Makefile.am
   trunk/src/plugins/growisofs/Makefile.am
   trunk/src/plugins/libburnia/Makefile.am
   trunk/src/plugins/local-track/Makefile.am
   trunk/src/plugins/transcode/Makefile.am
   trunk/src/plugins/vcdimager/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat Jan 10 14:31:56 2009
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in.
-SUBDIRS = brasero-media src po data docs
+SUBDIRS = libbrasero-media src po data docs
 
 SUBDIRS += help
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Jan 10 14:31:56 2009
@@ -418,7 +418,7 @@
 data/icons/Makefile
 help/Makefile
 nautilus/Makefile
-brasero-media/Makefile
+libbrasero-media/Makefile
 src/plugins/Makefile
 src/plugins/cdrdao/Makefile
 src/plugins/cdrkit/Makefile

Modified: trunk/docs/reference/Makefile.am
==============================================================================
--- trunk/docs/reference/Makefile.am	(original)
+++ trunk/docs/reference/Makefile.am	Sat Jan 10 14:31:56 2009
@@ -18,7 +18,7 @@
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../brasero-media
+DOC_SOURCE_DIR=../../libbrasero-media
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
@@ -42,8 +42,8 @@
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/brasero-media/*.h
-CFILE_GLOB=$(top_srcdir)/brasero-media/*.c
+HFILE_GLOB=$(top_srcdir)/libbrasero-media/*.h
+CFILE_GLOB=$(top_srcdir)/libbrasero-media/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@@ -109,7 +109,7 @@
 	$(BRASERO_DBUS_CFLAGS)						\
 	$(BRASERO_HAL_CFLAGS)
 
-GTKDOC_LIBS=$(top_builddir)/brasero-media/libbrasero-media.la
+GTKDOC_LIBS=$(top_builddir)/libbrasero-media/libbrasero-media.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make

Copied: trunk/libbrasero-media/brasero-drive-selection.c (from r1723, /trunk/brasero-media/brasero-drive-selection.c)
==============================================================================
--- /trunk/brasero-media/brasero-drive-selection.c	(original)
+++ trunk/libbrasero-media/brasero-drive-selection.c	Sat Jan 10 14:31:56 2009
@@ -33,8 +33,8 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "brasero-drive-selection.h"
 #include "brasero-medium-monitor.h"
+#include "brasero-drive-selection.h"
 
 /* Signals */
 enum {

Copied: trunk/libbrasero-media/brasero-drive-selection.h (from r1723, /trunk/brasero-media/brasero-drive-selection.h)
==============================================================================
--- /trunk/brasero-media/brasero-drive-selection.h	(original)
+++ trunk/libbrasero-media/brasero-drive-selection.h	Sat Jan 10 14:31:56 2009
@@ -52,7 +52,7 @@
                                  BraseroDrive      *drive);
 } BraseroDriveSelectionClass;
 
-GtkType                  brasero_drive_selection_get_type           (void);
+GType                    brasero_drive_selection_get_type           (void) G_GNUC_CONST;
 GtkWidget               *brasero_drive_selection_new                (void);
 
 void                     brasero_drive_selection_set_active         (BraseroDriveSelection *selection,

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Sat Jan 10 14:31:56 2009
@@ -1,16 +1,16 @@
 # List of source files containing translatable strings.
 [encoding: UTF-8]
 
-brasero-media/brasero-drive-selection.c
-brasero-media/brasero-media.c
-brasero-media/brasero-units.c
-brasero-media/brasero-medium-selection.c
-brasero-media/brasero-drive.c
-brasero-media/burn-iso9660.c
-brasero-media/brasero-medium.c
-brasero-media/brasero-volume.c
-brasero-media/burn-volume.c
-brasero-media/scsi-error.c
+libbrasero-media/brasero-drive-selection.c
+libbrasero-media/brasero-media.c
+libbrasero-media/brasero-units.c
+libbrasero-media/brasero-medium-selection.c
+libbrasero-media/brasero-drive.c
+libbrasero-media/burn-iso9660.c
+libbrasero-media/brasero-medium.c
+libbrasero-media/brasero-volume.c
+libbrasero-media/burn-volume.c
+libbrasero-media/scsi-error.c
 src/eggdesktopfile.c
 src/eggsmclient.c
 src/brasero-tool-color-picker.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Jan 10 14:31:56 2009
@@ -2,7 +2,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)							\
-	-I$(top_srcdir)/brasero-media/					\
+	-I$(top_srcdir)/libbrasero-media/					\
 	-I$(top_builddir)						\
 	-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
 	-DBRASERO_PREFIX=\"$(prefix)\"           			\
@@ -228,7 +228,7 @@
 endif
 
 brasero_LDADD =				\
-	../brasero-media/libbrasero-media.la		\
+	../libbrasero-media/libbrasero-media.la		\
 	$(BRASERO_GLIB_LIBS)		\
 	$(BRASERO_GIO_LIBS)		\
 	$(BRASERO_GCONF_LIBS)		\

Modified: trunk/src/plugins/cdrdao/Makefile.am
==============================================================================
--- trunk/src/plugins/cdrdao/Makefile.am	(original)
+++ trunk/src/plugins/cdrdao/Makefile.am	Sat Jan 10 14:31:56 2009
@@ -1,7 +1,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)					\
-	-I$(top_srcdir)/brasero-media/					\
+	-I$(top_srcdir)/libbrasero-media/					\
 	-I$(top_builddir)				\
 	-I$(top_srcdir)/src				\
 	-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\

Modified: trunk/src/plugins/cdrkit/Makefile.am
==============================================================================
--- trunk/src/plugins/cdrkit/Makefile.am	(original)
+++ trunk/src/plugins/cdrkit/Makefile.am	Sat Jan 10 14:31:56 2009
@@ -1,7 +1,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)					\
-	-I$(top_srcdir)/brasero-media/					\
+	-I$(top_srcdir)/libbrasero-media/					\
 	-I$(top_builddir)				\
 	-I$(top_srcdir)/src				\
 	-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\

Modified: trunk/src/plugins/cdrtools/Makefile.am
==============================================================================
--- trunk/src/plugins/cdrtools/Makefile.am	(original)
+++ trunk/src/plugins/cdrtools/Makefile.am	Sat Jan 10 14:31:56 2009
@@ -1,7 +1,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)					\
-	-I$(top_srcdir)/brasero-media/					\
+	-I$(top_srcdir)/libbrasero-media/					\
 	-I$(top_builddir)				\
 	-I$(top_srcdir)/src				\
 	-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\

Modified: trunk/src/plugins/checksum/Makefile.am
==============================================================================
--- trunk/src/plugins/checksum/Makefile.am	(original)
+++ trunk/src/plugins/checksum/Makefile.am	Sat Jan 10 14:31:56 2009
@@ -1,7 +1,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)							\
-	-I$(top_srcdir)/brasero-media/					\
+	-I$(top_srcdir)/libbrasero-media/					\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)/src						\
 	-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\

Modified: trunk/src/plugins/dvdauthor/Makefile.am
==============================================================================
--- trunk/src/plugins/dvdauthor/Makefile.am	(original)
+++ trunk/src/plugins/dvdauthor/Makefile.am	Sat Jan 10 14:31:56 2009
@@ -1,7 +1,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)					\
-	-I$(top_srcdir)/brasero-media/					\
+	-I$(top_srcdir)/libbrasero-media/					\
 	-I$(top_builddir)				\
 	-I$(top_srcdir)/src				\
 	-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\

Modified: trunk/src/plugins/dvdcss/Makefile.am
==============================================================================
--- trunk/src/plugins/dvdcss/Makefile.am	(original)
+++ trunk/src/plugins/dvdcss/Makefile.am	Sat Jan 10 14:31:56 2009
@@ -2,7 +2,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)					\
-	-I$(top_srcdir)/brasero-media/					\
+	-I$(top_srcdir)/libbrasero-media/					\
 	-I$(top_builddir)				\
 	-I$(top_srcdir)/src				\
 	-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\

Modified: trunk/src/plugins/growisofs/Makefile.am
==============================================================================
--- trunk/src/plugins/growisofs/Makefile.am	(original)
+++ trunk/src/plugins/growisofs/Makefile.am	Sat Jan 10 14:31:56 2009
@@ -1,7 +1,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)					\
-	-I$(top_srcdir)/brasero-media/					\
+	-I$(top_srcdir)/libbrasero-media/					\
 	-I$(top_builddir)				\
 	-I$(top_srcdir)/src				\
 	-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\

Modified: trunk/src/plugins/libburnia/Makefile.am
==============================================================================
--- trunk/src/plugins/libburnia/Makefile.am	(original)
+++ trunk/src/plugins/libburnia/Makefile.am	Sat Jan 10 14:31:56 2009
@@ -1,7 +1,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)					\
-	-I$(top_srcdir)/brasero-media/					\
+	-I$(top_srcdir)/libbrasero-media/					\
 	-I$(top_builddir)				\
 	-I$(top_srcdir)/src				\
 	-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\

Modified: trunk/src/plugins/local-track/Makefile.am
==============================================================================
--- trunk/src/plugins/local-track/Makefile.am	(original)
+++ trunk/src/plugins/local-track/Makefile.am	Sat Jan 10 14:31:56 2009
@@ -1,7 +1,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)						\
-	-I$(top_srcdir)/brasero-media/					\
+	-I$(top_srcdir)/libbrasero-media/					\
 	-I$(top_builddir)					\
 	-I$(top_srcdir)/src					\
 	-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\

Modified: trunk/src/plugins/transcode/Makefile.am
==============================================================================
--- trunk/src/plugins/transcode/Makefile.am	(original)
+++ trunk/src/plugins/transcode/Makefile.am	Sat Jan 10 14:31:56 2009
@@ -1,7 +1,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)					\
-	-I$(top_srcdir)/brasero-media/					\
+	-I$(top_srcdir)/libbrasero-media/					\
 	-I$(top_builddir)				\
 	-I$(top_srcdir)/src				\
 	-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\

Modified: trunk/src/plugins/vcdimager/Makefile.am
==============================================================================
--- trunk/src/plugins/vcdimager/Makefile.am	(original)
+++ trunk/src/plugins/vcdimager/Makefile.am	Sat Jan 10 14:31:56 2009
@@ -1,7 +1,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)					\
-	-I$(top_srcdir)/brasero-media/					\
+	-I$(top_srcdir)/libbrasero-media/					\
 	-I$(top_builddir)				\
 	-I$(top_srcdir)/src				\
 	-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]