CVS:oo-deb/debian changelog,1.237,1.238 control,1.138,1.139 control.in,1.106,1.107 rules,1.166,1.167
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv1120/debian
Modified Files:
changelog control control.in rules
Log Message:
- fix -help Suggests: description
- remove uncommented gpc stuff from rules
- move -mimelnk to kde
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- rules 12 Nov 2003 12:33:28 -0000 1.166
+++ rules 17 Nov 2003 11:01:42 -0000 1.167
@@ -468,8 +468,6 @@
$(MAKE) -f debian/rules control
- #rm -rf $(SOURCE_TREE)/external/gpc
-
ifeq "$(USE_SYSTEM_STLPORT)" "y"
# making stlport home
if [ ! -d stlport-home ]; then \
@@ -600,13 +598,6 @@
dh_testdir
cd $(SOURCE_TREE); $(ARCH_PREFIX) ./bootstrap
-
- # Copy files needed when building with libgpc (this is non-free and
- # therefore not part of the official Debian packages)
- #mkdir -p $(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/inc/external/gpc
- #mkdir -p $(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib
- #cp /usr/include/gpcl/gpc.h $(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/inc/external/gpc
- #cp /usr/lib/libgpcl*.so $(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib
touch $@
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- control.in 12 Nov 2003 23:07:53 -0000 1.106
+++ control.in 17 Nov 2003 11:01:42 -0000 1.107
@@ -23,8 +23,7 @@
* x-ttcidfont-conf: Makes all defoma-registered fonts on your system
available to OpenOffice.org
* myspell-dictionary: Myspell dictionaries for use with OpenOffice.org
- * openoffice.org-help: User help; available in several languages from
- http://linux-debian.de/openoffice
+ * openoffice.org-help: User help
* openoffice.org-thesaurus: Thesauri for the use with OpenOffice.org
* openoffice.org-hyphenation: Hyphenation patterns for OpenOffice.org
* ooqstart-gnome/oooqs-kde: Quick start applet for Gnome/KDE desktops
@@ -60,6 +59,7 @@
Suggests: openoffice.org
Enhances: openoffice.org, koffice, kdebase
Conflicts: openoffice.org (<< 1.0.3-3)
+Section: kde
Description: OpenOffice.org MIME bindings for KDE
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- changelog 14 Nov 2003 10:26:22 -0000 1.237
+++ changelog 17 Nov 2003 11:01:42 -0000 1.238
@@ -68,6 +68,7 @@
- openoffice.org and -bin Replaces: openoffice.org-gnome [CH]
- openoffice.org Suggests: openoffice.org-gnome removed [CH]
- improve and actualize package descriptions [RE]
+ - move -mimlnk to kde [RE]
* debian/MANIFEST.powerpc:
- Remove python-core so powerpc doesn't have to be built with
IGNORE_MANIFEST_CHANGES=1 [CH]
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- control 12 Nov 2003 23:07:53 -0000 1.138
+++ control 17 Nov 2003 11:01:42 -0000 1.139
@@ -23,8 +23,7 @@
* x-ttcidfont-conf: Makes all defoma-registered fonts on your system
available to OpenOffice.org
* myspell-dictionary: Myspell dictionaries for use with OpenOffice.org
- * openoffice.org-help: User help; available in several languages from
- http://linux-debian.de/openoffice
+ * openoffice.org-help: User help
* openoffice.org-thesaurus: Thesauri for the use with OpenOffice.org
* openoffice.org-hyphenation: Hyphenation patterns for OpenOffice.org
* ooqstart-gnome/oooqs-kde: Quick start applet for Gnome/KDE desktops
@@ -60,6 +59,7 @@
Suggests: openoffice.org
Enhances: openoffice.org, koffice, kdebase
Conflicts: openoffice.org (<< 1.0.3-3)
+Section: kde
Description: OpenOffice.org MIME bindings for KDE
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
Reply to: