[Pkg-privacy-commits] [pidgin-otr] 210/255: Convert to debhelper 8 with tiny rules file and dh-autoreconf.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch experimental
in repository pidgin-otr.

commit 7d2a7f613dcc1df2acdc67298e21dbf2abf5a2aa
Author: intrigeri <intrigeri at boum.org>
Date:   Tue Feb 18 13:17:20 2014 +0000

    Convert to debhelper 8 with tiny rules file and dh-autoreconf.
    
    We don't use dh9, as it enables MultiArch by default, and Pidgin likely won't
    find pidgin-otr.so if we install it in a MultiArch'ed location.
---
 debian/compat  |   2 +-
 debian/control |   3 +-
 debian/install |   2 --
 debian/rules   | 111 +++++++++------------------------------------------------
 4 files changed, 20 insertions(+), 98 deletions(-)

diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 91c2724..90fe05c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Maintainer: Debian OTR Team <pkg-otr-team at lists.alioth.debian.org>
 Uploaders: intrigeri <intrigeri at debian.org>
 Section: net
 Priority: optional
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 8),
+               dh-autoreconf,
                dpkg-dev (>= 1.16.1~),
                libgpg-error-dev,
                libgcrypt11-dev,
diff --git a/debian/install b/debian/install
index 9e7f29d..e69de29 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/pidgin/pidgin-otr.so /usr/lib/pidgin
-debian/tmp/usr/share/locale/*/LC_MESSAGES/pidgin-otr.mo
diff --git a/debian/rules b/debian/rules
index 3ea4415..dbcb4c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,107 +1,30 @@
 #!/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
 
+%:
+	dh $@ --with autoreconf
 
-
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-
-	ln -sf /usr/share/misc/config.sub .
-	ln -sf /usr/share/misc/config.guess .
-	rm -f config.cache
-
-	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE)\
-		--build=$(DEB_BUILD_GNU_TYPE)\
-		--prefix=/usr\
-		--mandir=\$${prefix}/share/man\
+# XXX: what options are really needed?
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		$(shell dpkg-buildflags --export=configure)
 
-	touch configure-stamp
-
-
-build-arch: build
-build-indep: build
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/pidgin-otr.sgml > pidgin-otr.1
-
+override_dh_auto_build:
+	dh_auto_build
 	cd po; intltool-update --verbose --pot
 
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	# Add here commands to install the package into debian/pidgin-otr.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-	dh_install --list-missing
-
-# 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_installchangelogs ChangeLog
-	dh_installdocs
-#	dh_installexamples
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-#	dh_installman
-#	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_pidgin
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+override_dh_install:
+	rm debian/pidgin-otr/usr/lib/pidgin/*.la
+	dh_install --fail-missing -X.la
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+# The "shared" library we ship is not managed by ldconfig and friends.
+override_dh_makeshlibs:
+	true

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git