v9 done

* Finalized v9 mode, which is the new recommended default.
  (But continuing to use v8 is also fine.)
* It is now deprecated for a package to not specify a compatability
  level in debian/compat. Debhelper now warns if this is not done,
  and packages without a debian/compat will eventually FTBFS.

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 3940c05f08829b1c5162d82303a0a66294ee9fe8..070c6d6fc0cf08a7a3008f1398a41c1e28ba4cce 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -20,7 +20,7 @@ use vars qw(@ISA @EXPORT %dh);
            &is_make_jobserver_unavailable &clean_jobserver_makeflags
            &cross_command &set_buildflags &get_buildoption);
 
            &is_make_jobserver_unavailable &clean_jobserver_makeflags
            &cross_command &set_buildflags &get_buildoption);
 

-my $max_compat=9;
+my $max_compat=10;

 
 sub init {
        my %params=@_;
 
 sub init {
        my %params=@_;


@@ -332,26 +332,31 @@ sub dirname {
        
                if (! defined $c) {
                        $c=1;
        
                if (! defined $c) {
                        $c=1;

-                       if (defined $ENV{DH_COMPAT}) {
-                               $c=$ENV{DH_COMPAT};
-                       }
-                       elsif (-e 'debian/compat') {
-                               # Try the file..
+                       if (-e 'debian/compat') {

                                open (COMPAT_IN, "debian/compat") || error "debian/compat: $!";
                                my $l=<COMPAT_IN>;
                                close COMPAT_IN;
                                if (! defined $l || ! length $l) {
                                open (COMPAT_IN, "debian/compat") || error "debian/compat: $!";
                                my $l=<COMPAT_IN>;
                                close COMPAT_IN;
                                if (! defined $l || ! length $l) {

-                                       warning("debian/compat is empty, assuming level $c");
+                                       warning("debian/compat is empty, assuming level $c")
+                                               unless defined $ENV{DH_COMPAT};

                                }
                                else {
                                        chomp $l;
                                        $c=$l;
                                }
                        }
                                }
                                else {
                                        chomp $l;
                                        $c=$l;
                                }
                        }

+                       else {
+                               warning("No compatability level specified in debian/compat");
+                               warning("This package will soon FTBFS; time to fix it!");
+                       }
+
+                       if (defined $ENV{DH_COMPAT}) {
+                               $c=$ENV{DH_COMPAT};
+                       }

                }
 
                if ($c <= 4 && ! $warned_compat && ! $nowarn) {
                }
 
                if ($c <= 4 && ! $warned_compat && ! $nowarn) {

-                       warning("Compatibility levels before 5 are deprecated.");
+                       warning("Compatibility levels before 5 are deprecated (level $c in use)");

                        $warned_compat=1;
                }
        
                        $warned_compat=1;
                }
        

diff --git a/debhelper.pod b/debhelper.pod
index 1d1d907d3297626a9f9b0045e1b6a35f4a40cd17..ef1510efddc139c56fbb1d1a058932eed2977cd6 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -267,9 +267,9 @@ introduced. You tell debhelper which compatibility level it should use, and
 it modifies its behavior in various ways.
 
 Tell debhelper what compatibility level to use by writing a number to
 it modifies its behavior in various ways.
 
 Tell debhelper what compatibility level to use by writing a number to

-F<debian/compat>. For example, to turn on v8 mode:
+F<debian/compat>. For example, to turn on v9 mode:

 
 

-  % echo 8 > debian/compat
+  % echo 9 > debian/compat

 
 Unless otherwise indicated, all debhelper documentation assumes that you
 are using the most recent compatibility level, and in most cases does not
 
 Unless otherwise indicated, all debhelper documentation assumes that you
 are using the most recent compatibility level, and in most cases does not


@@ -435,8 +435,6 @@ none is specified.
 
 =item v8
 
 
 =item v8
 

-This is the recommended mode of operation.
-

 Changes from v7 are:
 
 =over 8
 Changes from v7 are:
 
 =over 8


@@ -466,7 +464,7 @@ B<dh_auto_>I<*> prefer to use Perl's B<Module::Build> in preference to F<Makefil
 
 =item v9
 
 
 =item v9
 

-This compatibility level is still open for development; use with caution.
+This is the recommended mode of operation.

 
 Changes from v8 are:
 
 
 Changes from v8 are:
 


@@ -521,6 +519,20 @@ configuration.
 
 =back
 
 
 =back
 

+=item v10
+
+This compatibility level is still open for development; use with caution.
+
+Changes from v9 are:
+
+=over 8
+
+=item -
+
+None yet..
+
+=back
+

 =back
 
 =head1 NOTES
 =back
 
 =head1 NOTES

diff --git a/debian/changelog b/debian/changelog
index 0ae3f3860b18737592856f42a3ceba13dc59787f..911842547934ab2610f1d673b3edd97cd6079323 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-debhelper (8.9.15) UNRELEASED; urgency=low
+debhelper (9.20120115) unstable; urgency=low

 
 

+  * Finalized v9 mode, which is the new recommended default.
+    (But continuing to use v8 is also fine.)
+  * It is now deprecated for a package to not specify a compatability
+    level in debian/compat. Debhelper now warns if this is not done,
+    and packages without a debian/compat will eventually FTBFS.

   * Updated German man page translation. Closes: #653360
 
   * Updated German man page translation. Closes: #653360
 

- -- Joey Hess <joeyh@debian.org>  Tue, 03 Jan 2012 16:48:54 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Jan 2012 13:59:49 -0400

 
 debhelper (8.9.14) unstable; urgency=low
 
 
 debhelper (8.9.14) unstable; urgency=low
 

diff --git a/debian/compat b/debian/compat
index ec635144f60048986bc560c5576355344005e6e7..f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10

diff --git a/doc/TODO b/doc/TODO
index 573917fa4c40cfb971c0b7a09afaed357d28326a..cd2721f6bee0efb94047fc4fef7ecdf7a8c3c63b 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,10 +1,12 @@
-v9:
+v10:

 
 * escaping in config files (for whitespace)?
 * dh_installinit --restart-after-upgrade as default?
 
 Deprecated:
 
 
 * escaping in config files (for whitespace)?
 * dh_installinit --restart-after-upgrade as default?
 
 Deprecated:
 

+* make a missing debian/compat an error. (started printing warning messages
+  in 20120115)

 * DH_COMPAT 1, 2, 3, 4. Can be removed once all packages are seen to be using
   a newer version. I won't hold my breath. (2 and 3 are getting close though.)
 * dh_suidregister. Once nothing in the archive uses it.
 * DH_COMPAT 1, 2, 3, 4. Can be removed once all packages are seen to be using
   a newer version. I won't hold my breath. (2 and 3 are getting close though.)
 * dh_suidregister. Once nothing in the archive uses it.