[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.2.9-21-g6ec5a39



The following commit has been merged in the master branch:
commit 6ec5a393477ae55c1c15b2a67af7a9b039f07707
Author: Russ Allbery <rra@debian.org>
Date:   Sun Apr 26 22:22:53 2009 -0700

    Mention in tag descriptions that empty patch list files will disappear
    
    * checks/patch-systems.desc:
      + [RA] Mention that empty dpatch patch lists or quilt series files
        will disappear in a non-native source package and hence produce the
        warning about a missing file.  (Closes: #525005)

diff --git a/checks/patch-systems.desc b/checks/patch-systems.desc
index 0a7799a..336cbd4 100644
--- a/checks/patch-systems.desc
+++ b/checks/patch-systems.desc
@@ -11,10 +11,12 @@ Severity: normal
 Certainty: certain
 Info: Using dpatch requires you to explicitly list all patches you want
  to apply in debian/patches/00list. This package build-depends on dpatch,
- but does not provide a patch list.
+ but does not provide a patch list.  You should either remove the dpatch
+ build dependency or add a patch list.
  .
- You should either remove the dpatch build dependency or add a patch
- list.
+ Note that an empty file cannot be represented in the Debian diff, so an
+ empty patch list will disappear in the source package.  If you intended
+ for the series file to be empty, add a comment line.
 
 Tag: dpatch-index-references-non-existent-patch
 Severity: important
@@ -39,11 +41,13 @@ Tag: quilt-build-dep-but-no-series-file
 Severity: normal
 Certainty: certain
 Info: Using quilt requires you to explicitly list all patches you want
- to apply in debian/patches/series. This package build-depends on quilt,
- but does not provide a patch list.
+ to apply in debian/patches/series.  This package build-depends on quilt,
+ but does not provide a patch list.  You should either remove the quilt
+ build dependency or add a series file.
  .
- You should either remove the quilt build dependency or add a series
- file.
+ Note that an empty file cannot be represented in the Debian diff, so an
+ empty series file will disappear in the source package.  If you intended
+ for the series file to be empty, add a comment line.
 
 Tag: quilt-series-but-no-build-dep
 Severity: normal
diff --git a/debian/changelog b/debian/changelog
index a5b39e4..680c110 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ lintian (2.2.10) UNRELEASED; urgency=low
   * checks/menu-format{,.desc}:
     + [RA] Remove desktop-mimetype-without-update-call.  This is now
       handled by triggers.  Thanks, Chow Loong Jin.  (Closes: #525133)
+  * checks/patch-systems.desc:
+    + [RA] Mention that empty dpatch patch lists or quilt series files
+      will disappear in a non-native source package and hence produce the
+      warning about a missing file.  (Closes: #525005)
   * checks/scripts{,.desc}:
     + [RA] Handle command delimiters, $() expressions, and braces and
       parentheses in the checks for correct diversion handling.  Patch
diff --git a/t/tests/patch-systems-quilt-description/debian/debian/control.in b/t/tests/patch-systems-empty-series/debian/debian/control.in
similarity index 100%
copy from t/tests/patch-systems-quilt-description/debian/debian/control.in
copy to t/tests/patch-systems-empty-series/debian/debian/control.in
diff --git a/reporting/lintian-dummy.cfg b/t/tests/patch-systems-empty-series/debian/debian/patches/series
similarity index 100%
copy from reporting/lintian-dummy.cfg
copy to t/tests/patch-systems-empty-series/debian/debian/patches/series
diff --git a/t/tests/patch-systems-empty-series/desc b/t/tests/patch-systems-empty-series/desc
new file mode 100644
index 0000000..77298b5
--- /dev/null
+++ b/t/tests/patch-systems-empty-series/desc
@@ -0,0 +1,6 @@
+Testname: patch-systems-empty-series
+Sequence: 6000
+Version: 1.0
+Description: Test for quilt patches with empty series
+Test-Against: quilt-build-dep-but-no-series-file
+References: Debian Bug #525005
diff --git a/t/debs/description-synopsis-spaces/tags b/t/tests/patch-systems-empty-series/tags
similarity index 100%
copy from t/debs/description-synopsis-spaces/tags
copy to t/tests/patch-systems-empty-series/tags
diff --git a/t/tests/basic-non-native-with-epoch/upstream/README b/t/tests/patch-systems-empty-series/upstream/README
similarity index 100%
copy from t/tests/basic-non-native-with-epoch/upstream/README
copy to t/tests/patch-systems-empty-series/upstream/README

-- 
Debian package checker


Reply to: