--- policyrcd-script-zg2-0.1.orig/debian/control.in
+++ policyrcd-script-zg2-0.1/debian/control.in
@@ -3,15 +3,16 @@
 Priority: extra
 Maintainer: Marc Haber <mh+debian-packages@zugschlus.de>
 Build-Depends: @cdbs@
-Standards-Version: 3.6.1
+Build-Depends-Indep: @cdbs@
+Standards-Version: 3.6.2
 
 Package: policyrcd-script-zg2
-Architecture: any
+Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: policy-compliant interface from invoke-rc.d to local config files
  a script which is linked via the alternatives subsystem to
  /usr/sbin/update-rc.d. This script looks for a local policy-rc.d
- script in /usr/local an /etc, providing a policy- and FHS-compliant
+ script in /usr/local and /etc, providing a policy- and FHS-compliant
  way to interface invoke-rc.d with a local script.
  .
  Without this package, a local admin wanting to cleanly interface with
--- policyrcd-script-zg2-0.1.orig/debian/control
+++ policyrcd-script-zg2-0.1/debian/control
@@ -3,15 +3,16 @@
 Priority: extra
 Maintainer: Marc Haber <mh+debian-packages@zugschlus.de>
 Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0)
-Standards-Version: 3.6.1
+Build-Depends-Indep: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0)
+Standards-Version: 3.6.2
 
 Package: policyrcd-script-zg2
-Architecture: any
+Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: policy-compliant interface from invoke-rc.d to local config files
  a script which is linked via the alternatives subsystem to
  /usr/sbin/update-rc.d. This script looks for a local policy-rc.d
- script in /usr/local an /etc, providing a policy- and FHS-compliant
+ script in /usr/local and /etc, providing a policy- and FHS-compliant
  way to interface invoke-rc.d with a local script.
  .
  Without this package, a local admin wanting to cleanly interface with
--- policyrcd-script-zg2-0.1.orig/debian/copyright
+++ policyrcd-script-zg2-0.1/debian/copyright
@@ -13,5 +13,5 @@
 A copy of the GNU General Public License is available as
 /usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution or
 on the World Wide Web at http://www.gnu.org/copyleft/gpl.html.  You can
-also obtain it by writing to the Free Software Foundation, Inc., 59
-Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+also obtain it by writing to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
--- policyrcd-script-zg2-0.1.orig/debian/rules
+++ policyrcd-script-zg2-0.1/debian/rules
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
-DEB_AUTO_UPDATE_DEBIAN_CONTROL := yes
+# to re-generate debian/control, invoke
+# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
+
+# automatic debian/control generation disabled, cdbs bug #311724.
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
--- policyrcd-script-zg2-0.1.orig/debian/changelog
+++ policyrcd-script-zg2-0.1/debian/changelog
@@ -1,3 +1,18 @@
+policyrcd-script-zg2 (0.1-2) unstable; urgency=low
+
+  * disable DEB_AUTO_UPDATE_DEBIAN_CONTROL, see #311724
+  * fix typo in package description, thanks to Mika Prokop.
+  * script is /bin/sh compatible, drop /bin/bash, thanks to Mika Prokop.
+  * add SEE ALSO section to man page, thanks to Mika Prokop.
+  * manpage is no longer preliminary.
+  * new FSF postal address.
+  * Architecture: all, copy Build-Depends to Build-Depends-Indep
+  * add lintian source override for build-depends-without-arch-dep: All
+    cdbs-generated dependencies are needed on clean.
+  * Standards-Version: 3.6.2, no changes needed
+
+ -- Marc Haber <mh+debian-packages@zugschlus.de>  Sat, 22 Oct 2005 17:47:10 +0000
+
 policyrcd-script-zg2 (0.1-1) experimental; urgency=low
 
   * first Debian package. Closes: #292299
--- policyrcd-script-zg2-0.1.orig/debian/source.lintian-overrides
+++ policyrcd-script-zg2-0.1/debian/source.lintian-overrides
@@ -0,0 +1 @@
+policyrcd-script-zg2: build-depends-without-arch-dep
--- policyrcd-script-zg2-0.1.orig/scripts/zg-policy-rc.d
+++ policyrcd-script-zg2-0.1/scripts/zg-policy-rc.d
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 CONFFILE="/etc/zg-policy-rc.d.conf"
 
--- policyrcd-script-zg2-0.1.orig/scripts/zg-policy-rc.d.pod
+++ policyrcd-script-zg2-0.1/scripts/zg-policy-rc.d.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-zg-policy-rc.d - preliminary manpage
+zg-policy-rc.d - allows flexible handling of policy-rc.d
 
 =head1 DOCUMENTATION
 
@@ -24,6 +24,10 @@
 
 Many. Be prepared to debug.
 
+=head1 SEE ALSO
+
+invoke-rc.d(8)
+
 =head1 AUTHOR
 
 Marc Haber <mh+debian-packages@zugschlus.de>