Fix ksensors packaging files for Debian and Ubuntu

1 files changed, 30 insertions, 96 deletions

diff --git a/ubuntu/maverick/applications/ksensors/debian/rules b/ubuntu/maverick/applications/ksensors/debian/rules
index 6b011f383..8b97ef030 100644..100755
--- a/ubuntu/maverick/applications/ksensors/debian/rules
+++ b/ubuntu/maverick/applications/ksensors/debian/rules
@@ -1,111 +1,45 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+ 
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
 
-# 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)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+post-patches:: debian/stamp-bootstrap
 
-build: build-stamp
-	
--include debian/debiandirs
-
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
-
-build-stamp:
+debian/stamp-bootstrap:
 	dh_testdir
 
-	/usr/bin/libtoolize -f
+	# Regenerate build system
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
 	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	cp -f /usr/share/misc/config.guess admin/config.guess
-	cp -f /usr/share/misc/config.sub admin/config.sub
 
-	$(MAKE) -f admin/Makefile.common
-	
-	QTDIR=/usr/share/tqt3 ./configure $(configkde) --disable-final 
-	$(MAKE)
-	touch build-stamp
+	autoreconf --install && automake -f && \
+	$(MAKE) -f admin/Makefile.common && \
+	touch debian/stamp-bootstrap
+
+binary-install/ksensors-trinity::
+	install -D -p -m644 debian/overrides \
+	  debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+
+	# Installing icons
+	/usr/bin/convert $(CURDIR)/src/pics/hi16-app-ksensors.png $(CURDIR)/debian/ksensors-trinity/opt/trinity/share/pixmaps/ksensors.xpm
 
-clean:
+clean::
 	dh_testdir
-	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) clean distclean
 	-rm -f po/*.gmo
-	-rm -f debian/debiandirs
-	-rm -f admin/config.sub admin/config.guess admin/ltmain.sh configure
-	-rm -f admin/libtool.m4.in aclocal.m4 acinclude.m4
 	-rm -f config.log
 	-find $(CURDIR) -name Makefile.in -exec rm -f {} \;
-	-rm -f build-stamp install-stamp
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Install overrides.
-	install -p -o root -g root -m 644 $(CURDIR)/debian/overrides $(CURDIR)/debian/ksensors-trinity/usr/share/lintian/overrides/ksensors-trinity
-
-	# Main install.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/ksensors-trinity
-
-	# Make common links for docs.
-	for p in `dh_listpackages`; do \
-	  for i in `find $(CURDIR)/debian/ksensors-trinity/usr/share/doc/kde/HTML -type d -name $$p -name $$p -not -regex .*/en/$$p`; do \
-	    ln -f -n -s ../common $$i/common; done; done
-	
-	# Installing icons
-	/usr/bin/convert $(CURDIR)/src/pics/hi16-app-ksensors.png $(CURDIR)/debian/ksensors-trinity/usr/share/pixmaps/ksensors.xpm
-
-	perl -w admin/debianrules cleanup
-
-
-# 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
-	dh_testdir
-	dh_testroot
-	dh_installdebconf	
-	dh_installdocs
-#	dh_installexamples
-	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-	dh_installman
-#	dh_installinfo
-	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip
-	dh_compress --exclude=.docbook
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-#	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+	rm -f debian/stamp-bootstrap