Migrate to dh.

And build only the client for now. Server needs further work

debian/changelog

@@ -8,6 +8,7 @@ freeipa (2.1.3-1) UNRELEASED; urgency=low
   * New upstream release.
   * Remove radius subpackages.
   * Migrate to source format 3.0 (quilt).
+  * Migrate to dh.
 
  -- Michele Baldessari <michele@pupazzo.org>  Sat, 06 Dec 2008 21:01:24 +0100
 

debian/control

@@ -2,37 +2,32 @@ Source: freeipa
 Section: net
 Priority: extra
 Maintainer: Michele Baldessari <michele@pupazzo.org>
-Build-Depends: debhelper (>= 7),
+Build-Depends: quilt, debhelper (>= 8), dh-autoreconf,
  libdirsrv-dev (>= 1.1.3),
- autoconf,
- automake,
- libtool,
  python-turbogears,
  libmozldap-dev,
- dpatch,
  python-support,
  libssl-dev,
  python-all-dev,
- quilt,
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/collab-maint/freeipa.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/freeipa.git
 Homepage: http://www.freeipa.org
 
-Package: freeipa-server
+#Package: freeipa-server
-Architecture: any
+#Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+#Depends: ${shlibs:Depends}, ${misc:Depends},
- python (>= 2.3),
+# python (>= 2.3),
- libjs-prototype,
+# libjs-prototype,
- libjs-scriptaculous,
+# libjs-scriptaculous,
- python-freeipa,
+# python-freeipa,
-Description: FreeIPA is a centralized identity framework
+#Description: FreeIPA is a centralized identity framework
- FreeIPA is an integrated solution to provide centrally managed Identity 
+# FreeIPA is an integrated solution to provide centrally managed Identity
- (machine, user, virtual machines, groups, authentication credentials), Policy
+# (machine, user, virtual machines, groups, authentication credentials), Policy
- (configuration settings, access control information) and Audit (events,
+# (configuration settings, access control information) and Audit (events,
- logs, analysis thereof). 
+# logs, analysis thereof).
- .
+# .
- This is the server package
+# This is the server package
 
 Package: freeipa-client
 Architecture: any
@@ -47,18 +42,18 @@ Description: FreeIPA is a centralized identity framework
  .
  This is the client package
 
-Package: freeipa-admintools
+#Package: freeipa-admintools
-Architecture: any
+#Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+#Depends: ${shlibs:Depends}, ${misc:Depends},
- python (>= 2.3),
+# python (>= 2.3),
- python-freeipa,
+# python-freeipa,
-Description: FreeIPA is a centralized identity framework
+#Description: FreeIPA is a centralized identity framework
- FreeIPA is an integrated solution to provide centrally managed Identity 
+# FreeIPA is an integrated solution to provide centrally managed Identity
- (machine, user, virtual machines, groups, authentication credentials), Policy
+# (machine, user, virtual machines, groups, authentication credentials), Policy
- (configuration settings, access control information) and Audit (events,
+# (configuration settings, access control information) and Audit (events,
- logs, analysis thereof). 
+# logs, analysis thereof).
- .
+# .
- This is the containing some administration tools
+# This is the containing some administration tools
 
 Package: python-freeipa
 Architecture: any

debian/rules

@@ -3,35 +3,12 @@
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
-SUBDIRS_ARCH=ipa-server ipa-client
+ONLY_CLIENT=1
-SUBDIRS_INDEP=ipa-admintools
+DESTDIR=$(CURDIR)/debian/tmp
-#ipa-python
 
-# Using the default python version since ipa-python has no .so modules
+export SUPPORTED_PLATFORM=ubuntu
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-PYVERS=$(shell pyversions -d)
 
-configure: configure-stamp
+override_dh_auto_clean:
-configure-stamp:
-	dh_testdir
-	$(MAKE) IPA_VERSION_IS_GIT_SNAPSHOT=no version-update
-	cd ipa-server; libtoolize --copy --force; aclocal; autoheader; automake --add-missing --gnu; autoconf; ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib
-	cd ipa-client; libtoolize --copy --force; aclocal; autoheader; automake --add-missing --gnu; autoconf; ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib
-	touch $@
-
-build: build-stamp
-build-stamp: configure
-	@for subdir in $(SUBDIRS_ARCH); do \
-		(cd $$subdir && $(MAKE)) || exit 1; \
-	done
-	touch $@
-
-clean: clean-patched
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp configure-stamp ipa-python/setup.py ipa-python/version.py RELEASE
 	rm -rf ipa-python/build
 	for i in "ipa-server" "ipa-client"; do \
 		(cd $$i && [ ! -f Makefile ] || $(MAKE) distclean); \
@@ -43,52 +20,48 @@ clean-patched:
 	find . -name "Makefile.in" -exec rm -f "{}" \;
 	find . -name "configure" -exec rm -f "{}" \;
 	dh_clean 
+	rm -rf $(DESTDIR)
+
+override_dh_autoreconf:
+	cd ipa-client; dh_autoreconf; cd ..
+	ifneq ($(ONLY_CLIENT),1)
+		cd daemons; dh_autoreconf; cd ..
+		cd install; dh_autoreconf; cd ..
+	endif
+
+override_dh_auto_configure:
+	$(MAKE) version-update
+	cd ipa-client; dh_auto_configure; cd ..
+	ifneq ($(ONLY_CLIENT),1)
+	    cd daemons; dh_auto_configure --with-openldap; cd ..
+	    cd install; dh_auto_configure; cd ..
+	endif
+
+override_dh_auto_build:
+	ifneq ($(ONLY_CLIENT),1)
+	    make IPA_VERSION_IS_GIT_SNAPSHOT=no all
+	    cd selinux ; make all
+	else
+	    make IPA_VERSION_IS_GIT_SNAPSHOT=no client
+	endif
+
+override_dh_install:
+	ifneq ($(ONLY_CLIENT),1)
+		# Force re-generate of platform support
+		rm -f ipapython/services.py
+		make install DESTDIR=$(DESTDIR)
+		cd selinux
+		make install DESTDIR=$(DESTDIR)
+		cd ..
+	else
+		make client-install DESTDIR=$(DESTDIR)
+	endif
+
+	mkdir -p $(DESTDIR)/etc/ipa
+	touch $(DESTDIR)/etc/ipa/default.conf
+	mkdir -p $(DESTDIR)/var/lib/ipa-client/sysrestore
 
-install: $(PYVERS:%=install-%)
-	dh_testdir
-	dh_testroot
-	#dh_clean -k 
-	dh_installdirs
-	@for subdir in $(SUBDIRS_ARCH) $(SUBDIRS_INDEP); do \
-		(cd $$subdir && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp pythondir=/usr/share/python-support/python-freeipa install) || exit 1; \
-	done
-	rm -f $(CURDIR)/debian/tmp/usr/share/ipa/ipagui/static/javascript/prototype.js \
-		$(CURDIR)/debian/tmp/usr/share/ipa/ipagui/static/javascript/scriptaculous.js
-	find $(CURDIR)/debian/tmp -type f -name "*.py[oc]" -exec rm -f "{}" \;
 	dh_install
 
-install-%:
+%:
-	echo "Doing: $@"
+	dh $@ --with quilt,autoreconf
-	@for subdir in "ipa-python"; do \
-		(cd $$subdir && $* setup.py install \
-                --no-compile \
-                --root $(CURDIR)/debian/tmp/ \
-		--install-lib /usr/share/python-support/python-freeipa/) || exit 1; \
-	done
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_installdirs
-	dh_installinit
-	dh_installman
-	dh_link
-	dh_pysupport
-	dh_python
-	dh_strip
-	dh_compress
-	dh_fixperms
-	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 configure