[Pkg-kde-commits] rev 579 - in branches/kde-3.4.0/packages/kdegraphics/debian: . patches
Adeodato Simó
dato-guest@costa.debian.org
Thu, 03 Mar 2005 03:53:16 +0100
Author: dato-guest
Date: 2005-03-03 03:53:15 +0100 (Thu, 03 Mar 2005)
New Revision: 579
Added:
branches/kde-3.4.0/packages/kdegraphics/debian/patches/01_kdegraphics_branch_2005-03-02.diff
Removed:
branches/kde-3.4.0/packages/kdegraphics/debian/patches/11_ksvgplugin-bump-preference.diff
Modified:
branches/kde-3.4.0/packages/kdegraphics/debian/changelog
branches/kde-3.4.0/packages/kdegraphics/debian/ksvg.install
branches/kde-3.4.0/packages/kdegraphics/debian/patches/10_correct-nedit-invocation.diff
Log:
- 3.4 branch pull.
- rediff 10_*diff
- remove 11_*diff
- sort ksvg.install
Modified: branches/kde-3.4.0/packages/kdegraphics/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/changelog 2005-03-03 02:21:58 UTC (rev 578)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/changelog 2005-03-03 02:53:15 UTC (rev 579)
@@ -1,3 +1,16 @@
+kdegraphics (4:3.4.0-1~rc1) experimental; urgency=low
+
+ * First release candidate for the upcoming KDE 3.4 release.
+
+ +++ Changes by Adeodato Simó:
+
+ * Switch to CDBS for packaging.
+
+ * Removed patches (applied upstream):
+ - 11_ksvgplugin-bump-preference.diff
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 3 Mar 2005 03:33:15 +0100
+
kdegraphics (4:3.3.2-1) unstable; urgency=high
+++ Changes by Adeodato Simó:
Modified: branches/kde-3.4.0/packages/kdegraphics/debian/ksvg.install
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/ksvg.install 2005-03-03 02:21:58 UTC (rev 578)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/ksvg.install 2005-03-03 02:53:15 UTC (rev 579)
@@ -1,3 +1,4 @@
+debian/extra/svg-xml.desktop /usr/share/mimelnk/image
debian/tmp/usr/bin/printnodetest
debian/tmp/usr/bin/svgdisplay
debian/tmp/usr/lib/kde3/libksvgplugin.la
@@ -15,4 +16,3 @@
debian/tmp/usr/share/services/ksvgplugin.desktop
debian/tmp/usr/share/services/svgthumbnail.desktop
debian/tmp/usr/share/servicetypes/ksvgrenderer.desktop
-debian/extra/svg-xml.desktop /usr/share/mimelnk/image
Added: branches/kde-3.4.0/packages/kdegraphics/debian/patches/01_kdegraphics_branch_2005-03-02.diff
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/patches/01_kdegraphics_branch_2005-03-02.diff 2005-03-03 02:21:58 UTC (rev 578)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/patches/01_kdegraphics_branch_2005-03-02.diff 2005-03-03 02:53:15 UTC (rev 579)
@@ -0,0 +1,132 @@
+diff -u -Nru -x CVS kdegraphics_3_4_0_RELEASE/admin/am_edit kdegraphics_3_4_BRANCH/admin/am_edit
+--- kdegraphics_3_4_0_RELEASE/admin/am_edit 2005-03-03 03:49:48.312845486 +0100
++++ kdegraphics_3_4_BRANCH/admin/am_edit 2005-03-01 19:46:09.000000000 +0100
+@@ -483,6 +483,7 @@
+ $MakefileData =~ s/$lookup/$replacement/;
+ $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
+ $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after";
++ next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ /\$\(KDE_CXXFLAGS\)/);
+ substituteLine($lookup, $replacement);
+ } else {
+ $found = 0;
+@@ -2276,7 +2277,7 @@
+ "\t echo \"\$\$i\"; \\\n" .
+ "\t if ! ";
+ $t .= $cxxsuffix eq "KKK" ?
+- "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
++ "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " :
+ "\$(CXXCOMPILE) ";
+ $t .= " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
+ "\t rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
+@@ -2352,7 +2353,7 @@
+ $MakefileData =~ s/\034/\\\n/g; # Restore continuation lines
+ # Append our $progId line, _below_ the "generated by automake" line
+ # because automake-1.6 relies on the first line to be his own.
+- my $progIdLine = "\# $progId - " . '$Revision: 1.412 $ '."\n";
++ my $progIdLine = "\# $progId - " . '$Revision: 1.412.6.2 $ '."\n";
+ if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
+ warn "automake line not found in $makefile\n";
+ # Fallback: first line
+diff -u -Nru -x CVS kdegraphics_3_4_0_RELEASE/kiconedit/kiconedit.cpp kdegraphics_3_4_BRANCH/kiconedit/kiconedit.cpp
+--- kdegraphics_3_4_0_RELEASE/kiconedit/kiconedit.cpp 2005-03-03 03:49:49.701607499 +0100
++++ kdegraphics_3_4_BRANCH/kiconedit/kiconedit.cpp 2005-02-25 17:10:48.000000000 +0100
+@@ -52,7 +52,7 @@
+
+ void KIconEdit::init()
+ {
+- setMinimumSize( 600, 500 );
++ setMinimumSize( 600, 540 );
+
+ windowList.append(this);
+ setCaption(kapp->caption());
+diff -u -Nru -x CVS kdegraphics_3_4_0_RELEASE/kpdf/core/document.cpp kdegraphics_3_4_BRANCH/kpdf/core/document.cpp
+--- kdegraphics_3_4_0_RELEASE/kpdf/core/document.cpp 2005-03-03 03:49:50.091540677 +0100
++++ kdegraphics_3_4_BRANCH/kpdf/core/document.cpp 2005-02-28 20:38:00.000000000 +0100
+@@ -925,11 +925,20 @@
+ kapp->invokeMailer( browse->url() );
+ else
+ {
++ QString url = browse->url();
++
++ // fix for #100366, documents with relative links that are the form of http:foo.pdf
++ if (url.find("http:") == 0 && url.find("http://") == -1 && url.right(4) == ".pdf")
++ {
++ openRelativeFile(url.mid(5));
++ return;
++ }
++
+ // get service for web browsing
+ KService::Ptr ptr = KServiceTypeProfile::preferredService("text/html", "Application");
+ KURL::List lst;
+ // append 'url' parameter to the service and run it
+- lst.append( browse->url() );
++ lst.append( url );
+ KRun::run( *ptr, lst );
+ }
+ } break;
+diff -u -Nru -x CVS kdegraphics_3_4_0_RELEASE/kpdf/core/generator_pdf/generator_pdf.cpp kdegraphics_3_4_BRANCH/kpdf/core/generator_pdf/generator_pdf.cpp
+--- kdegraphics_3_4_0_RELEASE/kpdf/core/generator_pdf/generator_pdf.cpp 2005-03-03 03:49:50.100539135 +0100
++++ kdegraphics_3_4_BRANCH/kpdf/core/generator_pdf/generator_pdf.cpp 2005-02-28 20:06:52.000000000 +0100
+@@ -13,6 +13,8 @@
+ #include <qevent.h>
+ #include <qimage.h>
+ #include <qapplication.h>
++#include <qpaintdevicemetrics.h>
++#include <qregexp.h>
+ #include <klocale.h>
+ #include <kpassdlg.h>
+ #include <kprinter.h>
+@@ -296,6 +298,28 @@
+
+ bool PDFGenerator::print( KPrinter& printer )
+ {
++ QString ps = printer.option("PageSize");
++ if (ps.find(QRegExp("w\\d+h\\d+")) == 0)
++ {
++ // size not supported by Qt, KPrinter gives us the size as wWIDTHhHEIGHT
++ // remove the w
++ ps = ps.mid(1);
++ int hPos = ps.find("h");
++ globalParams->setPSPaperWidth(ps.left(hPos).toInt());
++ globalParams->setPSPaperHeight(ps.mid(hPos+1).toInt());
++ }
++ else
++ {
++ // size is supported by Qt, we get either the pageSize name or nothing because the default pageSize is used
++ QPrinter dummy(QPrinter::PrinterResolution);
++ dummy.setFullPage(true);
++ dummy.setPageSize((QPrinter::PageSize)(ps.isEmpty() ? KGlobal::locale()->pageSize() : pageNameToPageSize(ps)));
++
++ QPaintDeviceMetrics metrics(&dummy);
++ globalParams->setPSPaperWidth(metrics.width());
++ globalParams->setPSPaperHeight(metrics.height());
++ }
++
+ KTempFile tf( QString::null, ".ps" );
+ PSOutputDev *psOut = new PSOutputDev(tf.name().latin1(), pdfdoc->getXRef(), pdfdoc->getCatalog(), 1, pdfdoc->getNumPages(), psModePS);
+
+diff -u -Nru -x CVS kdegraphics_3_4_0_RELEASE/kpovmodeler/pmshell.cpp kdegraphics_3_4_BRANCH/kpovmodeler/pmshell.cpp
+--- kdegraphics_3_4_0_RELEASE/kpovmodeler/pmshell.cpp 2005-03-03 03:49:52.778080293 +0100
++++ kdegraphics_3_4_BRANCH/kpovmodeler/pmshell.cpp 2005-02-25 16:52:54.000000000 +0100
+@@ -57,6 +57,9 @@
+ m_viewNumber = 0;
+ m_objectsToDelete.setAutoDelete( true );
+
++ if (!initialGeometrySet())
++ resize(800,600);
++
+ setupActions( );
+
+ restoreOptions( );
+diff -u -Nru -x CVS kdegraphics_3_4_0_RELEASE/kview/kview.cpp kdegraphics_3_4_BRANCH/kview/kview.cpp
+--- kdegraphics_3_4_0_RELEASE/kview/kview.cpp 2005-03-03 03:49:56.287478898 +0100
++++ kdegraphics_3_4_BRANCH/kview/kview.cpp 2005-02-25 16:34:40.000000000 +0100
+@@ -106,6 +106,8 @@
+ connect( m_pCanvas->widget(), SIGNAL( cursorPos( const QPoint & ) ), SLOT( cursorPos( const QPoint & ) ) );
+
+ m_paRecent->loadEntries( KGlobal::config() );
++ if (!initialGeometrySet())
++ resize(500, 350);
+ readSettings();
+ m_pViewer->widget()->installEventFilter( this );
+
Modified: branches/kde-3.4.0/packages/kdegraphics/debian/patches/10_correct-nedit-invocation.diff
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/patches/10_correct-nedit-invocation.diff 2005-03-03 02:21:58 UTC (rev 578)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/patches/10_correct-nedit-invocation.diff 2005-03-03 02:53:15 UTC (rev 579)
@@ -1,6 +1,6 @@
--- kdegraphics-orig/kdvi/optionDialogSpecialWidget.cpp
+++ kdegraphics-patched/kdvi/optionDialogSpecialWidget.cpp
-@@ -51,7 +51,7 @@
+@@ -44,7 +44,7 @@
editorDescriptionString += i18n("Kile works very well");
editorNameString += "NEdit";
Deleted: branches/kde-3.4.0/packages/kdegraphics/debian/patches/11_ksvgplugin-bump-preference.diff