rev 2976 - in kde-extras/kipi-plugins/trunk/debian: . patches
Tom Albers
tomalbers-guest at costa.debian.org
Sun Jan 22 13:28:02 UTC 2006
Author: tomalbers-guest
Date: 2006-01-22 13:28:00 +0000 (Sun, 22 Jan 2006)
New Revision: 2976
Modified:
kde-extras/kipi-plugins/trunk/debian/changelog
kde-extras/kipi-plugins/trunk/debian/patches/13_10_pull_from_upstreamsvn_from_r460242.diff
Log:
Two commits from upstream to the new simpleviewer plugin should be included in the pull from svn patch
Modified: kde-extras/kipi-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/changelog 2006-01-22 13:23:24 UTC (rev 2975)
+++ kde-extras/kipi-plugins/trunk/debian/changelog 2006-01-22 13:28:00 UTC (rev 2976)
@@ -19,6 +19,8 @@
which is a complete pull from upstream svn since the release candidate.
It consists some important fixes for printing and prevents a crash in
imagegallery. It also includes the new simpleviewerexport plugin.
+ * added r501143 and r501136 to that patch, to make the new plugin work
+ in konqueror and remove faulty flash detect lines
[ Mark Purcell ]
* Add debian/watch: sf.net kipi project will be used for
Modified: kde-extras/kipi-plugins/trunk/debian/patches/13_10_pull_from_upstreamsvn_from_r460242.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/13_10_pull_from_upstreamsvn_from_r460242.diff 2006-01-22 13:23:24 UTC (rev 2975)
+++ kde-extras/kipi-plugins/trunk/debian/patches/13_10_pull_from_upstreamsvn_from_r460242.diff 2006-01-22 13:28:00 UTC (rev 2976)
@@ -1641,7 +1641,6 @@
--- kipi-plugins/simpleviewerexport/index.template (revision 0)
+++ kipi-plugins/simpleviewerexport/index.template (revision 498544)
@@ -0,0 +1,116 @@
-+aved from url=(0014)about:internet -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+ <head>
@@ -1686,23 +1685,6 @@
+ -->
+ </style>
+
-+ <script language="javascript" type="text/javascript" src="flash_detect.js">
-+ <!--
-+ function getFlashVersion() { return null; };
-+ //-->
-+ </script>
-+ <script language="javascript" type="text/javascript">
-+ <!--
-+ var flashVersion = getFlashVersion();
-+ if (flashVersion < 6) {
-+
-+ location.replace("upgrade.html");
-+ }
-+
-+ // set document title (strip any html tags)
-+ document.title = title.replace(/(<([^>]+)>)/ig,"");
-+ //-->
-+ </script>
+ </head>
+ <body>
+ <div id="mainlayer" style="visibility: visible; position:absolute; top: 0; left: 0; width: 100%; height: 100%; z-index:1;">
More information about the pkg-kde-commits
mailing list