rev 3014 - trunk/packages/kdegraphics/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-01-29 14:35:59 +0000 (Sun, 29 Jan 2006)
New Revision: 3014

Added:
   trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r502992.diff
Removed:
   trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r484288.diff
   trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r490050.diff
   trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r494959.diff
Log:
Branch pulls for kdegraphics.


Deleted: trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r484288.diff

Deleted: trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r490050.diff

Deleted: trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r494959.diff

Added: trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r502992.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r502992.diff	2006-01-29 14:25:11 UTC (rev 3013)
+++ trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r502992.diff	2006-01-29 14:35:59 UTC (rev 3014)
@@ -0,0 +1,58 @@
+#DPATCHLEVEL=0
+--- kpdf/part.cpp	(.../tags/KDE/3.5.1/kdegraphics)	(revision 502992)
++++ kpdf/part.cpp	(.../branches/KDE/3.5/kdegraphics)	(revision 502992)
+@@ -697,6 +697,11 @@
+     KURL saveURL = KFileDialog::getSaveURL( url().isLocalFile() ? url().url() : url().fileName(), QString::null, widget() );
+     if ( saveURL.isValid() && !saveURL.isEmpty() )
+     {
++        if (saveURL == url())
++        {
++            KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) );
++            return;
++        }
+         if ( KIO::NetAccess::exists( saveURL, false, widget() ) )
+         {
+             if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), QString::null, i18n("Overwrite")) != KMessageBox::Continue)
+--- kpdf/configure.in.in	(.../tags/KDE/3.5.1/kdegraphics)	(revision 502992)
++++ kpdf/configure.in.in	(.../branches/KDE/3.5/kdegraphics)	(revision 502992)
+@@ -66,7 +66,7 @@
+ fi
+ 
+ dnl #### Check for FSEEK variants
+-AC_SYS_LARGEFILE
++KDE_CHECK_LARGEFILE
+ AC_FUNC_FSEEKO
+ AC_CHECK_FUNCS(fseek64, xpdf_cv_func_fseek64=yes, xpdf_cv_func_fseek64=no)
+ AC_CHECK_FUNCS(ftell64, xpdf_cv_func_ftell64=yes, xpdf_cv_func_ftell64=no)
+--- kuickshow/src/kuickshow.cpp	(.../tags/KDE/3.5.1/kdegraphics)	(revision 502992)
++++ kuickshow/src/kuickshow.cpp	(.../branches/KDE/3.5/kdegraphics)	(revision 502992)
+@@ -646,7 +646,7 @@
+     }
+ 
+     tryShowNextImage();
+-    fileWidget->trash(list, false, false);
++    fileWidget->trash(list, parent, false, false);
+ }
+ 
+ void KuickShow::tryShowNextImage()
+--- kamera/kcontrol/kamera.desktop	(.../tags/KDE/3.5.1/kdegraphics)	(revision 502992)
++++ kamera/kcontrol/kamera.desktop	(.../branches/KDE/3.5/kdegraphics)	(revision 502992)
+@@ -116,7 +116,7 @@
+ Name[br]=Kamera niverel
+ Name[bs]=Digitalna kamera
+ Name[ca]=Càmera digital
+-Name[cs]=Digitální kamera
++Name[cs]=Digitální fotoaparát
+ Name[cy]=Camera Digidol
+ Name[da]=Digitalt kamera
+ Name[de]=Digitalkamera
+--- kfile-plugins/raw/kfile_raw.desktop	(.../tags/KDE/3.5.1/kdegraphics)	(revision 502992)
++++ kfile-plugins/raw/kfile_raw.desktop	(.../branches/KDE/3.5/kdegraphics)	(revision 502992)
+@@ -14,6 +14,7 @@
+ Name[fi]=RAW-kuvatiedostot
+ Name[fr]=Fichiers bruts d'appareil photo numériques
+ Name[ga]=Comhaid Cheamara RAW
++Name[he]=קבצי מצלמה דיגיטלית גולמיים
+ Name[hu]=RAW-fájlok
+ Name[is]=RAW myndavélaskrár
+ Name[it]=File grezzi fotocamera digitale