CVS:oo-deb/debian desktop-lib.sh,NONE,1.1 changelog,1.371,1.372 rules,1.236,1.237
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv24152
Modified Files:
changelog rules
Added Files:
desktop-lib.sh
Log Message:
exchange that we-ship-an-own-dh_desktop-solution (not working, thanks Chris) though adding the snippets into desktop-lib.sh and add that to openoffice.org's postinst/postrm
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -d -r1.371 -r1.372
--- changelog 21 Oct 2004 07:32:44 -0000 1.371
+++ changelog 21 Oct 2004 15:28:35 -0000 1.372
@@ -13,13 +13,12 @@
* debian/rules:
- add LIBSUFFIX as defined in debian/scripts/vars.$(ARCH) to the
maintainer scripts
- - run a included copy of dh_desktop (because it is not yet in sarge
- and woody backports would break, too) [RE]
* debian/java-lib.sh: use ${LIBSUFFIX} instead of hardcoded li to
make it work on !i386
- * debian/scripts/dh_desktop: add, from debhelper 4.2.21 [RE]
+ * debian/desktop-lib.sh: add, run update-desktop-database -q in
+ postinst and postrm [RE]
- -- Rene Engelhard <rene@debian.org> Thu, 21 Oct 2004 00:40:41 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 21 Oct 2004 17:26:34 +0200
openoffice.org (1.1.2-5) unstable; urgency=high
--- NEW FILE: desktop-lib.sh ---
if [ "$THIS_PACKAGE" = "openoffice.org" ] && [ "$1" = "configure" ] && which update-desktop-database >/dev/null 2>&1 ; then
update-desktop-database -q
fi
if [ "$THIS_PACKAGE" = "openoffice.org" ] && [ "$1" = "remove" ] && which update-desktop-database >/dev/null 2>&1 ; then
update-desktop-database -q
fi
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -d -r1.236 -r1.237
--- rules 21 Oct 2004 07:32:44 -0000 1.236
+++ rules 21 Oct 2004 15:28:35 -0000 1.237
@@ -807,6 +807,9 @@
echo THIS_PACKAGE=$$PKG >> $$MAINTSCRIPT ;\
echo THIS_SCRIPT=$$FILE >> $$MAINTSCRIPT ;\
cat debian/shell-lib.sh >> $$MAINTSCRIPT; \
+ if [ $$PKG = openoffice.org ]; then \
+ cat debian/desktop-lib.sh >> $$MAINTSCRIPT ; \
+ fi ; \
fi; \
done; \
done
@@ -1146,7 +1149,6 @@
debian/scripts/installoverrides
dh_link
dh_strip
- ./debian/scripts/dh_desktop
dh_compress
dh_fixperms
dh_installdeb
Reply to: