[hyphen] 03/29: Imported Debian patch 2.3-3
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hyphen.
commit ae98f3913e7c607cb3fe70db866c2607c3ff6e08
Author: Rene Engelhard <rene@debian.org>
Date: Fri Nov 30 13:35:13 2007 +0100
Imported Debian patch 2.3-3
---
debian/changelog | 10 ++++++++++
debian/control | 2 +-
debian/rules | 8 +++++++-
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 960ecfe..452986d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+hyphen (2.3-3) unstable; urgency=low
+
+ * also add -lhnj compatibility links. Make libhnj_pic.a point to
+ libhyphen.so. Needed to not break OOo builds until OOo hasn't
+ -lhnj/-lhnj_pic in their makefiles anymore and to make it a real
+ drop-in replacement for libaltlinuxhyph-dev (which libhyphen-dev
+ conflicts/provides/replaces). Conflict against libhnj-dev
+
+ -- Rene Engelhard <rene@debian.org> Fri, 30 Nov 2007 13:35:13 +0100
+
hyphen (2.3-2) unstable; urgency=low
* fix hyph_en_US.dics installation...
diff --git a/debian/control b/debian/control
index c1d7c42..cbc0dd7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Package: libhyphen-dev
Section: libdevel
Architecture: any
Depends: libhyphen0 (= ${binary:Version})
-Conflicts: libaltlinuxhyph-dev
+Conflicts: libaltlinuxhyph-dev, libhnj-dev
Provides: libaltlinuxhyph-dev
Replaces: libaltlinuxhyph-dev
Description: ALTLinux hyphenation library - development files
diff --git a/debian/rules b/debian/rules
index 8b07b34..be18613 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,7 @@ clean: unpatch
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.sub config.guess
+ rm -f config.sub config.guess config.log
dh_clean
@@ -72,6 +72,12 @@ install: build
debian/libhyphen-dev/usr/lib/libhyph.a
ln -s /usr/lib/libhyphen.so \
debian/libhyphen-dev/usr/lib/libhyph.so
+ ln -s /usr/lib/libhyphen.a \
+ debian/libhyphen-dev/usr/lib/libhnj.a
+ ln -s /usr/lib/libhyphen.so \
+ debian/libhyphen-dev/usr/lib/libhnj.so
+ ln -s /usr/lib/libhyphen.so \
+ debian/libhyphen-dev/usr/lib/libhnj_pic.a
binary-indep: build install
dh_testdir
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hyphen.git
Reply to: