[hunspell] 71/98: Imported Debian patch 1.2.8-6
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hunspell.
commit 913f5632b7a7a8bf719a7e4cc4c712de40096d20
Author: Tim Retout <diocles@debian.org>
Date: Mon Jan 18 00:41:47 2010 +0000
Imported Debian patch 1.2.8-6
---
debian/changelog | 16 ++++++++++++++++
debian/compat | 2 +-
debian/control | 14 +++++++++-----
debian/rules | 17 ++++++++++++-----
4 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c5ca1da..f0247d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+hunspell (1.2.8-6) unstable; urgency=low
+
+ * debian/control:
+ + Add self to Uploaders.
+ + Add ${misc:Depends} to binary packages where missing.
+ + Add Homepage field.
+ + Build-Depend on debhelper (>= 7).
+ * debian/compat: Bump debhelper compatibility level to 7.
+ * debian/rules:
+ + Update config.sub and config.guess before configure, and
+ replace the old versions when cleaning. (Closes: #535722)
+ + Remove libtool on clean.
+ + Use dh_prep rather than dh_clean -k.
+
+ -- Tim Retout <diocles@debian.org> Mon, 18 Jan 2010 00:41:47 +0000
+
hunspell (1.2.8-5) unstable; urgency=low
* build-depend on libreadline-dev
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 8ebce49..7650cf7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,19 @@
Source: hunspell
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
-Uploaders: Rene Engelhard <rene@debian.org>, Chris Halls <halls@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libreadline-dev, libncurses5-dev, libncursesw5-dev, dpatch, autotools-dev, autoconf, libtool, automake1.9
+Uploaders: Rene Engelhard <rene@debian.org>, Chris Halls <halls@debian.org>,
+ Tim Retout <diocles@debian.org>
+Build-Depends: debhelper (>= 7), libreadline-dev, libncurses5-dev,
+ libncursesw5-dev, dpatch, autotools-dev, autoconf, libtool, automake1.9
Standards-Version: 3.6.2
Section: text
+Homepage: http://hunspell.sourceforge.net/
Package: libhunspell-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, libhunspell-1.2-0 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libhunspell-1.2-0 (= ${binary:Version})
Replaces: hunspell (<< 1.2.7-2)
Description: spell checker and morphological analyzer (development)
Hunspell is a spell checker and morphological analyzer library and program
@@ -34,7 +38,7 @@ Description: spell checker and morphological analyzer (development)
Package: libhunspell-1.2-0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: hunspell-en-us | hunspell-dictionary | myspell-dictionary
Conflicts: openoffice.org-core (= 2.2.0~rc2-1)
Description: spell checker and morphological analyzer (shared library)
@@ -83,7 +87,7 @@ Description: spell checker and morphological analyzer (program)
Package: hunspell-tools
Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
Conflicts: libmyspell-dev
Replaces: libmyspell-dev, hunspell (<< 1.2.7-2)
Description: tools for hunspell
diff --git a/debian/rules b/debian/rules
index 9efc978..73be746 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,10 @@ major=2
config.status: patch-stamp configure
dh_testdir
- # Add here commands to configure the package.
+ cp config.sub config.sub.old
+ cp config.guess config.guess.old
+ cp /usr/share/misc/config.sub .
+ cp /usr/share/misc/config.guess .
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
--with-ui --with-readline
@@ -54,25 +57,29 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
./debian/rules unpatch
rm -f debian/ispellaff2myspell.1
rm -f config.log
- dh_clean
+ rm -f libtool
+ -mv config.sub.old config.sub
+ -mv config.guess.old config.guess
+
+ dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
dh_install
-
+
binary-indep: build install
binary-arch: build install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hunspell.git
Reply to: