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

./packages/openofficeorg/3.1/experimental r1387: typo (or merge error?)



------------------------------------------------------------
revno: 1387
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2009-01-18 23:53:18 +0100
message:
  typo (or merge error?)
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2009-01-15 06:46:03 +0000
+++ b/changelog	2009-01-18 22:53:18 +0000
@@ -4,7 +4,7 @@
     - build without -march=armv5te for arm (closes: #501957)
     - lbnames.h supports gcc 4.4 (closes: #505669)
   * ooo-build:
-    - back on trunk (r15008)
+    - back on trunk (r15091)
       - updates openoffice.1 to remove --version (closes: #505768)
   * debian/shlibs.override.icu: update for new icu
   * debian/shlibs.override.xmlsec: remove, xmlsec went static
@@ -30,7 +30,7 @@
   * debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
     OOo now has one upstream
 
- -- Rene Engelhard <rene@debian.org>  Tue, 06 Jan 2009 16:06:56 +0100
+ -- Rene Engelhard <rene@debian.org>  Fri, 16 Jan 2009 18:03:40 +0100
 
 openoffice.org (1:3.0.1~rc2-1.2pre) experimental; urgency=low
 

=== modified file 'rules'
--- a/rules	2009-01-15 06:46:03 +0000
+++ b/rules	2009-01-18 22:53:18 +0000
@@ -3153,7 +3153,7 @@
 	perl -pi -e 's,html/,html /,g' debian/openoffice.org-dev-doc.doc-base.udk-common-ref
 endif
 	dh_installdocs -i -A debian/README.Debian \
-		$(SOURCE_TREE)/instsetoo_native/util/OpenOffice/replace_file/*/00/README }
+		$(SOURCE_TREE)/instsetoo_native/util/OpenOffice/replace_file/*/00/README \
 		ooo-build/NEWS
 	dh_installman -i
 	for i in `find $(PKGDIR)-common -type l -name "o*.1"`; do \


Reply to: