SVN commit 781438 by kebekus:

rename files to avoid conflicts with kdegraphics installation


 M  +5 -5      djvu/Makefile.am  
 D             djvu/djvumultipage.desktop  
 D             djvu/djvumultipage.rc  
 D             djvu/libdjvu (directory)  
 A             djvu/libligaturedjvu (directory)   djvu/libdjvu#781209
 M  +4 -4      djvu/libligaturedjvu/Makefile.am  
 A             djvu/ligaturePlugin_djvu.desktop   djvu/djvumultipage.desktop#781209
 A             djvu/ligaturePlugin_djvu.rc   djvu/djvumultipage.rc#781209
 M  +1 -1      dvi/Makefile.am  
 D             dvi/kdvimultipage.desktop  
 A             dvi/ligaturePlugin_dvi.desktop   dvi/kdvimultipage.desktop#781209
 M  +1 -1      fax/Makefile.am  
 D             fax/kfaxmultipage.desktop  
 A             fax/ligaturePlugin_fax.desktop   fax/kfaxmultipage.desktop#781209


--- branches/work/kviewshell-0.7/plugins/djvu/Makefile.am #781437:781438
@@ -2,16 +2,16 @@
 	-I$(top_srcdir)/ligature/shell \
 	-I$(top_builddir)/ligature/shell \
 	-I$(kde_includes)/ligature \
-	-I$(srcdir)/libdjvu
+	-I$(srcdir)/libligaturedjvu
 
-SUBDIRS = libdjvu .
+SUBDIRS = libligaturedjvu .
 
 KDE_CXXFLAGS = -Wno-deprecated
 
 METASOURCES = AUTO
 
 # this is where the desktop file will go
-kde_services_DATA = djvumultipage.desktop
+kde_services_DATA = ligaturePlugin_djvu.desktop
 
 # this is where the shell's XML-GUI resource file goes
 shellrcdir = $(kde_datadir)/plugins/djvu
@@ -19,7 +19,7 @@
 kde_module_LTLIBRARIES = ligaturePlugin_DJVU.la
 ligaturePlugin_DJVU_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 ligaturePlugin_DJVU_la_LIBADD = -lkdeprint -lkparts $(top_builddir)/ligature/shell/libligaturePluginGUI.la \
-	libdjvu/libdjvu.la
+	libligaturedjvu/libligaturedjvu.la
 ligaturePlugin_DJVU_la_SOURCES = djvumultipage.cpp djvurenderer.cpp kprintDialogPage_DJVUpageoptions.cpp \
 	kprintDialogPage_DJVUconversionoptions.cpp kprintDialogPage_DJVUconversionoptions_basewidget.ui \
 	pageInsertionWidget.cpp	pageInsertionWidget_base.ui pageRangeWidget_base.ui pageRangeWidget.cpp \
@@ -28,7 +28,7 @@
 kde_kcfg_DATA = djvumultipage.kcfg
 
 pluginsdir = $(kde_datadir)
-plugins_DATA = djvumultipage.rc
+plugins_DATA = ligaturePlugin_djvu.rc
 
 partdesktopdir = $(kde_servicesdir)
 partdesktop_DATA = kvs_djvu_part.desktop
--- branches/work/kviewshell-0.7/plugins/djvu/libligaturedjvu/Makefile.am #781209:781438
@@ -1,9 +1,9 @@
 INCLUDES = -I$(top_srcdir) $(all_includes)
 
-kde_module_LTLIBRARIES = libdjvu.la
-libdjvu_la_LDFLAGS = -avoid-version $(all_libraries)
-libdjvu_la_LIBADD = $(LIBJPEG)
-libdjvu_la_SOURCES = Arrays.cpp DjVuDocEditor.cpp DjVuMessageLite.cpp GOS.cpp IW44Image.cpp \
+kde_module_LTLIBRARIES = libligaturedjvu.la
+libligaturedjvu_la_LDFLAGS = -avoid-version $(all_libraries)
+libligaturedjvu_la_LIBADD = $(LIBJPEG)
+libligaturedjvu_la_SOURCES = Arrays.cpp DjVuDocEditor.cpp DjVuMessageLite.cpp GOS.cpp IW44Image.cpp \
 	BSByteStream.cpp DjVuDocument.cpp DjVuNavDir.cpp GPixmap.cpp JB2EncodeCodec.cpp \
 	BSEncodeByteStream.cpp DjVuDumpHelper.cpp DjVuPalette.cpp GRect.cpp JB2Image.cpp \
 	ByteStream.cpp DjVuErrorList.cpp DjVuPort.cpp GScaler.cpp JPEGDecoder.cpp \
--- branches/work/kviewshell-0.7/plugins/dvi/Makefile.am #781437:781438
@@ -68,7 +68,7 @@
 plugindir = $(kde_datadir)
 plugin_DATA = kdvi_part.rc
 
-kde_services_DATA = kdvimultipage.desktop
+kde_services_DATA = ligaturePlugin_dvi.desktop
 
 partdesktopdir = $(kde_servicesdir)
 partdesktop_DATA = kvs_dvi_part.desktop
--- branches/work/kviewshell-0.7/plugins/fax/Makefile.am #781437:781438
@@ -7,7 +7,7 @@
 METASOURCES = AUTO
 
 # this is where the desktop file will go
-kde_services_DATA = kfaxmultipage.desktop
+kde_services_DATA = ligaturePlugin_fax.desktop
 
 # this is where the shell's XML-GUI resource file goes
 shellrcdir = $(kde_datadir)/plugins/fax