[Pkg-freedict-commits] r184 - in /packages/freedict-tools/trunk/debian: README.devel README.source changelog compat control docs patches/003_remove_rubbish_in_dict.diff patches/004_fix_tools_path.diff patches/series

kebil-guest at users.alioth.debian.org kebil-guest at users.alioth.debian.org
Sun Dec 14 18:43:56 UTC 2008 

Author: kebil-guest
Date: Sun Dec 14 18:43:56 2008
New Revision: 184

URL: http://svn.debian.org/wsvn/pkg-freedict/?sc=1&rev=184
Log:
Prepared for uploading to the unstable branch

Added:
    packages/freedict-tools/trunk/debian/README.source
    packages/freedict-tools/trunk/debian/patches/003_remove_rubbish_in_dict.diff
    packages/freedict-tools/trunk/debian/patches/004_fix_tools_path.diff
    packages/freedict-tools/trunk/debian/patches/series
Removed:
    packages/freedict-tools/trunk/debian/README.devel
Modified:
    packages/freedict-tools/trunk/debian/changelog
    packages/freedict-tools/trunk/debian/compat
    packages/freedict-tools/trunk/debian/control
    packages/freedict-tools/trunk/debian/docs

Added: packages/freedict-tools/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/README.source?rev=184&op=file
==============================================================================
--- packages/freedict-tools/trunk/debian/README.source (added)
+++ packages/freedict-tools/trunk/debian/README.source Sun Dec 14 18:43:56 2008
@@ -1,0 +1,59 @@
+Editing and creating patches
+============================
+To start, you should be in the source package directory -- this is the
+directory that contains the debian/ directory.
+
+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 filename
+or
+   quilt edit filename
+
+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 -p1
+
+to update your patch. 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. It is very
+advisable always to 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). Then, as
+described above in the case of editing existing patches, you'll want to be
+sure quilt knows which files you are editing. Run:
+
+   quilt add filename
+
+Now make your edits to the source files, directly in the source tree. When you
+are finished, run:
+
+   quilt refresh -p1
+
+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=184&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/changelog (original)
+++ packages/freedict-tools/trunk/debian/changelog Sun Dec 14 18:43:56 2008
@@ -1,9 +1,9 @@
-freedict-tools (0.2+cvs20080304-1) UNRELEASED; urgency=low
+freedict-tools (0.2+cvs20080304-1) experimental; urgency=low
 
   * New upstream CVS snapshot.
   * debian/control:
-    - bumped Standards-Version to 3.7.3. No changes required;
-    - use debhelper (>> 6.0.0);
+    - bumped Standards-Version to 3.8.0. No changes required;
+    - use debhelper (>= 7);
     - the homepage address removed from extended package description and added
       Homepage field in the source package;
     - added Vcs-Browser and fixed Vcs-svn fields;
@@ -18,19 +18,26 @@
       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/patches:
+    - removed patch 002_scriptdir_in_Makefile.common.diff - accepted by the
+      upstream.
+    - added patch 003_remove_rubbish_in_dict.diff for removing the last
+      rubbish line in the .dict file.
+    - added patch 004_fix_tools_path.diff for set up the Debian-specific path
+      of tools directory.
   * 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. 
+      parameter --locale in /etc/default/dictd.
   * Removed the script teiaddphonetics from installing to this package.
     We can't to implement the phonetics import because of the license issue.
+  * Fixed the file explaining how to edit or create the patches and renamed
+    from debian/README.devel to debian/README.source
 
- -- Kęstutis Biliūnas <kebil at kaunas.init.lt>  Wed, 05 Mar 2008 11:06:52 +0200
+ -- Kęstutis Biliūnas <kebil at kaunas.init.lt>  Wed, 19 Nov 2008 09:30:28 +0200
 
 freedict-tools (0.2-1) experimental; urgency=low
 

Modified: packages/freedict-tools/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/compat?rev=184&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/compat (original)
+++ packages/freedict-tools/trunk/debian/compat Sun Dec 14 18:43:56 2008
@@ -1,1 +1,1 @@
-6
+7

Modified: packages/freedict-tools/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/control?rev=184&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/control (original)
+++ packages/freedict-tools/trunk/debian/control Sun Dec 14 18:43:56 2008
@@ -3,9 +3,9 @@
 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 (>> 6.0.0), quilt (>= 0.40)
+Build-Depends: debhelper (>= 7), quilt (>= 0.40)
 Build-Depends-Indep: perl, stardict-tools
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 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/

Modified: packages/freedict-tools/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/docs?rev=184&op=diff
==============================================================================
--- packages/freedict-tools/trunk/debian/docs (original)
+++ packages/freedict-tools/trunk/debian/docs Sun Dec 14 18:43:56 2008
@@ -1,2 +1,2 @@
 README
-debian/README.devel
+debian/README.source

Added: packages/freedict-tools/trunk/debian/patches/003_remove_rubbish_in_dict.diff
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/patches/003_remove_rubbish_in_dict.diff?rev=184&op=file
==============================================================================
--- packages/freedict-tools/trunk/debian/patches/003_remove_rubbish_in_dict.diff (added)
+++ packages/freedict-tools/trunk/debian/patches/003_remove_rubbish_in_dict.diff Sun Dec 14 18:43:56 2008
@@ -1,0 +1,18 @@
+Removes the last rubbish line in the .dict file. 
+
+This patch by Kęstutis Biliūnas.
+This patch must be submitted upstream.
+
+Index: freedict-tools-0.2+cvs20080304/Makefile.common
+===================================================================
+--- freedict-tools-0.2+cvs20080304.orig/Makefile.common
++++ freedict-tools-0.2+cvs20080304/Makefile.common
+@@ -158,6 +158,8 @@
+ 
+ %.dict %.index: %.c5 query-dictd
+ 	dictfmt -t --headword-separator %%% $(DICTFMTFLAGS) $* <$<
++	cat $*.dict | sed '$$d' > tmp.dic
++	mv tmp.dic $*.dict
+ 
+ $(FREEDICTDIR)/release/dict-tbz2/freedict-$(dictname)-$(version).tar.bz2: \
+ 	$(dictname).dict.dz $(dictname).index

Added: packages/freedict-tools/trunk/debian/patches/004_fix_tools_path.diff
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/patches/004_fix_tools_path.diff?rev=184&op=file
==============================================================================
--- packages/freedict-tools/trunk/debian/patches/004_fix_tools_path.diff (added)
+++ packages/freedict-tools/trunk/debian/patches/004_fix_tools_path.diff Sun Dec 14 18:43:56 2008
@@ -1,0 +1,18 @@
+Set up the Debian-specific path for tools.
+
+This patch by Kęstutis Biliūnas.
+This patch will not be submitted upstream.
+
+Index: freedict-tools-0.2+cvs20080304/Makefile.common
+===================================================================
+--- freedict-tools-0.2+cvs20080304.orig/Makefile.common
++++ freedict-tools-0.2+cvs20080304/Makefile.common
+@@ -1,6 +1,6 @@
+ toolsdir := $(FREEDICTDIR)/tools
+-#include $(toolsdir)/Makefile.config
+-include Makefile.config
++include $(toolsdir)/Makefile.config
++#include Makefile.config
+ 
+ #######################
+ #### set some variables

Added: packages/freedict-tools/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-freedict/packages/freedict-tools/trunk/debian/patches/series?rev=184&op=file
==============================================================================
--- packages/freedict-tools/trunk/debian/patches/series (added)
+++ packages/freedict-tools/trunk/debian/patches/series Sun Dec 14 18:43:56 2008
@@ -1,0 +1,2 @@
+003_remove_rubbish_in_dict.diff 
+004_fix_tools_path.diff

More information about the Pkg-freedict-commits mailing list