CVS:oo-deb/debian rules,1.214.2.14.2.12,1.214.2.14.2.13
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv11280
Modified Files:
Tag: OPENOFFICE_ORG680
rules
Log Message:
change lines with only tabs to blank lines to stop emacs whining...
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.14.2.12
retrieving revision 1.214.2.14.2.13
diff -u -d -r1.214.2.14.2.12 -r1.214.2.14.2.13
--- rules 21 Jan 2005 22:46:51 -0000 1.214.2.14.2.12
+++ rules 28 Jan 2005 15:06:27 -0000 1.214.2.14.2.13
@@ -148,7 +148,7 @@
fi ;\
rm -f $$f ;\
done
-
+
dh_clean
# Files created in debian directory
@@ -230,7 +230,7 @@
$(STAMP_DIR)/install: $(STAMP_DIR)/build
dh_testdir
dh_testroot
-
+
rm -rf $(CURDIR)/debian/tmp
cd ooo-build ; DESTDIR=$(CURDIR)/debian/tmp $(MAKE) install
touch $@
@@ -284,7 +284,7 @@
cp -r --preserve=mode debian/tmp/pkg/openoffice.org-common/usr/lib/openoffice$(VER)/$$dir/* \
$(PKGDIR)-l10n-en-us/$(OODIR)/$$dir || exit 1;\
done
-
+
touch $@
@@ -302,14 +302,14 @@
rm -rf $(PKGDIR)-$$i $(PKGDIR)-$$i.*.debhelper ;\
cp -r --preserve=mode debian/tmp/pkg/openoffice.org-$$i $(PKGDIR)-$$i || exit 1;\
done
-
+
for i in "" -kde -gnome -evolution; do \
rm -rf $(PKGDIR)$$i $(PKGDIR)$$i.*.debhelper ;\
done
dh_installdirs -a
#dh_install $(DEBHELPER_OPTIONS) --sourcedir=debian/tmp -a
-
+
mkdir -p -m755 $(PKGDIR)-kde/$(OODIR)/program
mkdir -p -m755 $(PKGDIR)-gnome/$(OODIR)/program
mkdir -p -m755 $(PKGDIR)-evolution/$(OODIR)/program
@@ -320,7 +320,7 @@
mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
done
mv $(PKGDIR)-core/$(OODIR)/program/libevoab2.so $(PKGDIR)-evolution/$(OODIR)/program
-
+
# Nasy menu icons hack, urgently needs better version
dirname="`cd ooo-build/build/src680-m$(MILESTONE)/sysui/unx*.pro/misc/gnome; pwd`" ;\
for p in writer calc impress draw math; do \
@@ -331,10 +331,10 @@
< $$dirname/ooo680$$p.desktop \
> $(PKGDIR)-$$p/usr/share/applications/ooo$(VER)-$$p.desktop ;\
done
-
+
touch $@
-
-
+
+
# TODO If building with a JDK, install the additional files to be diverted
ifeq "$(USE_JAVA)" "y"
. debian/java-lib.sh ;\
@@ -352,7 +352,7 @@
#$(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/bin/regcomp \
#$(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/bin/configimport.bin \
# $(PKGDIR)-bin/$(OPENOFFICEDIR)/program
-
+
touch $@
# Install files generated by setup into arch-independent package directories
@@ -424,7 +424,7 @@
# install info file for update-openoffice-dicts
#install -m644 debian/dictlistinfo \
# $(PKGDIR)-thesaurus-en-us/usr/share/myspell/infos/ooo/openoffice.org$(VER)-thesaurus-en-us
-
+
# this is a hack. it is needed to get the dictionaries hook
# notice that we have a newer OOo and do not need to change
# dictionary.lst
@@ -528,7 +528,7 @@
@echo '$$(BUILDLANG),$$(BUILDLANG_PREFIX)' is "$(BUILDLANG),$(BUILDLANG_PREFIX)"
@echo '$$(USE_INTERNAL_FREETYPE)' is "$(USE_INTERNAL_FREETYPE)"
@echo '$$(DEBHELPER_OPTIONS)' is "$(DEBHELPER_OPTIONS)"
-
+
@echo 'See debian/control for build dependencies.'
# Get the ximian packaging directory from gnome anoncvs
@@ -559,7 +559,7 @@
-not -name ooo-build -not -name debian -not -name $(SOURCE_TREE)\
-not -name tmp.source.unpack -not -name tmp.oldsource \
-exec mv {} $(SOURCE_TREE)/tmp.oldsource \;
-
+
rm -rf $(SOURCE_TREE)/tmp.oldsource
tar -C $(SOURCE_TREE)/tmp.source.unpack -zxf ../openoffice.org_$(UPSTREAM_VERSION).orig.tar.gz
mv $(SOURCE_TREE)/tmp.source.unpack/*/* $(SOURCE_TREE)
Reply to: