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

[hunspell] 32/98: Imported Debian patch 1.1.5-6



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository hunspell.

commit 7f4a40b1bb859bc275aeb642f148d6a59993cf88
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Apr 13 15:07:53 2007 +0200

    Imported Debian patch 1.1.5-6
---
 debian/changelog | 7 +++++++
 debian/control   | 1 +
 debian/rules     | 1 +
 3 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5f6854f..44196b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hunspell (1.1.5-6) unstable; urgency=low
+
+  * add (normally not needed) conflicts against old experimentals OOo
+    (see #416711)
+
+ -- Rene Engelhard <rene@debian.org>  Fri, 13 Apr 2007 15:07:53 +0200
+
 hunspell (1.1.5-5) unstable; urgency=low
 
   * add info to hunspell(4) from SF tracker #1610863 how to convert aspell
diff --git a/debian/control b/debian/control
index b6f4f7d..6c6f292 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,7 @@ Package: libhunspell-1.1-0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: openoffice.org-core (= 2.2.0~rc2-1)
 Description: spell checker and morphological analyzer (shared library)
  Hunspell is a spell checker and morphological analyzer library and program
  designed for languages with rich morphology and complex word compounding or
diff --git a/debian/rules b/debian/rules
index 8b687cb..252ff27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,6 +59,7 @@ clean:
 	-$(MAKE) distclean
 	./debian/rules unpatch
 	rm -f debian/ispellaff2myspell.1
+	rm -f config.log
 
 	dh_clean 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hunspell.git


Reply to: