--- debian-xcontrol-0.0.4.orig/debian/compat
+++ debian-xcontrol-0.0.4/debian/compat
@@ -0,0 +1 @@
+5
--- debian-xcontrol-0.0.4.orig/debian/changelog
+++ debian-xcontrol-0.0.4/debian/changelog
@@ -0,0 +1,73 @@
+debian-xcontrol (0.0.4-1.1) unstable; urgency=low
+
+ * NMU with maintainer's approval
+ * Fix several reasons for FTBFS and rebuild the package against
+ libapt-pkg-dev/0.8.0 to make it installable again.
+ - [debian/control, debian/xcontrol] Remove libboost1.*-dev build
+ dependencies and only leave libboost-dev (which is no more a virtual
+ package) to allow to build with sbuild again. (Closes: #560669)
+ - [debian/rules] Remove -Werror to build against
+ libapt-pkg-dev/0.8.0. (Closes: #594778)
+ * Bump Standard-Version to 3.9.1 (no changes)
+
+ -- Axel Beckert <abe@debian.org> Sun, 29 Aug 2010 13:34:09 +0200
+
+debian-xcontrol (0.0.4-1) unstable; urgency=low
+
+ * New version
+ * Add Recommends/Suggests/Conflicts/Replaces/Provides/Breaks
+ * Add Cross-Compiling
+ * Add Bootstrap
+ * Add Optional
+ * Add per-package Build-Depends{,-Tools,-Indep}
+ * Fix alternatives handling in xdpkg-checkbuilddeps
+
+ -- Simon Richter <sjr@debian.org> Wed, 06 May 2009 14:19:18 +0200
+
+debian-xcontrol (0.0.3-3) unstable; urgency=low
+
+ * Allow building against Boost 1.37
+
+ -- Simon Richter <sjr@debian.org> Mon, 27 Apr 2009 20:42:20 +0200
+
+debian-xcontrol (0.0.3-2) unstable; urgency=low
+
+ * Patch configure check (fix PPC build)
+
+ -- Simon Richter <sjr@debian.org> Tue, 21 Apr 2009 10:56:59 +0200
+
+debian-xcontrol (0.0.3-1) unstable; urgency=low
+
+ * New version, now supports dependency alternatives
+
+ -- Simon Richter <sjr@debian.org> Fri, 17 Apr 2009 17:02:42 +0200
+
+debian-xcontrol (0.0.2~pre1+nmu2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc-4.3. Based on a patch from Kumar Appaiah.
+ (Closes: 474530)
+
+ -- James Vega <jamessan@debian.org> Sat, 26 Apr 2008 17:30:45 -0400
+
+debian-xcontrol (0.0.2~pre1+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Added cstdlib to includes for src/architecture.cc as suggested by Kumar
+ Appaiah (Closes: #455673)
+
+ -- Alexander Schmehl <tolimar@debian.org> Sun, 06 Apr 2008 12:53:42 +0200
+
+debian-xcontrol (0.0.2~pre1) unstable; urgency=low
+
+ * Added rudimentary xdpkg-checkbuilddeps (APT based)
+ * Added manual pages
+ * Added more control fields found in normal control files
+
+ -- Simon Richter <sjr@debian.org> Sun, 09 Sep 2007 22:57:19 +0200
+
+debian-xcontrol (0.0.1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Simon Richter <sjr@debian.org> Thu, 26 Jul 2007 18:36:47 +0200
--- debian-xcontrol-0.0.4.orig/debian/copyright
+++ debian-xcontrol-0.0.4/debian/copyright
@@ -0,0 +1,33 @@
+This package is written and maintained by Simon Richter <sjr@debian.org>.
+
+The most recent version can always be found in the Debian archive.
+
+Upstream Author:
+
+ Simon Richter
+
+Copyright:
+
+ Copyright (C) 2007 Simon Richter
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2007, Simon Richter <sjr@debian.org> and
+is licensed under the GPL, see above.
--- debian-xcontrol-0.0.4.orig/debian/control
+++ debian-xcontrol-0.0.4/debian/control
@@ -0,0 +1,17 @@
+Source: debian-xcontrol
+Section: devel
+Priority: extra
+Maintainer: Simon Richter <sjr@debian.org>
+Build-Depends: libboost-dev, libapt-pkg-dev, debhelper (>= 5), autotools-dev
+Standards-Version: 3.9.1
+
+Package: debian-xcontrol
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Extended syntax for debian/control files
+ This tool generates a policy-compliant debian/control file from a similar
+ file with a richer syntax, debian/xcontrol.
+ .
+ This allows the package maintainer to add additional hints useful e.g. when
+ cross-compiling without adding the burden to maintain multiple files
+ consistently.
--- debian-xcontrol-0.0.4.orig/debian/rules
+++ debian-xcontrol-0.0.4/debian/rules
@@ -0,0 +1,90 @@
+#!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CXXFLAGS = -W -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CXXFLAGS += -O0
+else
+ CXXFLAGS += -O2
+endif
+
+config.status: configure
+ dh_testdir
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+ ./configure \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ CXXFLAGS='$(CXXFLAGS)' \
+ LDFLAGS='-Wl,-z,defs'
+
+build: build-stamp
+
+build-stamp: config.status
+ dh_testdir
+ $(MAKE)
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+ src/xcontrol check
+endif
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ [ ! -f Makefile ] || $(MAKE) distclean
+ rm -f config.sub config.guess
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ $(MAKE) DESTDIR=$(shell pwd)/debian/debian-xcontrol install
+
+binary-indep: build install
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+# dh_install
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_python
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- debian-xcontrol-0.0.4.orig/debian/xcontrol
+++ debian-xcontrol-0.0.4/debian/xcontrol
@@ -0,0 +1,19 @@
+Source: debian-xcontrol
+Section: devel
+Priority: extra
+Maintainer: Simon Richter <sjr@debian.org>
+Cross-Compiling: yes
+Build-Depends: libboost-dev, libapt-pkg-dev
+Build-Depends-Tools: debhelper (>= 5), autotools-dev
+Standards-Version: 3.9.1
+
+Package: debian-xcontrol
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Extended syntax for debian/control files
+ This tool generates a policy-compliant debian/control file from a similar
+ file with a richer syntax, debian/xcontrol.
+ .
+ This allows the package maintainer to add additional hints useful e.g. when
+ cross-compiling without adding the burden to maintain multiple files
+ consistently.