[Dctrl-tools-devel] CVS dctrl-tools/debian

[CVS User ajk]

Update of /cvsroot/dctrl-tools/dctrl-tools/debian
In directory haydn:/tmp/cvs-serv5692/debian

Modified Files:
	NEWS changelog control copyright 
Log Message:
merge 2.6.6 and get rid of the useless field type abstraction

--- /cvsroot/dctrl-tools/dctrl-tools/debian/NEWS	2004/07/12 16:01:36	1.7
+++ /cvsroot/dctrl-tools/dctrl-tools/debian/NEWS	2005/06/08 18:13:31	1.8
@@ -1,3 +1,11 @@
+grep-dctrl (2.6.6) unstable; urgency=low
+
+    Version number comparisons are now supported.  This subsumes the
+    earlier support for numeric comparison, since the version comparison
+    routine handles it as a special case.
+
+ -- Antti-Juhani Kaijanaho <ajk@debian.org>  Wed,  8 Jun 2005 19:26:56 +0300
+
 grep-dctrl (2.6.1) experimental; urgency=low
 
     This version introduces a new program, sync-available, whose function
--- /cvsroot/dctrl-tools/dctrl-tools/debian/changelog	2005/03/26 17:58:22	1.43
+++ /cvsroot/dctrl-tools/dctrl-tools/debian/changelog	2005/06/08 18:13:31	1.44
@@ -6,6 +6,7 @@
   * Merge 2.6.3.
   * Merge 2.6.4.
   * Merge 2.6.5.
+  * Merge 2.6.6.
   * Rename source and binary package to dctrl-tools.
   * debian/{rules,control}: Generate an empty transition package for
     grep-dctrl.
@@ -15,7 +16,25 @@
   * Refactor a lot to allow several programs share the backbone code.
   * New program sort-dctrl.
 
- -- Antti-Juhani Kaijanaho <ajk@debian.org>  Sat, 26 Mar 2005 19:52:37 +0200
+ -- Antti-Juhani Kaijanaho <ajk@debian.org>  Wed,  8 Jun 2005 20:58:53 +0300
+
+grep-dctrl (2.6.6) unstable; urgency=low
+
+  * Go to unstable again.
+  * Merge 2.1.10 and 2.1.11 (no po/ merge).
+  * po/fi.po: Sync translation with 2.1.11.
+  * Change numeric comparison to version number comparison.
+    Noteworthy individual changes:
+      + debian/control: Drop libgmp3-dev build-dependency.
+      + Makefile: No longer link with libgmp.
+      + grep-dctrl.1.cp: Document, remove earlier warnings.
+      + grep-dctrl.c: Document, remove earlier warnings (etc.)
+      + predicate.c: Replace numeric comparison with version
+        comparison.  Copy the actual comparison code from dpkg.
+      + paragraph.[ch]: No longer do a numeric parse.
+      + debian/copyright: Document dpkg copyright.
+
+ -- Antti-Juhani Kaijanaho <ajk@debian.org>  Wed,  8 Jun 2005 19:25:10 +0300
 
 grep-dctrl (2.6.5) experimental; urgency=low
 
@@ -129,6 +148,22 @@
 
  -- Antti-Juhani Kaijanaho <ajk@debian.org>  Fri, 16 Jan 2004 03:08:58 +0200
 
+grep-dctrl (2.1.11) unstable; urgency=medium
+
+  * po/fi.po: Fix encoding mistakes.
+    Closes: #310988 (bad char in Finnish translation)
+    [Reported by Lars Wirzenius <liw@iki.fi>]
+
+ -- Antti-Juhani Kaijanaho <ajk@debian.org>  Fri, 27 May 2005 19:22:50 +0300
+
+grep-dctrl (2.1.10) unstable; urgency=medium
+
+  * grep-dctrl.1.cp: Reinsert COMPATIBILITY section, which seems to have
+    been removed accidentally just prior to 2.0.  Thanks to Ian Lynagh for
+    spotting this.
+  
+ -- Antti-Juhani Kaijanaho <ajk@debian.org>  Fri,  8 Apr 2005 16:42:15 +0300
+
 grep-dctrl (2.1.9) unstable; urgency=low
 
   * grep-dctrl.c: Allow atoms to share code, and use that
--- /cvsroot/dctrl-tools/dctrl-tools/debian/control	2005/03/26 11:27:50	1.14
+++ /cvsroot/dctrl-tools/dctrl-tools/debian/control	2005/06/08 18:13:31	1.15
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Antti-Juhani Kaijanaho <ajk@debian.org>
 Standards-Version: 3.6.1
-Build-Depends: gettext (>= 0.11-0), libgmp3-dev, gcc (>= 3.0)
+Build-Depends: gettext (>= 0.11-0), gcc (>= 3.0)
 
 Package: dctrl-tools
 Architecture: any
--- /cvsroot/dctrl-tools/dctrl-tools/debian/copyright	2004/01/06 10:26:30	1.4
+++ /cvsroot/dctrl-tools/dctrl-tools/debian/copyright	2005/06/08 18:13:31	1.5
@@ -1,6 +1,6 @@
 This package and the program in it were written and debianized by
 Antti-Juhani Kaijanaho <ajk@debian.org>.  The program contains code by
-Lars Wirzenius.
+Wichert Akkerman, Ian Jackson and Lars Wirzenius.
 
 Copyright:
 
@@ -65,3 +65,29 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+Marked portions of the file predicate.c are covered by the following
+copyright:
+
+/*
+ * libdpkg - Debian packaging suite library routines
+ * vercmp.c - comparison of version numbers
+ * utils.c - Helper functions for dpkg
+ *
+ * Copyright (C) 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright (C) 2001 Wichert Akkerman <wakkerma@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with dpkg; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+