[Libreoffice-commits] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                         |    2 --
 patches/dev300/scp2_add_additional_dirs.diff |   23 -----------------------
 2 files changed, 25 deletions(-)

New commits:
commit 1887c7d0c237e92d8397099576368e7ff6e2add9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Nov 30 18:11:54 2010 +0200

    scp2_add_additional_dirs.diff seems to be in git now

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b075af4..06a9804 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -750,8 +750,6 @@ office-cfg-linux-common-template-dir.diff, pmladek
 # add new category "Labels" for blank Labels, calling cards, CD labels, etc.
 # will not push it upstream because it will be obsoleted by upcomming kendy's work
 sfx2-template-category-labels.diff, pmladek
-# add labels folder to scp2 module too
-scp2_add_additional_dirs.diff, kami
 
 [ DebianBaseOnly ]
 sensible-ooomua.diff
diff --git a/patches/dev300/scp2_add_additional_dirs.diff b/patches/dev300/scp2_add_additional_dirs.diff
deleted file mode 100644
index a240037..0000000
--- a/patches/dev300/scp2_add_additional_dirs.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- scp2/source/ooo/directory_ooo.scp |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git scp2/source/ooo/directory_ooo.scp scp2/source/ooo/directory_ooo.scp
-index 6b53469..4724f90 100644
---- scp2/source/ooo/directory_ooo.scp
-+++ scp2/source/ooo/directory_ooo.scp
-@@ -995,6 +995,11 @@ Directory gid_Dir_Template_Forms
-     DIR_IDENT_ALL_LANG(forms);
- End
- 
-+Directory gid_Dir_Template_Labels
-+    ParentID = gid_Dir_Template_Language;
-+    DIR_IDENT_ALL_LANG(labels);
-+End
-+
- Directory gid_Dir_Template_Layout
-     ParentID = gid_Dir_Template_Language;
-     DIR_IDENT_ALL_LANG(layout);
--- 
-1.7.0.1
-