--- obconf-2.0.1.orig/debian/control
+++ obconf-2.0.1/debian/control
@@ -1,16 +1,18 @@
 Source: obconf
 Section: x11
 Priority: optional
-Maintainer: Dana Jansens <danakj@orodu.net>
+Maintainer: Openbox Maintainers <pkg-openbox@modprobe.de>
+Uploaders: Nico Golde <nion@debian.org>, Anibal Avelar (Fixxxer) <aavelar@cofradia.org>
+Build-Depends: debhelper (>= 5), autotools-dev, gettext, libobrender15, libobparser15, openbox-dev, libstartup-notification0-dev, libgtk2.0-dev, libglade2-dev, perl, libsm-dev
 Standards-Version: 3.7.2
 
 Package: obconf
-Architecture: i386
-Depends: libc6, libgtk2.0-0, libglade2-0, openbox (>= 3.4.2), libstartup-notification0, tar, gzip
-Recommends: ttf-bitstream-vera, shared-mime-info, desktop-file-utils
-Description: Openbox configuration manager
- ObConf lets you change your configuration of Openbox. This includes setting
- your theme, desktop names, and focus behavior.
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Preferences manager for Openbox window manager
+ ObConf is a small graphical utility which configures the window manager
+ Openbox' preferences and configuration settings on the fly.
  .
- ObConf also lets you easily install new themes, and package up your own themes
- for distribution.
+ If you are an Openbox user, you may want this package.
+ .
+  Homepage http://icculus.org/openbox/index.php/ObConf:About
--- obconf-2.0.1.orig/debian/menu
+++ obconf-2.0.1/debian/menu
@@ -2,5 +2,5 @@
   needs="x11"\
   section="Apps/System"\
   title="Openbox Configuration Manager"\
-  command="/usr/bin/obconf"\
-  icon="/usr/share/pixmaps/openbox.png"
+  command="/usr/bin/obconf"
+
--- obconf-2.0.1.orig/debian/rules
+++ obconf-2.0.1/debian/rules
@@ -1,106 +1,79 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
+# Extract the version of ObConf.
+VERSION=$(shell awk '/^PACKAGE_VERSION/ { print $$2 }' "FS='" configure)
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -g
+# Detect cross compilation (works with autoconf >= 2.52).
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  CONFIGFLAGS += --build $(DEB_HOST_GNU_TYPE)
+else
+  CONFIGFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
 
+# Allow compilation without optimisation.
+COMPILEFLAGS=-g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+	COMPILEFLAGS += -O0
 else
-	CFLAGS += -O2
+	COMPILEFLAGS += -O2
 endif
 
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
 
-build: build-stamp
-
-build-stamp:  config.status
+configure-stamp:
 	dh_testdir
+	# remove upstream debian/ stuff
+	-rm -f debian/changelog.in
+	ln -sf /usr/share/misc/config.{sub,guess} .
+	rm -f config.cache
+	./configure $(CONFIGFLAGS) CFLAGS="$(COMPILEFLAGS)" --prefix=/usr
+	touch $@
 
-	# Add here commands to compile the package.
+build-stamp: configure-stamp
+	dh_testdir
 	$(MAKE)
-
+	pod2man --section=1 --release=$(VERSION) --center \
+		"Openbox documentation" debian/obconf.pod > obconf.1
 	touch $@
 
+build: build-stamp
+
+
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-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
+	dh_clean
+	[ ! -f Makefile ] || $(MAKE) distclean
+	rm -f config.{sub,guess}
+	rm -f obconf.1
+	rm -f build-stamp configure-stamp
 
-
-	dh_clean 
-
-install: build
+install: build-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/obconf.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/obconf install
+	dh_clean
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/obconf/
 
+binary-indep:
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
 	dh_testdir
 	dh_testroot
-#	dh_installchangelogs CHANGELOG
-#	dh_installdocs
-#	dh_installexamples
-#	dh_install
+	dh_installdocs AUTHORS README TODO
+	dh_installchangelogs
+	dh_installman obconf.1
 	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_gencontrol
+	dh_installdeb
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+
+.PHONY: build clean binary-indep binary-arch binary install
--- obconf-2.0.1.orig/debian/copyright
+++ obconf-2.0.1/debian/copyright
@@ -0,0 +1,40 @@
+ObConf was first packaged for Debian by Tore Anderson <tore@debian.org>
+on the 15th November 2003.  Repackaged by Jens Peter Secher <jps@debian.org>.
+The package is now maintained by Nico Golde <nion@debian.org> and
+Anibal Avelar (Fixxxer) <aavelar@cofradia.org>
+
+The source code was downloaded from: http://tr.openmonkey.com/pages/obconf/
+
+The upstream maintainers are Ben Jansens and Tim Riley.
+
+The parts of ObConf is thus copyrighted:
+
+  tree.{c,h}
+    Copyright (C) 2003 Ben Jansens
+
+  gettext.h
+    Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
+
+  (all others)
+    Copyright (C) 2003-2006  Ben Jansens, Tim Riley
+
+All parts of ObConf are under the following license:
+
+  This program 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 program 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 program (on Debian GNU/Linux systems you will find it
+  /usr/share/common-licenses/GPL) ; if not, write to the Free Software 
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, 
+  USA.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
--- obconf-2.0.1.orig/debian/changelog
+++ obconf-2.0.1/debian/changelog
@@ -0,0 +1,63 @@
+obconf (2.0.1-1~bpo.1) etch-backports; urgency=low
+
+  * Build against etch backports.
+  * Changed menu section to fit menu policy for etch.
+
+ -- Nico Golde <nion@debian.org>  Sun, 22 Jul 2007 15:02:26 +0000
+
+obconf (2.0.1-1) unstable; urgency=low
+
+  [Anibal Avelar]
+  * New upstream version
+  * New maintainer
+  * Modified the control file with the new dependencies
+
+  [Nico Golde]
+  * Added missing second space in front of Homepage tag in control.
+  * Removed unused dpatch stuff.
+  * Added menu file.
+
+ -- Anibal Avelar (Fixxxer) <aavelar@cofradia.org>  Sun, 15 Jun 2007 23:44:05 +0200
+
+obconf (1.6-1) unstable; urgency=low
+
+  * New upstream version.
+  * Fixed typo in mainpage.
+    (Closes: bug#302754)
+  * Use of autotools-dev to update config.{guess,sub}.
+    (Closes: bug#342427)
+  * Changed Makefile.am to fix buttons and saving settings, thanks to
+    Richard Bradshaw.
+    (Closes: bug#375702)
+  * New maintainer.
+    (Closes: bug#385988)
+  * Upgraded to Standards-Version 3.7.2.
+
+ -- Jens Peter Secher <jps@debian.org>  Thu, 14 Sep 2006 21:43:58 +0200
+
+obconf (1.5-4) unstable; urgency=low
+
+  * debian/control:
+      - Orphaning the package.
+
+ -- Tore Anderson <tore@debian.org>  Mon,  4 Sep 2006 14:45:20 +0000
+
+obconf (1.5-3) unstable; urgency=low
+
+  * debian/control:
+      - Bleh.  Really add build-dependency on libsm-dev,  Closes: #251594.
+
+ -- Tore Anderson <tore@debian.org>  Sun, 30 May 2004 17:42:40 +0200
+
+obconf (1.5-2) unstable; urgency=low
+
+  * debian/control:
+      - Add build-dependency on libsm-dev, closes: #251594.
+
+ -- Tore Anderson <tore@debian.org>  Sat, 29 May 2004 18:38:35 +0200
+
+obconf (1.5-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Tore Anderson <tore@debian.org>  Tue, 18 Nov 2003 22:20:16 +0100
--- obconf-2.0.1.orig/debian/obconf.pod
+++ obconf-2.0.1/debian/obconf.pod
@@ -0,0 +1,32 @@
+=head1 NAME
+
+ObConf - configuration utility for Openbox.
+
+=head1 SYNOPSIS
+
+obconf
+
+=head1 DESCRIPTION
+
+B<< ObConf >> is a preferences manager for Openbox (version 3.0 and up).
+Its user interface is rather self-explanatory and thus does not need to
+be documented in this manual page.
+
+=head1 AUTHORS
+
+ObConf was written by Ben Jansens <ben@openbox.org>, and Tim Riley
+<tr@slackzone.org>.
+
+This manual page was written by Tore Anderson <tore@debian.org>.
+
+=head1 COPYRIGHT
+
+This program 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, or (at your option) any
+later version.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+=cut
