CVS:oo-deb/debian changelog,1.370,1.371 rules,1.235,1.236

[Rene Engelhard <rene@gluck.debian.org>]

Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv21783

Modified Files:
	changelog rules 
Log Message:
- mention sysui-* changes
- include a copy of dh_desktop and run it during the build


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -d -r1.370 -r1.371
--- changelog	16 Oct 2004 16:16:36 -0000	1.370
+++ changelog	21 Oct 2004 07:32:44 -0000	1.371
@@ -3,15 +3,23 @@
    * New patches:
     - l10n-YTL.diff: backport tr_TR localedata patch from cws_srx645_trcurrency
       to add YTL (.tr currency as of 2005-01-01) support; make it default [RE]
+    - sysui-mimetypes.diff: add MimeType entries to the
+      .desktop files (closes: #272638) [RE]
+   * Modified patches:
+    - sysui-translations.diff: fix ca encoding, thanks Jordi Mallach
+      (closes: #275968)
    * debian/control.in:
      - remove Jan-Hendrik Palic from Uploaders: [RE]
    * 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]
 
- -- Rene Engelhard <rene@debian.org>  Sat, 16 Oct 2004 17:58:37 +0200
+ -- Rene Engelhard <rene@debian.org>  Thu, 21 Oct 2004 00:40:41 +0200
 
 openoffice.org (1.1.2-5) unstable; urgency=high
 

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- rules	14 Oct 2004 23:48:22 -0000	1.235
+++ rules	21 Oct 2004 07:32:44 -0000	1.236
@@ -1146,6 +1146,7 @@
 	debian/scripts/installoverrides
 	dh_link
 	dh_strip
+	./debian/scripts/dh_desktop
 	dh_compress
 	dh_fixperms
 	dh_installdeb