[Pkg-freedict-commits] r146 - in /packages/freedict-tools/trunk/debian: ./ debian-scripts/ patches/

kebil-guest at users.alioth.debian.org kebil-guest at users.alioth.debian.org
Tue Mar 11 20:57:10 UTC 2008


Author: kebil-guest
Date: Tue Mar 11 20:57:10 2008
New Revision: 146

URL: http://svn.debian.org/wsvn/pkg-freedict/?sc=1&rev=146
Log:
Update to version 0.2+cvs20080304

Added:
    packages/freedict-tools/trunk/debian/debian-scripts/Makefile.opendict
    packages/freedict-tools/trunk/debian/debian-scripts/opendict.dirs.in
    packages/freedict-tools/trunk/debian/debian-scripts/opendict.links.in
    packages/freedict-tools/trunk/debian/debian-scripts/postinst.in
    packages/freedict-tools/trunk/debian/debian-scripts/postrm.in
    packages/freedict-tools/trunk/debian/debian-scripts/stardict.dirs.in
Removed:
    packages/freedict-tools/trunk/debian/debian-scripts/README.Debian
    packages/freedict-tools/trunk/debian/debian-scripts/links.in
    packages/freedict-tools/trunk/debian/debian-scripts/postinst
    packages/freedict-tools/trunk/debian/debian-scripts/postrm
    packages/freedict-tools/trunk/debian/manpages
    packages/freedict-tools/trunk/debian/patches/003_remove_rubbish_in_dict.diff
    packages/freedict-tools/trunk/debian/patches/series
Modified:
    packages/freedict-tools/trunk/debian/Makefile.Debian
    packages/freedict-tools/trunk/debian/README.devel
    packages/freedict-tools/trunk/debian/changelog
    packages/freedict-tools/trunk/debian/compat
    packages/freedict-tools/trunk/debian/control
    packages/freedict-tools/trunk/debian/debian-scripts/changelog.Debian.old
    packages/freedict-tools/trunk/debian/debian-scripts/dirs.in
    packages/freedict-tools/trunk/debian/debian-scripts/opendict-plugin.xml.in
    packages/freedict-tools/trunk/debian/install
    packages/freedict-tools/trunk/debian/links
    packages/freedict-tools/trunk/debian/rules
    packages/freedict-tools/trunk/debian/watch

Modified: packages/freedict-tools/trunk/debian/Makefile.Debian
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/Makefile.Debian?rev=146&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/Makefile.Debian (original)
+++ packages/freedict-tools/trunk/debian/Makefile.Debian Tue Mar 11 20:57:10 2008
@@ -1,75 +1,36 @@
-# $Id: Makefile.Debian 25 2006-12-28 15:26:27Z joostvb $
-# $URL: svn+ssh://kebil-guest@svn.debian.org/svn/pkg-freedict/packages/freedict-tools/trunk/debian/Makefile.Debian $
-
 #
 # example of debian/rules, using this file:
 #
 #  DICT = deu-nld
-#  DICT_MAKE_ENVVARS = supported_phonetics=
-#
 #  FULLNAME = German-Dutch
-#  AUTHORNAME = Horst Eyermann (Horst at freedict.de)
-#  VERSION = 0.1
+#  old ???
 #
 #  include freedict-tools/mk/Makefile.Debian
 #
 
-prepare:
-	# Set up the package build directory as quilt expects to find it.
-	if [ ! -e patches ]; then \
-		ln -s debian/patches patches; \
-	fi
 
-	if [ ! -e .pc ]; then \
-		mkdir .pc; \
-		echo 2 >.pc/.version; \
-	fi
+include /usr/share/quilt/quilt.make
 
 
-patch: prepare
-	# Apply all patches to the upstream source.
-	if quilt next; then \
-	  echo -n "Applying patches..."; \
-	  if quilt push -a -v; then \
-	    echo "successful."; \
-	  else \
-	    echo "failed!"; \
-	    exit 1; \
-	  fi; \
-	else \
-	  echo "No patches to apply"; \
-	fi
-
-
-unpatch:
-	# Revert all patches to the upstream source.
-	@echo -n "Unapplying patches..."; \
-	if [ -e .pc/applied-patches ]; then \
-	  if quilt pop -a -v; then \
-	    echo "successful."; \
-	  else \
-	    echo "failed!"; \
-	    exit 1; \
-	  fi; \
-	else \
-	  echo "nothing to do."; \
-	fi
-
-
-build: build-stamp
+build: patch build-stamp
 
 build-stamp: 
 	dh_testdir
 
-	$(MAKE) -f debian/rules patch
+	if [ -f $(DICT)-nophon.tei ]; then \
+		cp $(DICT)-nophon.tei $(DICT).tei; \
+	fi
 
 	FREEDICTDIR=freedict-tools/mk dictname=$(DICT) \
 		xsldir=/usr/share/freedict-tools/tools/xsl \
 		$(DICT_MAKE_ENVVARS) $(MAKE) $(DICT).dict.dz
 
-	cp /usr/share/freedict-tools/debian-scripts/README.Debian debian
-	cp /usr/share/freedict-tools/debian-scripts/postinst debian
-	cp /usr/share/freedict-tools/debian-scripts/postrm debian
+	FREEDICTDIR=freedict-tools/mk dictname=$(DICT) \
+		xsldir=/usr/share/freedict-tools/tools/xsl \
+		$(DICT_MAKE_ENVVARS) $(MAKE) stardict
+
+	cp /usr/share/freedict-tools/debian-scripts/postinst.in debian/postinst
+	cp /usr/share/freedict-tools/debian-scripts/postrm.in debian/postrm
 
 	if [ $(WITH_EPOCH) = "true" ]; then \
 		cp /usr/share/freedict-tools/debian-scripts/changelog.Debian.old debian; \
@@ -77,26 +38,37 @@
 
 	sed "s/@LANG@/$(DICT)/g" \
 		/usr/share/freedict-tools/debian-scripts/dirs.in > debian/dirs
+
 	sed "s/@LANG@/$(DICT)/g" \
-		/usr/share/freedict-tools/debian-scripts/links.in > debian/links
+		/usr/share/freedict-tools/debian-scripts/opendict.dirs.in \
+			> debian/opendict-freedict-$(DICT).dirs
 
-	sed "s/@LANG@/$(DICT)/g; s/@NAME@/$(FULLNAME)/g; s/@AUTHORN@/$(AUTHORNAME)/g; s/@VERSN@/$(VERSION)/g;" \
-		/usr/share/freedict-tools/debian-scripts/opendict-plugin.xml.in  \
-		> config.txt
+	sed "s/@LANG@/$(DICT)/g" \
+		/usr/share/freedict-tools/debian-scripts/stardict.dirs.in \
+			> debian/stardict-freedict-$(DICT).dirs
+
+	sed "s/@LANG@/$(DICT)/g" \
+		/usr/share/freedict-tools/debian-scripts/opendict.links.in \
+			> debian/opendict-freedict-$(DICT).links
+
+	xsltproc -novalid /usr/share/freedict-tools/tools/xsl/getedition.xsl $(DICT).tei > edition.out
+
+	cp /usr/share/freedict-tools/debian-scripts/Makefile.opendict debian
+	set -e; cd debian; $(MAKE) -f Makefile.opendict config.txt DICT=$(DICT) FULLNAME=$(FULLNAME)
 
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
 
-	$(MAKE) -f debian/rules unpatch
-	rm -rf .pc patches
-
 	FREEDICTDIR=freedict-tools/mk dictname=$(DICT) $(MAKE) clean
+#	rm -rf $(DICT).c5 $(DICT).dic* $(DICT).index
 	rm -rf debian/README.Debian debian/postinst debian/postrm
 	rm -rf debian/dirs debian/links config.txt
+	rm -rf debian/*.dirs debian/*.links debian/*.install
+	rm -rf debian/Makefile.opendict edition.out
 
 	if [ $(WITH_EPOCH) = "true" ]; then \
 		rm -rf debian/changelog.Debian.old; \
@@ -116,16 +88,25 @@
 	  debian/dict-freedict-$(DICT)/usr/share/dictd/freedict-$(DICT).index
 
 	install -m 644 config.txt \
-	  debian/dict-freedict-$(DICT)/usr/share/opendict/dictionaries/plain/freedict-$(DICT).dict.dz/conf/config.xml
+	  debian/opendict-freedict-$(DICT)/usr/share/opendict/dictionaries/plain/freedict-$(DICT).dict.dz/conf/config.xml
+
+	cp dictd_www.dict.org_$(DICT).dict.dz \
+	  debian/stardict-freedict-$(DICT)/usr/share/stardict/dic/freedict-$(DICT).dict.dz
+
+	cp dictd_www.dict.org_$(DICT).idx.gz \
+	  debian/stardict-freedict-$(DICT)/usr/share/stardict/dic/freedict-$(DICT).idx.gz
+
+	cp dictd_www.dict.org_$(DICT).ifo \
+	  debian/stardict-freedict-$(DICT)/usr/share/stardict/dic/freedict-$(DICT).ifo
 
 binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
 	if [ $(WITH_EPOCH) = "true" ]; then \
-		dh_installdocs -A debian/README.Debian debian/changelog.Debian.old; \
+		dh_installdocs -A debian/changelog.Debian.old; \
 	else \
-		dh_installdocs -A debian/README.Debian; \
+		dh_installdocs -A; \
 	fi
 	dh_link
 	dh_strip

Modified: packages/freedict-tools/trunk/debian/README.devel
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/README.devel?rev=146&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/README.devel (original)
+++ packages/freedict-tools/trunk/debian/README.devel Tue Mar 11 20:57:10 2008
@@ -1,59 +1,8 @@
-Convenience targets in debian/rules
-===================================
-The debian/rules file supports several targets that are not required by Debian
-Policy. This include:
+When you are finished to edit or to create a new patch, run:
 
-  debian/rules prepare              Sets up the package build directory
-                                    structure as quilt expects to find it.
-  debian/rules patch                Applies all patches to the source tree.
-  debian/rules unpatch              Reverts all patches from the source tree.
+   quilt refresh -u -p 0
 
+This will create a unified diff patch with a strip number of 0.
+You can then go in to the patches directory and document your patch
+by adding a description of it to the top of the patch file.
 
-Editing and creating patches
-============================
-To start, you should be in the source package directory -- this is the
-directory that contains the debian/ directory.  Run "debian/rules prepare";
-this will set up the proper symlinks so that quilt can find the patches it
-needs to apply.  Once this is done, you will see a symlink named "patches"
-that will point to debian/patches. This exists because quilt expects the
-patches directory to be located at the top level by default. The "prepare"
-target sets up a ".pc" directory as well, which quilt uses internally to
-store information it needs.
-
-What you do next depends on whether you want to edit an existing patch, or
-create a new one.
-
-Editing an existing patch
--------------------------
-Run "quilt push yourpatchname.diff".  Make your edits now, directly in the
-source tree.  If you're editing a file that wasn't previously included in the
-patch, you must let quilt know you're doing it by using "quilt add" or "quilt
-edit".  If you're not sure if you need this, you can run "quilt files" to see
-if your file is already in there, or "quilt patches filename" to see if the
-current patch edits the specified file.  Once you're done editing, run "quilt
-refresh" to update your patch.  All documentation in the patch header will be
-retained by quilt automatically.  Always document the changes you have made in
-the header of the patch.
-
-Creating a new patch
---------------------
-Decide where your patch belongs according to the number series. Once you do
-this, run "quilt push patch-before-yours", where "patch-before-yours" specifies
-the filename of the patch that will be the last one applied before your new
-patch. Then run "quilt new patchname" using the name of the patch (including
-the appropriate number). Make your edits to the source files, directly in the
-source tree.  As described above in the case of editing existing patches,
-you'll want to be sure quilt knows which files you are editing.  When you are
-finished, run "quilt refresh -u -p 0".  This will create a unified diff patch
-with a strip number of 0.  You should then go in to the patches directory and
-document your patch by adding a description of it to the top of the patch file.
-
-You may have a patch that you stole from some other source that you just want
-to apply and you don't want to deal with adding files by hand.  You can use
-"quilt import -n internal-patch-name file-name" where "internal-patch-name"
-is what you want to call your patch.  You'll want to "quilt push" the patch
-before yours -- as described above -- before doing the import, to ensure that
-that it applies in correct sequence.
-
-Once you're all done with patch creation/editing, run "debian/rules clean" to
-get rid of the things that had to be set up.

Modified: packages/freedict-tools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/changelog?rev=146&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/changelog (original)
+++ packages/freedict-tools/trunk/debian/changelog Tue Mar 11 20:57:10 2008
@@ -1,15 +1,36 @@
-freedict-tools (0.2-2) UNRELEASED; urgency=low
+freedict-tools (0.2+cvs20080304-1) UNRELEASED; urgency=low
 
-  [ Kęstutis Biliūnas <kebil at kaunas.init.lt> ]
-  * debian/patches:
-    - added patch 003_remove_rubbish_in_dict.diff for removing
-      the last rubbish line in the .dict file.
-    - removed patch 002_scriptdir_in_Makefile.common.diff - accepted
-      by the upstream.  
-  * debian/rules: added the new line to target clean for remove the
-    manpage teiaddphonetics.1. 
+  * New upstream CVS snapshot.
+  * debian/control:
+    - bumped Standards-Version to 3.7.3. No changes required;
+    - use debhelper (>> 6.0.0);
+    - the homepage address removed from extended package description and added
+      Homepage field in the source package;
+    - added Vcs-Browser and fixed Vcs-svn fields;
+    - added the stardict-tools package to Build-Depends-Indep.
+  * debian/rules: removed the targets prepare, patch and unpatch. Instead of
+    these included quilt.make.
+  * debian/install: added the files xsl/getauthor.xsl, xsl/gettitle.xsl,
+    xsl/getsourceurl.xsl and getedition.xsl.
+  * debian/Makefile.Debian:
+    - removed the targets prepare, patch and unpatch. Instead of these
+      included quilt.make;
+    - the targets build, install and clean adjusted for building the binary
+      packages for opendict and stardict formated dictionaries.    
+  * debian/patches: removed patch 002_scriptdir_in_Makefile.common.diff -
+    accepted by the upstream.  
+  * debian/debian-scripts:
+    - removed file README.Debian;
+    - file changelog.Debian.old updated from the freedict-1.3-4 package;
+    - added files Makefile.opendict, opendict.dirs.in, opendict.links.in and
+      stardict.dirs.in;
+    - removed the message from postindt script about the needing to set the
+      parameter --locale in /etc/default/dictd. 
+  * debian/README.devel: this file now simplified.
+  * Removed the script teiaddphonetics from installing to this package.
+    We can't to implement the phonetics import because of the license issue.
 
- -- Joost van Baal <joostvb at debian.org>  Wed,  3 Jan 2007 11:02:28 +0100
+ -- Kęstutis Biliūnas <kebil at kaunas.init.lt>  Wed, 05 Mar 2008 11:06:52 +0200
 
 freedict-tools (0.2-1) experimental; urgency=low
 
@@ -35,4 +56,3 @@
 
  -- Joost van Baal <joostvb at debian.org>  Wed, 20 Dec 2006 16:23:13 +0100
 
-

Modified: packages/freedict-tools/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/compat?rev=146&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/compat (original)
+++ packages/freedict-tools/trunk/debian/compat Tue Mar 11 20:57:10 2008
@@ -1,1 +1,1 @@
-5
+6

Modified: packages/freedict-tools/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/control?rev=146&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/control (original)
+++ packages/freedict-tools/trunk/debian/control Tue Mar 11 20:57:10 2008
@@ -3,10 +3,12 @@
 Priority: optional
 Maintainer: Debian FreeDict Packages <pkg-freedict at lists.alioth.debian.org>
 Uploaders: Joost van Baal <joostvb at debian.org>, Kęstutis Biliūnas <kebil at kaunas.init.lt>
-Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: quilt, perl
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-freedict/packages/freedict-tools
+Build-Depends: debhelper (>> 6.0.0), quilt (>= 0.40)
+Build-Depends-Indep: perl, stardict-tools
+Standards-Version: 3.7.3
+Homepage: http://www.freedict.org/
+Vcs-svn: svn://svn.debian.org/pkg-freedict/packages/freedict-tools
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/
 
 Package: freedict-tools-dev
 Architecture: all
@@ -14,5 +16,4 @@
 Description: Development files for the FreeDict dictionary packages
  This package contains the scripts for developing and building FreeDict
  dictionary packages.
- .
- Homepage: http://www.freedict.org/
+

Added: packages/freedict-tools/trunk/debian/debian-scripts/Makefile.opendict
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/debian-scripts/Makefile.opendict?rev=146&op=file
==============================================================================
--- packages/freedict-tools/trunk/debian/debian-scripts/Makefile.opendict (added)
+++ packages/freedict-tools/trunk/debian/debian-scripts/Makefile.opendict Tue Mar 11 20:57:10 2008
@@ -1,0 +1,12 @@
+DICT =
+FULLNAME =
+AUTHORNAME = $(shell sed -e "s/ <.*>//" < ../authorresp.out)
+EMAIL = $(shell sed -e "s/.* <\(.*\)>/\1/" < ../authorresp.out)
+VERSION = $(shell cat ../edition.out)
+
+config.txt:
+	sed "s/@LANG@/$(DICT)/g; s/@NAME@/$(FULLNAME)/g; \
+		s/@AUTHORN@/$(AUTHORNAME)/g; s/@VERSN@/$(VERSION)/g; \
+		s/@MAILADDR@/$(EMAIL)/g;" \
+		/usr/share/freedict-tools/debian-scripts/opendict-plugin.xml.in \
+		> ../config.txt

Modified: packages/freedict-tools/trunk/debian/debian-scripts/changelog.Debian.old
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/debian-scripts/changelog.Debian.old?rev=146&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/debian-scripts/changelog.Debian.old (original)
+++ packages/freedict-tools/trunk/debian/debian-scripts/changelog.Debian.old Tue Mar 11 20:57:10 2008
@@ -1,3 +1,28 @@
+freedict (1.3-4) unstable; urgency=low
+
+  * Removed file debian/header_utf8.txt, because since dict (>> 1.10.0) this
+    header no longer needed. 
+  * Changed word "Africaans" to "Afrikaans" in the package description
+    and in the files debian/languagelist and debian/patches/afr-deu.diff
+    (Closes: #455267).
+  * Changed "to deserves" to "to deserve" in the translation of the deu-eng
+    dictionary (Closes: #448030).
+  * Substituted all occurrences of the letters 'ô' to 'ő' and 'û' to 'ű' in
+    the eng-hun and hun-eng dictionaries (Closes: #411994). Also added some
+    missing spaces between words in the definitions of the eng-hun dictionary. 
+  * Removed the Esperanto translations parts from the spa-eng dictionary
+    (Closes: #254697). Also added many missing spaces between words and
+    removed the many duplicated translation entries for the many words in this
+    dictionary.
+  * debian/control:
+    - added Homepage field in the source package.
+    - changed "dict-freedict" to "dictd-dictionary" in the Provides field
+      of the binary packages in accordance with debian-policy 3.7.3
+      (Closes: #466210).
+    - bumped Standards-Version to 3.7.3.
+
+ -- Kęstutis Biliūnas <kebil at kaunas.init.lt>  Sun, 17 Feb 2008 12:24:04 +0200
+
 freedict (1.3-3) unstable; urgency=low
 
   * debian/patches:

Modified: packages/freedict-tools/trunk/debian/debian-scripts/dirs.in
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/debian-scripts/dirs.in?rev=146&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/debian-scripts/dirs.in (original)
+++ packages/freedict-tools/trunk/debian/debian-scripts/dirs.in Tue Mar 11 20:57:10 2008
@@ -1,4 +1,2 @@
 usr/share/dictd
-usr/share/opendict/dictionaries/plain/freedict- at LANG@.dict.dz/conf
-usr/share/opendict/dictionaries/plain/freedict- at LANG@.dict.dz/file
 

Modified: packages/freedict-tools/trunk/debian/debian-scripts/opendict-plugin.xml.in
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/debian-scripts/opendict-plugin.xml.in?rev=146&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/debian-scripts/opendict-plugin.xml.in (original)
+++ packages/freedict-tools/trunk/debian/debian-scripts/opendict-plugin.xml.in Tue Mar 11 20:57:10 2008
@@ -4,7 +4,7 @@
   <name>@NAME@ (FreeDict)</name>
   <version>@VERSN@</version>
   <authors>
-    <author name="@AUTHORN@" />
+    <author name="@AUTHORN@" email="@MAILADDR@" />
   </authors>
   <path>freedict- at LANG@.dict.dz</path>
   <encoding>UTF-8</encoding>

Added: packages/freedict-tools/trunk/debian/debian-scripts/opendict.dirs.in
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/debian-scripts/opendict.dirs.in?rev=146&op=file
==============================================================================
--- packages/freedict-tools/trunk/debian/debian-scripts/opendict.dirs.in (added)
+++ packages/freedict-tools/trunk/debian/debian-scripts/opendict.dirs.in Tue Mar 11 20:57:10 2008
@@ -1,0 +1,3 @@
+usr/share/opendict/dictionaries/plain/freedict- at LANG@.dict.dz/conf
+usr/share/opendict/dictionaries/plain/freedict- at LANG@.dict.dz/file
+

Added: packages/freedict-tools/trunk/debian/debian-scripts/opendict.links.in
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/debian-scripts/opendict.links.in?rev=146&op=file
==============================================================================
--- packages/freedict-tools/trunk/debian/debian-scripts/opendict.links.in (added)
+++ packages/freedict-tools/trunk/debian/debian-scripts/opendict.links.in Tue Mar 11 20:57:10 2008
@@ -1,0 +1,3 @@
+usr/share/dictd/freedict- at LANG@.dict.dz	usr/share/opendict/dictionaries/plain/freedict- at LANG@.dict.dz/file/freedict- at LANG@.dict.dz
+usr/share/dictd/freedict- at LANG@.index	usr/share/opendict/dictionaries/plain/freedict- at LANG@.dict.dz/file/freedict- at LANG@.index	
+	

Added: packages/freedict-tools/trunk/debian/debian-scripts/postinst.in
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/debian-scripts/postinst.in?rev=146&op=file
==============================================================================
--- packages/freedict-tools/trunk/debian/debian-scripts/postinst.in (added)
+++ packages/freedict-tools/trunk/debian/debian-scripts/postinst.in Tue Mar 11 20:57:10 2008
@@ -1,0 +1,30 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+     if [ -x /usr/sbin/dictdconfig ]; then dictdconfig -w ;fi
+     if [ -x /etc/init.d/dictd ]; then
+          if which invoke-rc.d >/dev/null 2>&1; then
+               invoke-rc.d dictd restart
+          else
+               /etc/init.d/dictd restart
+          fi
+     fi
+
+    ;;
+
+    failed-upgrade|abort-upgrade|abort-remove|abort-deconfigure|in-favour|removing)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

Added: packages/freedict-tools/trunk/debian/debian-scripts/postrm.in
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/debian-scripts/postrm.in?rev=146&op=file
==============================================================================
--- packages/freedict-tools/trunk/debian/debian-scripts/postrm.in (added)
+++ packages/freedict-tools/trunk/debian/debian-scripts/postrm.in Tue Mar 11 20:57:10 2008
@@ -1,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    remove|purge)
+     if [ -x /usr/sbin/dictdconfig ]; then dictdconfig -w ;fi
+     if [ -x /etc/init.d/dictd ]; then
+          if which invoke-rc.d >/dev/null 2>&1; then
+               invoke-rc.d dictd restart
+          else
+               /etc/init.d/dictd restart
+          fi
+     fi
+
+     exit 0
+     ;;
+
+
+    upgrade|abort-upgrade|abort-remove|abort-deconfigure|in-favour|removing)
+        exit 0;
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+
+esac
+
+#DEBHELPER#
+
+exit 0

Added: packages/freedict-tools/trunk/debian/debian-scripts/stardict.dirs.in
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/debian-scripts/stardict.dirs.in?rev=146&op=file
==============================================================================
--- packages/freedict-tools/trunk/debian/debian-scripts/stardict.dirs.in (added)
+++ packages/freedict-tools/trunk/debian/debian-scripts/stardict.dirs.in Tue Mar 11 20:57:10 2008
@@ -1,0 +1,2 @@
+usr/share/stardict/dic
+

Modified: packages/freedict-tools/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/install?rev=146&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/install (original)
+++ packages/freedict-tools/trunk/debian/install Tue Mar 11 20:57:10 2008
@@ -2,7 +2,11 @@
 Makefile.config			usr/share/freedict-tools/mk
 debian/Makefile.Debian		usr/share/freedict-tools/mk
 xsl/tei2c5.xsl			usr/share/freedict-tools/tools/xsl
+xsl/getauthor.xsl		usr/share/freedict-tools/tools/xsl
+xsl/gettitle.xsl		usr/share/freedict-tools/tools/xsl
+xsl/getsourceurl.xsl		usr/share/freedict-tools/tools/xsl
+xsl/getedition.xsl		usr/share/freedict-tools/tools/xsl
 xsl/inc/*			usr/share/freedict-tools/tools/xsl/inc
 debian/debian-scripts/*		usr/share/freedict-tools/debian-scripts
 xdf2tei.pl			usr/share/freedict-tools/scripts
-teiaddphonetics			usr/bin
+

Modified: packages/freedict-tools/trunk/debian/links
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/links?rev=146&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/links (original)
+++ packages/freedict-tools/trunk/debian/links Tue Mar 11 20:57:10 2008
@@ -1,4 +1,4 @@
 usr/share/freedict-tools/mk/Makefile.config	usr/include/freedict-tools/mk/tools/Makefile.config
 usr/share/freedict-tools/mk/Makefile.common	usr/include/freedict-tools/mk/tools/Makefile.common
 usr/share/freedict-tools/mk/Makefile.Debian	usr/include/freedict-tools/mk/Makefile.Debian
-usr/bin/teiaddphonetics				usr/share/freedict-tools/tools/teiaddphonetics
+

Modified: packages/freedict-tools/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/rules?rev=146&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/rules (original)
+++ packages/freedict-tools/trunk/debian/rules Tue Mar 11 20:57:10 2008
@@ -1,73 +1,23 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-
-# $Id$
-# $URL$
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-prepare:
-	# Set up the package build directory as quilt expects to find it.
-	if [ ! -e patches ]; then \
-		ln -s debian/patches patches; \
-	fi
-
-	if [ ! -e .pc ]; then \
-		mkdir .pc; \
-		echo 2 >.pc/.version; \
-	fi
+include /usr/share/quilt/quilt.make
 
 
-patch: prepare
-	# Apply all patches to the upstream source.
-	if quilt next; then \
-	  echo -n "Applying patches..."; \
-	  if quilt push -a -v; then \
-	    echo "successful."; \
-	  else \
-	    echo "failed!"; \
-	    exit 1; \
-	  fi; \
-	else \
-	  echo "No patches to apply"; \
-	fi
-
-
-unpatch:
-	# Revert all patches to the upstream source.
-	@echo -n "Unapplying patches..."; \
-	if [ -e .pc/applied-patches ]; then \
-	  if quilt pop -a -v; then \
-	    echo "successful."; \
-	  else \
-	    echo "failed!"; \
-	    exit 1; \
-	  fi; \
-	else \
-	  echo "nothing to do."; \
-	fi
-
-build: build-stamp
+build: patch build-stamp
 
 build-stamp:
 	dh_testdir
 
-	$(MAKE) -f debian/rules patch
-	pod2man teiaddphonetics teiaddphonetics.1
-
 	touch $@
 
-
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-
-	rm -f teiaddphonetics.1
-
-	$(MAKE) -f debian/rules unpatch
-	rm -rf .pc patches
 
 	dh_clean
 

Modified: packages/freedict-tools/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/watch?rev=146&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/watch (original)
+++ packages/freedict-tools/trunk/debian/watch Tue Mar 11 20:57:10 2008
@@ -1,6 +1,3 @@
-# $Id$
-# $URL$
-
 # watch control file for uscan, see uscan(1)
 
 # test this file by running




More information about the Pkg-freedict-commits mailing list