[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] OpenOffice.org packaging repository branch, ubuntu-natty-3.3.1, updated. b872adbc575010a90e3de82c64f95faa2279215f



The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit b872adbc575010a90e3de82c64f95faa2279215f
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Thu Mar 10 17:52:46 2011 +0100

    update changelog for 1:3.3.0-7ubuntu1, regenerate preinst hooks

diff --git a/changelog b/changelog
index 18cea49..2c0b613 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+openoffice.org (1:3.3.0-7ubuntu1) natty; urgency=low
+
+  * Merged all all changes up to 3.3.0-7. Remaining changes:
+    - preinst hooks for removal of /usr/share/doc symlinks
+  * Regenerated preinst hooks
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Thu, 10 Mar 2011 17:49:01 +0100
+
 openoffice.org (1:3.3.0-7) unstable; urgency=low
 
   * add oo* symlinks (closes: #614840) 
diff --git a/openoffice.org-base.preinst b/docvert-openoffice.org.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to docvert-openoffice.org.preinst
diff --git a/openoffice.org-base.preinst b/mozilla-openoffice.org.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to mozilla-openoffice.org.preinst
diff --git a/openoffice.org-base.preinst b/openclipart-openoffice.org.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openclipart-openoffice.org.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-dmaths.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-dmaths.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-hyphenation-af.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-hyphenation-af.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-hyphenation-ca.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-hyphenation-ca.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-hyphenation-de.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-hyphenation-de.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-hyphenation-en-us.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-hyphenation-en-us.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-hyphenation-fr.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-hyphenation-fr.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-hyphenation-hu.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-hyphenation-hu.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-hyphenation-it.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-hyphenation-it.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-hyphenation-ro.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-hyphenation-ro.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-hyphenation-sh.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-hyphenation-sh.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-hyphenation-sl.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-hyphenation-sl.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-hyphenation-sr.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-hyphenation-sr.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-hyphenation-zu.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-hyphenation-zu.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-thesaurus-ca.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-thesaurus-ca.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-thesaurus-cs.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-thesaurus-cs.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-thesaurus-de-ch.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-thesaurus-de-ch.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-thesaurus-de.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-thesaurus-de.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-thesaurus-en-us.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-thesaurus-en-us.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-thesaurus-fr.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-thesaurus-fr.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-thesaurus-hu.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-thesaurus-hu.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-thesaurus-ne.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-thesaurus-ne.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-thesaurus-ro.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-thesaurus-ro.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-thesaurus-ru.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-thesaurus-ru.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-thesaurus-sk.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-thesaurus-sk.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-voikko.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-voikko.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-writer2latex.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-writer2latex.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-writer2xhtml.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-writer2xhtml.preinst
diff --git a/openoffice.org-base.preinst b/openoffice.org-zemberek.preinst
similarity index 100%
copy from openoffice.org-base.preinst
copy to openoffice.org-zemberek.preinst

-- 
OpenOffice.org packaging repository


Reply to: