[Pkg-kde-commits] rev 2191 - trunk/packages/koffice/debian/patches

[Isaac Clerencia]

Author: isaac
Date: 2005-11-11 13:35:09 +0000 (Fri, 11 Nov 2005)
New Revision: 2191

Modified:
   trunk/packages/koffice/debian/patches/01_koffice_branch_r479651.diff
Log:
Fix weirdness in the branch pull


Modified: trunk/packages/koffice/debian/patches/01_koffice_branch_r479651.diff
===================================================================
--- trunk/packages/koffice/debian/patches/01_koffice_branch_r479651.diff	2005-11-11 13:22:55 UTC (rev 2190)
+++ trunk/packages/koffice/debian/patches/01_koffice_branch_r479651.diff	2005-11-11 13:35:09 UTC (rev 2191)
@@ -724,14 +724,6 @@
      gs.addProperty( "style:text-position", textPos, tt );
  
      if ( m_attributeFont == ATT_SMALL_CAPS )
---- Makefile.cvs	(.../tags/koffice/1.4.2/koffice)	(revision 479651)
-+++ Makefile.cvs	(.../branches/koffice/1.4/koffice)	(revision 479651)
-@@ -1,4 +1,4 @@
--# $Id$
-+# $Id: Makefile.cvs 16192 1999-01-30 23:14:41Z garbanzo $
- 
- all: 
- 	@echo "This Makefile is only for the CVS repository"
 --- filters/kspread/html/htmlexport.cc	(.../tags/koffice/1.4.2/koffice)	(revision 479651)
 +++ filters/kspread/html/htmlexport.cc	(.../branches/koffice/1.4/koffice)	(revision 479651)
 @@ -34,6 +34,7 @@