[Oval-commits] r423 - in trunk/ovaldi/debian: . patches

[Pavel Vinogradov]

Author: blaze-guest
Date: 2009-09-16 03:11:37 +0000 (Wed, 16 Sep 2009)
New Revision: 423

Modified:
   trunk/ovaldi/debian/changelog
   trunk/ovaldi/debian/patches/debian.makefile.patch
   trunk/ovaldi/debian/patches/debian.manpage.hyphen.patch
   trunk/ovaldi/debian/patches/debian.manpage.patch
   trunk/ovaldi/debian/patches/debian.spelling.patch
   trunk/ovaldi/debian/patches/debian.xsddir.patch
Log:
Add description to each patch. Use DEP-3 as format. Fix lintian warning quilt-patch-missing-description

Modified: trunk/ovaldi/debian/changelog
===================================================================
--- trunk/ovaldi/debian/changelog	2009-09-15 19:16:23 UTC (rev 422)
+++ trunk/ovaldi/debian/changelog	2009-09-16 03:11:37 UTC (rev 423)
@@ -5,6 +5,8 @@
     lintian warning.
   * Add debian/README.source - fix lintian warning.
   * Update debian/copyright - fix lintian warning.
+  * Add description to each patch in DEP-3 format and fix
+    quilt-patch-missing-description lintian warning.
 
  -- Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>  Mon, 14 Sep 2009 08:14:43 +0500
 
@@ -25,9 +27,6 @@
     are executable in the source package, probably due to Windows to Unix
     copying (lintian fix)
 
-  [ Pavel Vinogradov ]
-  * - i
-
  -- Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>  Sat, 12 Sep 2009 22:33:49 +0500
 
 oval-interpreter (5.5.4-1) unstable; urgency=low

Modified: trunk/ovaldi/debian/patches/debian.makefile.patch
===================================================================
--- trunk/ovaldi/debian/patches/debian.makefile.patch	2009-09-15 19:16:23 UTC (rev 422)
+++ trunk/ovaldi/debian/patches/debian.makefile.patch	2009-09-16 03:11:37 UTC (rev 423)
@@ -1,3 +1,15 @@
+#Description: Change order in which we check rpm and dpkg library availability.
+#  In Debian we can have both rpm and dpkg library installed, in this case 
+#  ovaldi will build with RPM support, not dpkg.
+#  .
+#  Upstream is not interested in switch library check order.
+#  Patch require updates with new ovaldi releases to apply without fuzz and 
+#  offset warnings.
+#
+#Forwaded: Yes, but rejected
+#Author: Javier Fernández-Sanguino Peña <jfs at debian.org>
+#Last-Update: 2009-09-16
+
 diff -urN ovaldi-mitre/project/linux/Makefile ovaldi-debian/project/linux/Makefile
 --- ovaldi-mitre/project/linux/Makefile	2008-04-20 19:12:24.000000000 +0500
 +++ ovaldi-debian/project/linux/Makefile	2008-04-20 20:55:50.000000000 +0500

Modified: trunk/ovaldi/debian/patches/debian.manpage.hyphen.patch
===================================================================
--- trunk/ovaldi/debian/patches/debian.manpage.hyphen.patch	2009-09-15 19:16:23 UTC (rev 422)
+++ trunk/ovaldi/debian/patches/debian.manpage.hyphen.patch	2009-09-16 03:11:37 UTC (rev 423)
@@ -1,3 +1,8 @@
+#Description: Fix lintian warning hyphen-used-as-minus-sign
+#  Patch already applied in upstream and will included in next release
+#Forwarded: https://sourceforge.net/tracker/?func=detail&atid=1033794&aid=2859068&group_id=215469
+#Author: Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+#Last-Update: 2009-09-16
 diff -urN ovaldi-2.6.1-original/docs/ovaldi.1 ovaldi-2.6.1-debian/docs/ovaldi.1
 --- ovaldi-2.6.1-original/docs/ovaldi.1	2009-09-14 08:22:18.000000000 +0500
 +++ ovaldi-2.6.1-debian/docs/ovaldi.1	2009-09-15 09:01:17.000000000 +0500

Modified: trunk/ovaldi/debian/patches/debian.manpage.patch
===================================================================
--- trunk/ovaldi/debian/patches/debian.manpage.patch	2009-09-15 19:16:23 UTC (rev 422)
+++ trunk/ovaldi/debian/patches/debian.manpage.patch	2009-09-16 03:11:37 UTC (rev 423)
@@ -1,3 +1,12 @@
+#Description: Add usage example and point to real location of xml and xsd files
+#  Add usage example with sample definition shipped with package.
+#  .
+#  Use "current directory" instead of "Interpreter directory"
+#  .
+#  Point to /usr/share/ovaldi/xml instead of Interpreter directory
+#Forwarded: no
+#Author: Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+#Last-Update: 2009-09-16
 diff -urN ovaldi.mitre/docs/ovaldi.1 ovaldi.debian/docs/ovaldi.1
 --- ovaldi.mitre/docs/ovaldi.1	2008-04-20 20:16:55.000000000 +0500
 +++ ovaldi.debian/docs/ovaldi.1	2008-04-20 20:43:14.000000000 +0500

Modified: trunk/ovaldi/debian/patches/debian.spelling.patch
===================================================================
--- trunk/ovaldi/debian/patches/debian.spelling.patch	2009-09-15 19:16:23 UTC (rev 422)
+++ trunk/ovaldi/debian/patches/debian.spelling.patch	2009-09-16 03:11:37 UTC (rev 423)
@@ -1,3 +1,10 @@
+#Description: Fix lintian warning spelling-error-in-binary
+#  Fix spelling errors in source header files.
+# 
+#  Patch already applied in upstream and will included in next release
+#Forwarded: https://sourceforge.net/tracker/index.php?func=detail&aid=2858387&group_id=215469&atid=1033794
+#Author: Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+#Last-Update: 2009-09-16
 diff -urN ovaldi-2.6.1-original/src/AbsProbe.h ovaldi-2.6.1-debian/src/AbsProbe.h
 --- ovaldi-2.6.1-original/src/AbsProbe.h	2009-09-14 08:22:17.000000000 +0500
 +++ ovaldi-2.6.1-debian/src/AbsProbe.h	2009-09-14 08:44:42.000000000 +0500

Modified: trunk/ovaldi/debian/patches/debian.xsddir.patch
===================================================================
--- trunk/ovaldi/debian/patches/debian.xsddir.patch	2009-09-15 19:16:23 UTC (rev 422)
+++ trunk/ovaldi/debian/patches/debian.xsddir.patch	2009-09-16 03:11:37 UTC (rev 423)
@@ -1,3 +1,11 @@
+#Description: Change path to shared xsd files, which used during ovadi execution
+#  By default ovadi search current directory for required xsd files, 
+#  but in Debian package this files was moved to /usr/share/ovaldi/xml dir.
+#  .
+#  Patch was rewrited for 5.5.25 due to chenges in xsd handling.
+#Forwarded: no
+#Author: Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
+#Last-Update: 2009-09-16
 diff -urN ovaldi-5.5.23-orig/src/Common.cpp ovaldi-5.5.23-debian/src/Common.cpp
 --- ovaldi-5.5.23-orig/src/Common.cpp	2009-06-18 06:54:39.000000000 +0500
 +++ ovaldi-5.5.23-debian/src/Common.cpp	2009-08-11 23:36:06.000000000 +0500