r359: * I started work on debhelper v2 over a year ago, with a long list of

     changes I hoped to get in that broke backwards compatability. That
     development stalled after only the most important change was made,
     although I did get out over 100 releases in the debhelper 2.0.x tree.
     In the meantime, lots of packages have switched to using v2, despite my
     warnings that doing so leaves packages open to being broken without
     notice until v2 is complete.
   * Therefore, I am calling v2 complete, as it is. Future non-compatabile
     changes will happen in v3, which will be started soon. This means that
     by using debhelper v2, one major thing changes: debhelper uses
     debian/<package> as the temporary directory for *all* packages;
     debian/tmp is no longer used to build binary packages out of. This is
     very useful for multi-binary packages, and I reccommend everyone
     switch to v2.
   * Updated example rules files to use v2 by default.
   * Updated all documentation to assume that v2 is being used.
   * Added a few notes for people still using v1.
   * Moved all of the README into debhelper(1).

4 files changed, 13 insertions, 16 deletions

diff --git a/examples/rules b/examples/rules
index a59c98cf..19b5777a 100755
--- a/examples/rules
+++ b/examples/rules
@@ -6,7 +6,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=1
+export DH_COMPAT=2
 
 build: build-stamp
 build-stamp:
@@ -34,8 +34,8 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	# Add here commands to install the package into debian/tmp.
-	#$(MAKE) prefix=`pwd`/debian/tmp/usr install
+	# Add here commands to install the package into debian/<packagename>
+	#$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -43,7 +43,7 @@ binary-indep: build install
 
 # Build architecture-dependent files here.
 binary-arch: build install
-#	dh_testversion
+	dh_testversion 2
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf	
diff --git a/examples/rules.indep b/examples/rules.indep
index 694b53ae..0c3e6e15 100755
--- a/examples/rules.indep
+++ b/examples/rules.indep
@@ -8,7 +8,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=1
+export DH_COMPAT=2
 
 build: build-stamp
 build-stamp:
@@ -36,12 +36,12 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	# Add here commands to install the package into debian/tmp.
-	#$(MAKE) prefix=`pwd`/debian/tmp/usr install
+	# Add here commands to install the package into debian/<packagename>.
+	#$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
 
 # Build architecture-independent files here.
 binary-indep: build install
-#	dh_testversion
+	dh_testversion 2
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf
diff --git a/examples/rules.multi b/examples/rules.multi
index 8c79626d..3ac7a030 100755
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -10,7 +10,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=1
+export DH_COMPAT=2
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
@@ -51,8 +51,7 @@ install: build
 # Pass -i to all debhelper commands in this target to reduce clutter.
 binary-indep: DH_OPTIONS=-i
 binary-indep: build install
-	# Need this version of debhelper for DH_OPTIONS to work.
-	dh_testversion 1.1.17
+	dh_testversion 2
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf
@@ -84,8 +83,7 @@ binary-indep: build install
 # Pass -a to all debhelper commands in this target to reduce clutter.
 binary-arch: DH_OPTIONS=-a
 binary-arch: build install
-	# Need this version of debhelper for DH_OPTIONS to work.
-	dh_testversion 1.1.17
+	dh_testversion 2
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf
diff --git a/examples/rules.multi2 b/examples/rules.multi2
index 3dbc0f52..0af60eea 100755
--- a/examples/rules.multi2
+++ b/examples/rules.multi2
@@ -9,7 +9,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=1
+export DH_COMPAT=2
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
@@ -51,8 +51,7 @@ install: build
 # affect _all_ packages. Anything you want to only affect one package
 # should be put in another target, such as the install target.
 binary-common:
-	# Need this version of debhelper for DH_OPTIONS to work.
-	dh_testversion 1.1.17
+	dh_testversion 2
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf