[Debian-hebrew-package] [svn] r451 - in pkg/hspell/trunk: . debian debian/cdbs

Lior Kaplan kaplan at costa.debian.org
Thu Jun 8 18:25:33 UTC 2006


Author: kaplan
Date: Thu Jun  8 18:25:32 2006
New Revision: 451

Added:
   pkg/hspell/trunk/debian/hspell.docs
      - copied unchanged from r441, pkg/hspell/trunk/debian/docs
   pkg/hspell/trunk/debian/hspell.install
   pkg/hspell/trunk/debian/myspell-he.dirs
   pkg/hspell/trunk/debian/myspell-he.docs
   pkg/hspell/trunk/debian/myspell-he.install
Removed:
   pkg/hspell/trunk/debian/cdbs/
   pkg/hspell/trunk/debian/docs
Modified:
   pkg/hspell/trunk/debian/changelog
   pkg/hspell/trunk/debian/control
   pkg/hspell/trunk/debian/copyright
   pkg/hspell/trunk/debian/hspell.dirs
   pkg/hspell/trunk/debian/rules
   pkg/hspell/trunk/mk_he_affix.c
Log:
* debian/control: Upgrade to standard versions 3.7.2.0 (no changes needed)
* debian/rules: convert from cdbs to plain debhelpers

Modified: pkg/hspell/trunk/debian/changelog
==============================================================================
--- pkg/hspell/trunk/debian/changelog	(original)
+++ pkg/hspell/trunk/debian/changelog	Thu Jun  8 18:25:32 2006
@@ -1,12 +1,10 @@
 hspell (1.0-1) unstable; urgency=low
 
   * New upstream release
-  * debian/control: 
-    - Change priority of myspell-he to extra, to be in sync with the archive 
-      override. Priority of hspell remains optional.
-    - Upgrade to standard versions 3.7.2.0 (no changes needed)
+  * debian/control: Upgrade to standard versions 3.7.2.0 (no changes needed)
+  * debian/rules: convert from cdbs to plain debhelpers
 
- -- Lior Kaplan <kaplan at debian.org>  Sat, 20 May 2006 16:03:40 -0500
+ -- Lior Kaplan <kaplan at debian.org>  Thu,  8 Jun 2006 21:25:04 +0300
 
 hspell (0.9-4) unstable; urgency=low
 

Modified: pkg/hspell/trunk/debian/control
==============================================================================
--- pkg/hspell/trunk/debian/control	(original)
+++ pkg/hspell/trunk/debian/control	Thu Jun  8 18:25:32 2006
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Hebrew Packaging Team <debian-hebrew-package at lists.alioth.debian.org>
 Uploaders: Baruch Even <baruch at debian.org>, Lior Kaplan <kaplan at debian.org>
-Build-Depends: debhelper (>= 5.0.0), cdbs, perl, zlib1g-dev, dictionaries-common-dev
+Build-Depends: debhelper (>= 5.0.0), perl, zlib1g-dev, dictionaries-common-dev
 Standards-Version: 3.7.2.0
 
 Package: hspell
@@ -17,7 +17,7 @@
 
 Package: myspell-he
 Architecture: all
-Priority: extra
+Priority: optional
 Provides: myspell-dictionary, myspell-dictionary-he
 Depends: dictionaries-common
 Suggests: openoffice.org, openoffice.org-l10n-he

Modified: pkg/hspell/trunk/debian/copyright
==============================================================================
--- pkg/hspell/trunk/debian/copyright	(original)
+++ pkg/hspell/trunk/debian/copyright	Thu Jun  8 18:25:32 2006
@@ -7,7 +7,7 @@
 		  Dan Kenigsberg <danken at cs.technion.ac.il>
 
 Copyright: 
-Hspell is copyright (C) 2000-2002, Nadav Har'El and Dan Kenigsberg.
+Hspell is copyright (C) 2000-2006, Nadav Har'El and Dan Kenigsberg.
 
 It is released to the public licensed under the GNU General Public License
 (GPL). See the COPYING file included in this distribution for the whole text

Modified: pkg/hspell/trunk/debian/hspell.dirs
==============================================================================
--- pkg/hspell/trunk/debian/hspell.dirs	(original)
+++ pkg/hspell/trunk/debian/hspell.dirs	Thu Jun  8 18:25:32 2006
@@ -1,2 +1,4 @@
 usr/bin
 usr/share/hspell
+usr/include
+usr/lib

Modified: pkg/hspell/trunk/debian/rules
==============================================================================
--- pkg/hspell/trunk/debian/rules	(original)
+++ pkg/hspell/trunk/debian/rules	Thu Jun  8 18:25:32 2006
@@ -1,25 +1,127 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-export CFLAGS += -fPIC
-
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-linginfo
-
-DEB_DESTDIR=$(CURDIR)/debian/hspell
-
-# these rules are not (yet?) included in cdbs officially
-include debian/cdbs/1/class/dict.mk
-DEB_DICT_LANG = hebrew
-DEB_DICT_NATIVELANG = ivrit
-DEB_DICT_LANGCODE = he
-DEB_DICT_COUNTRYCODE = IL
-DEB_MYSPELL_DIR = .
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-build/myspell-he::
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall -g -fPIC
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-linginfo
+
+
+#Architecture 
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp:  config.status
+
+	# Add here commands to compile the arch part of the package.
+	$(MAKE) 
+	touch build-arch-stamp
+
+build-indep: build-indep-stamp
+build-indep-stamp:  config.status
+
+	# Add here commands to compile the indep part of the package.
 	$(MAKE) myspell
-	[ -e he_IL.dic ] || ln -s he-IL.dic he_IL.dic
-	[ -e he_IL.aff ] || ln -s he-IL.aff he_IL.aff
+	$(MAKE) README_he_IL.txt
+	touch build-indep-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+	dh_clean *.dic *.aff
+
+install: install-indep install-arch
+install-indep:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -i -X.aff -X.dic
+	dh_installdirs -i
+
+	# Add here commands to install the indep part of the package into
+	# debian/<package>-doc.
+	[ -e he_IL.aff ] || mv he.aff he_IL.aff
+	[ -e he_IL.dic ] || mv he.dic he_IL.dic
+	dh_install -i 
+	installdeb-myspell -pmyspell-he
+
+install-arch:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -s 
+	dh_installdirs -s
+
+	# Add here commands to install the arch part of the package into 
+	# debian/tmp.
+	$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
+
+	dh_install -s --sourcedir=debian/tmp
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress 
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
-cleanbuilddir/myspell-he::
-	-rm -f he_IL.dic he_IL.aff
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch 

Modified: pkg/hspell/trunk/mk_he_affix.c
==============================================================================
--- pkg/hspell/trunk/mk_he_affix.c	(original)
+++ pkg/hspell/trunk/mk_he_affix.c	Thu Jun  8 18:25:32 2006
@@ -13,7 +13,7 @@
 #include "hspell.h"
 
 /* #define PREFIXFILE_COMMAND "gzip -dc hebrew.wgz.prefixes" */
-#define PREFIXFILE_COMMAND "gzip -dc hebrew.wgz.prefixes | specfilter"
+#define PREFIXFILE_COMMAND "gzip -dc hebrew.wgz.prefixes | ./specfilter"
 
 /* Convert a number in the range 0..52 (currently) to a readable character
    that can be used as the rule (prefix set) name. To facilitate merging our



More information about the Debian-hebrew-package mailing list