[Pkg-freedict-commits] r55 - in /packages/freedict-tools/trunk/debian: Makefile.Debian README README.devel debian-scripts/changelog.Debian.old rules

kebil-guest at users.alioth.debian.org kebil-guest at users.alioth.debian.org
Mon Jan 1 13:01:34 CET 2007


Author: kebil-guest
Date: Mon Jan  1 13:01:33 2007
New Revision: 55

URL: http://svn.debian.org/wsvn/pkg-freedict/?sc=1&rev=55
Log:
Added changes related to the changelog file handling in the dictionaries with epoch number in their versions.

Added:
    packages/freedict-tools/trunk/debian/README.devel
    packages/freedict-tools/trunk/debian/debian-scripts/changelog.Debian.old
Removed:
    packages/freedict-tools/trunk/debian/README
Modified:
    packages/freedict-tools/trunk/debian/Makefile.Debian
    packages/freedict-tools/trunk/debian/rules

Modified: packages/freedict-tools/trunk/debian/Makefile.Debian
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/Makefile.Debian?rev=55&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/Makefile.Debian (original)
+++ packages/freedict-tools/trunk/debian/Makefile.Debian Mon Jan  1 13:01:33 2007
@@ -71,6 +71,10 @@
 	cp /usr/share/freedict-tools/debian-scripts/postinst debian
 	cp /usr/share/freedict-tools/debian-scripts/postrm debian
 
+	if [ $(WITH_EPOCH) = "true" ]; then \
+		cp /usr/share/freedict-tools/debian-scripts/changelog.Debian.old debian; \
+	fi
+
 	sed "s/@LANG@/$(DICT)/g" \
 		/usr/share/freedict-tools/debian-scripts/dirs.in > debian/dirs
 	sed "s/@LANG@/$(DICT)/g" \
@@ -94,6 +98,10 @@
 	rm -rf debian/README.Debian debian/postinst debian/postrm
 	rm -rf debian/dirs debian/links config.txt
 
+	if [ $(WITH_EPOCH) = "true" ]; then \
+		rm -rf debian/changelog.Debian.old; \
+	fi
+
 	dh_clean
 
 install: build
@@ -114,7 +122,11 @@
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
-	dh_installdocs -A debian/README.Debian
+	if [ $(WITH_EPOCH) = "true" ]; then \
+		dh_installdocs -A debian/README.Debian debian/changelog.Debian.old; \
+	else \
+		dh_installdocs -A debian/README.Debian; \
+	fi
 	dh_link
 	dh_strip
 	dh_compress

Added: packages/freedict-tools/trunk/debian/README.devel
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/README.devel?rev=55&op=file
==============================================================================
--- packages/freedict-tools/trunk/debian/README.devel (added)
+++ packages/freedict-tools/trunk/debian/README.devel Mon Jan  1 13:01:33 2007
@@ -1,0 +1,59 @@
+Convenience targets in debian/rules
+===================================
+The debian/rules file supports several targets that are not required by Debian
+Policy. This include:
+
+  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.
+
+
+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.

Added: 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=55&op=file
==============================================================================
--- packages/freedict-tools/trunk/debian/debian-scripts/changelog.Debian.old (added)
+++ packages/freedict-tools/trunk/debian/debian-scripts/changelog.Debian.old Mon Jan  1 13:01:33 2007
@@ -1,0 +1,148 @@
+freedict (1.3-3) unstable; urgency=low
+
+  * debian/patches:
+    - substituted all occurrences of 'ij' to 'ij' in deu-nld, eng-nld, fra-nld,
+      nld-deu, nld-eng and nld-fra dictionaries (Closes: #381054).
+    - removed some duplicated entries in the eng-iri and iri-eng dictionaries.
+  * Added the plugin files for the OpenDict dictionary. For that added files
+    debian/{languagelist, opendict-plugin.xml, dict-freedict-lang-dirs.tmpl,
+    dict-freedict-lang-links.tmpl} and removed file debian/dirs.
+  * debian/control:
+    - added the packages opendict, serpento and kdict to Suggests.
+    - improved long description.
+  * Improved the debian/README.Debian file.
+  * Sponsored upload by Joost van Baal <joostvb at debian.org>.
+
+ -- Kęstutis Biliūnas <kebil at kaunas.init.lt>  Wed,  9 Aug 2006 13:23:30 +0300
+
+freedict (1.3-2) unstable; urgency=low
+
+  * Use 'invoke-rc.d dictd' instead of '/etc/init.d/dictd' (Closes: #367738).
+    Thanks to Lars Wirzenius.
+  * debian/compat: use DH_COMPAT 5
+  * debian/control:
+    - changed Build-Depends on debhelper (>= 5.0.0).
+    - bumped Standards-Version to 3.7.2. No changes required.
+  * Sponsored upload by Joost van Baal <joostvb at debian.org>.
+
+ -- Kęstutis Biliūnas <kebil at kaunas.init.lt>  Mon, 22 May 2006 09:39:04 +0300
+
+freedict (1.3-1) unstable; urgency=low 
+
+  * Updated with new upstream versions of eng-ara, hun-eng (Closes: #337130),
+    swa-eng and tur-eng dictionaries, added new dictionaries: cro-eng, eng-cro,
+    eng-cze, eng-hin, eng-swa, eng-tur and hin-eng. So, the source tarball
+    version bumped to 1.3.
+  * debian/control:
+    - changed Build-Depends on dictfmt package to dictfmt (>> 1.10.0);
+    - removed Build-Depends on locales package, because option
+      '--locale xx_YY.UTF-8' is no more required for dictfmt.
+  * Changed the word 'Nederland' to 'Dutch' in the package descriptions
+    (debian/control) and in the dictionary headers for dictionaries: deu-nld,
+    eng-nld, fra-nld, nld-deu, nld-eng and nld-fra (Closes: #330802).
+  * The dictionary sco-deu renamed to gla-deu, and in the package descriptions
+    and in the dictionary header reference 'Scottish' changed to
+    'Scottish Gaelic'. Added 'Conflicts: dict-freedict-sco-deu' and
+    'Replaces: dict-freedict-sco-deu' to dict-freedict-gla-deu package.
+    Thanks to Justin B Rye <jbr at edlug.org.uk> (Closes: #318025).
+  * Fixed typo in debian/postinst. Thanks to Jens Seidel
+    <jensseidel at users.sf.net> (Closes: #335378).
+  * debian/copyright: changed 'Authors:' and 'Copyright:' parts of this file,
+    by naming all authors of each dictionary. Thanks to Joost van Baal
+    <joostvb at mdcc.cx> for suggestion.
+  * Sponsored upload by Joost van Baal <joostvb at debian.org>.
+
+ -- Kęstutis Biliūnas <kebil at kaunas.init.lt>  Mon, 12 Dec 2005 08:54:25 +0200 
+
+freedict (1.2-1) unstable; urgency=low
+
+  * New maintainer (Closes: #206113).
+  * Updated with the new upstream versions (all, except eng-hun, hun-eng
+    and eng-por) (Closes: #148209, #154537) . Added new dictionaries:
+    eng-ara, eng-rom, eng-scr, ita-eng (Closes: #309814) and wel-eng.
+    So, the source tarball version bumped to 1.2.
+  * All the dictionaries unformated, fixed the headers, removed the
+    many duplicated entries for most words in the dictionaries (but
+    not all) (Closes: #186044), and formated using locale en_US.UTF-8
+    again (Closes: #145584, #164559, #222853, #320474):
+    - now all dictionaries have header 00-database-utf8 in dict
+      files (Closes: #174695, #317078).
+    - fixed some spelling mistakes in the eng-fra dictionary
+      (Closes: #302549, #310857).
+    - changed incorrect entry for "elemination" to "elimination" in the
+      eng-deu dictionary (Closes: #284496). 
+    - corrected the references to "Africaan" in the afr-deu dictionary to
+      "Afrikaans" (Closes: #318024).
+  * Changed files debian/{postinst, postrm} (Closes: #215001). 
+  * Added the file debian/README.Debian with a note about encoding. Added
+    the warning about setting locale in /etc/defaults/dictd to the file
+    debian/postinst (Closes: #179281, #226895, #159304).
+  * Removed the files from debian directory: control.tmpl, gencontrol.py
+    and namefixup.py (no need any more) (Closes: #215014).
+  * debian/control: 
+    - bumped Standards-Version to 3.6.2 (no changes required).
+    - removed Build-Depends on python2.3 and python2.3-dictdlib packages
+      and added Build-Depends on dictfmt and locales packages.
+    - removed dict-freedict meta-package, and added providing the virtual
+      dict-freedict package (Closes: #205417).
+    - added the new binary packages for dictionaries eng-ara, eng-rom,
+      eng-scr, ita-eng and wel-eng.
+    - slo-eng package description changed to "Slovak-..." instead of 
+      "Slovenian-..." (Closes: #164838).
+  * debian/copyright:
+    - fixed the text formating (Closes: #226904).
+    - changed the postall adress of the FSF.
+   * Sponsored upload by Joost van Baal <joostvb at debian.org>.
+
+ -- Kęstutis Biliūnas <kebil at kaunas.init.lt>  Sun, 14 Aug 2005 02:42:23 +0300
+
+freedict (1.1-4) unstable; urgency=low
+
+  * QA Upload
+  * Dude! I forgot to update debian/control.tmpl in my lastest upload. Fixed
+    now. (closes: #212084, #183550)
+
+ -- Pierre Machard <pmachard at debian.org>  Fri, 26 Sep 2003 20:21:51 +0200
+
+freedict (1.1-3) unstable; urgency=low
+
+  * QA Upload.
+  * Update Python to 2.3.
+  * Update build-depends to python2.3-dictdlib (closes: #212084).
+  * Fix spelling error in dict-freedict-por-eng description (closes: #183550).
+  * Update Standards Version to 3.6.1.
+
+ -- Pierre Machard <pmachard at debian.org>  Fri, 26 Sep 2003 18:58:43 +0200
+
+freedict (1.1-2) unstable; urgency=low
+
+  * Orphaning this package.  Set maintainer to QA group.
+
+ -- John Goerzen <jgoerzen at complete.org>  Mon, 18 Aug 2003 15:54:34 -0500
+
+freedict (1.1-1) unstable; urgency=low
+
+  * Updated with new upstream versions of eng-nld, hun-eng, eng-hun,
+    eng-fra, spa-eng, and deu-eng in hopes that this will fix
+    some encoding problems people have seen.
+  * Correct description of French dictionary.  Closes: 146212.
+  * Removed obsolete dictdlib.py from source.  Now use separate package
+    python2.2-dictdlib.
+  * Removed bin directory kludge from rules -- no longer necessary.
+
+ -- John Goerzen <jgoerzen at complete.org>  Wed,  5 Feb 2003 15:41:00 -0600
+
+freedict (1.0-2) unstable; urgency=low
+
+  * Uses the new dictdlib to fix some of the shortnames internally
+    in some dictionaries.
+  * Added new dict-freedict meta-package for people that wish to install
+    the entire Freedict lexicon.
+
+ -- John Goerzen <jgoerzen at complete.org>  Thu,  2 May 2002 15:08:47 -0500
+
+freedict (1.0-1) unstable; urgency=low
+
+  * Initial Release.  Closes: #143755.
+
+ -- John Goerzen <jgoerzen at complete.org>  Fri, 19 Apr 2002 20:28:21 -0500

Modified: packages/freedict-tools/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/rules?rev=55&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/rules (original)
+++ packages/freedict-tools/trunk/debian/rules Mon Jan  1 13:01:33 2007
@@ -78,7 +78,7 @@
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
-	dh_installdocs
+	dh_installdocs debian/README.devel
 	dh_installman
 	dh_install
 	dh_link




More information about the Pkg-freedict-commits mailing list