[Pkg-net-snmp-commits] r308 - branches/net-snmp54/debian branches/net-snmp54-dev/debian trunk/debian

Jochen Friedrich jochen at alioth.debian.org
Tue Nov 17 18:33:53 UTC 2009


Author: jochen
Date: 2009-11-17 18:33:53 +0000 (Tue, 17 Nov 2009)
New Revision: 308

Modified:
   branches/net-snmp54-dev/debian/control
   branches/net-snmp54-dev/debian/rules
   branches/net-snmp54/debian/control
   branches/net-snmp54/debian/rules
   trunk/debian/control
   trunk/debian/rules
Log:
Get rid of cdbs and use debhelper7 override feature instead.


Modified: branches/net-snmp54/debian/control
===================================================================
--- branches/net-snmp54/debian/control	2009-11-17 18:31:34 UTC (rev 307)
+++ branches/net-snmp54/debian/control	2009-11-17 18:33:53 UTC (rev 308)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
 Uploaders: Jochen Friedrich <jochen at scram.de>, Thomas Anders <tanders at users.sourceforge.net>, Noah Meyerhans <noahm at debian.org>
-Build-Depends: debhelper (>=7), libtool, libwrap0-dev, libssl-dev (>> 0.9.8), perl (>=5.8), libperl-dev, python-all-dev, python-central (>=0.5.6), python (>=2.3.5-7), python-setuptools (>=0.6b3), autoconf, automake1.9, debianutils (>=1.13.1), bash (>=2.05), findutils (>=4.1.20), procps, cdbs (>=0.4.51), quilt, libkvm-dev [kfreebsd-i386 kfreebsd-amd64], libsensors4-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+Build-Depends: debhelper (>= 7.0.50~), libtool, libwrap0-dev, libssl-dev (>> 0.9.8), perl (>=5.8), libperl-dev, python-all-dev, python-central (>=0.5.6), python (>=2.3.5-7), python-setuptools (>=0.6b3), autoconf, automake1.9, autotools-dev, debianutils (>=1.13.1), bash (>=2.05), findutils (>=4.1.20), procps, quilt, libkvm-dev [kfreebsd-i386 kfreebsd-amd64], libsensors4-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-net-snmp/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-net-snmp/

Modified: branches/net-snmp54/debian/rules
===================================================================
--- branches/net-snmp54/debian/rules	2009-11-17 18:31:34 UTC (rev 307)
+++ branches/net-snmp54/debian/rules	2009-11-17 18:33:53 UTC (rev 308)
@@ -1,13 +1,5 @@
 #!/usr/bin/make -f
 
-# Fix for broken clean target. Must run before reversing patches
-cleanbuilddir::
-	[ ! -f Makefile ] || make clean || true
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
 include /usr/share/python/python.mk
 
 LIB_VERSION = 15
@@ -30,16 +22,18 @@
 endif
 endif
 
-DEB_AUTO_UPDATE_LIBTOOL    = pre
-DEB_AUTO_UPDATE_ACLOCAL    = 1.9
-DEB_AUTO_UPDATE_AUTOCONF   = 2.63
-DEB_AUTO_UPDATE_AUTOHEADER = 2.63
+%:
+	dh --with quilt,python-central $@
 
-DEB_DH_MAKESHLIBS_ARGS_libsnmp$(LIB_VERSION) := -V"libsnmp$(LIB_VERSION) (>= $(COMPAT_VERSION))"
-DEB_DBG_PACKAGE_libsnmp$(LIB_VERSION) = libsnmp$(LIB_VERSION)-dbg
-DEB_MAKE_INSTALL_TARGET=install	INSTALL_PREFIX=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
-DEB_MAKE_BUILD_TARGET=LD_RUN_PATH=
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+	ln -s /usr/share/misc/config.guess .
+	ln -s /usr/share/misc/config.sub .
+	libtoolize --install --copy
+	aclocal
+	autoheader
+	autoconf
+	dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
 	  --with-persistent-directory=/var/lib/snmp \
 	  --enable-ucd-snmp-compatibility \
 	  --enable-shared --with-cflags="$(CFLAGS) -DNETSNMP_USE_INLINE" \
@@ -54,10 +48,8 @@
 	  --with-mibdirs="\$HOME/.snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp" \
 	  --with-defaults
 
-pre-build::
-	touch aclocal.m4
-
-clean::
+.PHONY: override_dh_clean
+override_dh_clean:
 	dh_clean
 	rm -rf `find . -name .libs`
 	rm -rf `find . -name .svn`
@@ -66,14 +58,13 @@
 	rm -rf python/build
 	rm -rf python/netsnmp_python.egg-info
 
-common-build-arch:: $(PYVERS:%=debian/python-build-stamp-%)
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	dh_auto_build -- LD_RUN_PATH=
 
-debian/python-build-stamp-%:
-	# Build python modules manually as the net-snmp Makefile is too limited.
-	cd python; python$* setup.py build --basedir=$(CURDIR)
-	touch $@
-
-common-install-arch:: $(PYVERS:%=debian/python-install-stamp-%)
+.PHONY: override_dh_auto_install
+override_dh_auto_install: $(PYVERS:%=debian/python-build-stamp-%)
+	dh_auto_install -- INSTALL_PREFIX=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
 	# Install the "broke" headers
 	cp agent/mibgroup/struct.h debian/tmp/usr/include/net-snmp/agent
 	cp agent/mibgroup/util_funcs.h debian/tmp/usr/include/net-snmp
@@ -89,11 +80,46 @@
 	mkdir -p debian/tmp/etc/default
 	cp debian/snmpd.default debian/tmp/etc/default/snmpd
 	dh_installdocs -plibsnmp-base mibs/README.mibs
-
-common-install-indep::
 	# Perform other man pages fixups.
 	bash ./debian/fixman
 
+.PHONY: override_dh_auto_test
+dh_auto_test:
+
+.PHONY: override_dh_makeshlibs
+override_dh_makeshlibs:
+	dh_makeshlibs -plibsnmp$(LIB_VERSION) -V"libsnmp$(LIB_VERSION) (>= $(COMPAT_VERSION))"
+
+.PHONY: override_dh_strip
+override_dh_strip:
+	dh_strip -plibsnmp$(LIB_VERSION) --dbg-package=libsnmp$(LIB_VERSION)-dbg
+	dh_strip
+
+.PHONY: override_dh_install
+override_dh_install: $(PYVERS:%=debian/python-install-stamp-%)
+	dh_installexamples -plibsnmp-perl $(shell ls -d perl/SNMP/examples/* | grep -v SCCS)
+	dh_install
+
+.PHONY: override_dh_installdocs
+override_dh_installdocs:
+	dh_installdocs
+	rm -rf debian/libsnmp-dev/usr/share/doc/libsnmp-dev
+	rm -rf debian/libsnmp$(LIB_VERSION)-dbg/usr/share/doc/libsnmp$(LIB_VERSION)-dbg
+	rm -rf debian/libsnmp-perl/usr/share/doc/libsnmp-perl
+	ln -sf libsnmp$(LIB_VERSION) debian/libsnmp-dev/usr/share/doc/libsnmp-dev
+	ln -sf libsnmp$(LIB_VERSION) debian/libsnmp$(LIB_VERSION)-dbg/usr/share/doc/libsnmp$(LIB_VERSION)-dbg
+	ln -sf libsnmp$(LIB_VERSION) debian/libsnmp-perl/usr/share/doc/libsnmp-perl
+
+.PHONY: override_dh_fixperms
+override_dh_fixperms:
+	dh_fixperms
+	chmod 600 debian/snmpd/etc/snmp/snmp*d.conf
+
+debian/python-build-stamp-%:
+	# Build python modules manually as the net-snmp Makefile is too limited.
+	cd python; python$* setup.py build --basedir=$(CURDIR)
+	touch $@
+
 debian/python-install-stamp-%:
 	# Build python modules manually as the net-snmp Makefile is too limited.
 	cd python; python$* setup.py install --root $(CURDIR)/debian/tmp
@@ -101,19 +127,6 @@
 	   debian/tmp/usr/lib/python$*/$(call py_sitename, $*)/netsnmp_python.egg-info
 	touch $@
 
-binary-install/libsnmp-python::
-	dh_pycentral -plibsnmp-python
-
-binary-install/libsnmp-perl::
-	dh_installexamples -plibsnmp-perl $(shell ls -d perl/SNMP/examples/* | grep -v SCCS)
-
-binary-fixup/snmpd::
-	chmod 600 debian/snmpd/etc/snmp/snmp*d.conf
-
-binary-install/libsnmp$(LIB_VERSION)-dev::
-	rm -rf debian/libsnmp$(LIB_VERSION)-dev/usr/share/doc/libsnmp$(LIB_VERSION)-dev
-	ln -sf libsnmp$(LIB_VERSION) debian/libsnmp$(LIB_VERSION)-dev/usr/share/doc/libsnmp$(LIB_VERSION)-dev
-
 get-orig-source:
 	@uscan --download-version $(UPSTREAM_VERSION) --destdir /tmp --force-download --no-symlink
 	@tar xfz /tmp/net-snmp-$(UPSTREAM_VERSION).tar.gz -C /tmp

Modified: branches/net-snmp54-dev/debian/control
===================================================================
--- branches/net-snmp54-dev/debian/control	2009-11-17 18:31:34 UTC (rev 307)
+++ branches/net-snmp54-dev/debian/control	2009-11-17 18:33:53 UTC (rev 308)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
 Uploaders: Jochen Friedrich <jochen at scram.de>, Thomas Anders <tanders at users.sourceforge.net>, Noah Meyerhans <noahm at debian.org>
-Build-Depends: debhelper (>=7), libtool, libwrap0-dev, libssl-dev (>> 0.9.8), perl (>=5.8), libperl-dev, python-all-dev, python-central (>=0.5.6), python (>=2.3.5-7), python-setuptools (>=0.6b3), autoconf, automake1.9, debianutils (>=1.13.1), bash (>=2.05), findutils (>=4.1.20), procps, cdbs (>=0.4.51), quilt, libkvm-dev [kfreebsd-i386 kfreebsd-amd64], libsensors4-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+Build-Depends: debhelper (>= 7.0.50~), libtool, libwrap0-dev, libssl-dev (>> 0.9.8), perl (>=5.8), libperl-dev, python-all-dev, python-central (>=0.5.6), python (>=2.3.5-7), python-setuptools (>=0.6b3), autoconf, automake1.9, autotools-dev, debianutils (>=1.13.1), bash (>=2.05), findutils (>=4.1.20), procps, quilt, libkvm-dev [kfreebsd-i386 kfreebsd-amd64], libsensors4-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-net-snmp/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-net-snmp/

Modified: branches/net-snmp54-dev/debian/rules
===================================================================
--- branches/net-snmp54-dev/debian/rules	2009-11-17 18:31:34 UTC (rev 307)
+++ branches/net-snmp54-dev/debian/rules	2009-11-17 18:33:53 UTC (rev 308)
@@ -1,13 +1,5 @@
 #!/usr/bin/make -f
 
-# Fix for broken clean target. Must run before reversing patches
-cleanbuilddir::
-	[ ! -f Makefile ] || make clean || true
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
 include /usr/share/python/python.mk
 
 LIB_VERSION = 15
@@ -30,16 +22,18 @@
 endif
 endif
 
-DEB_AUTO_UPDATE_LIBTOOL    = pre
-DEB_AUTO_UPDATE_ACLOCAL    = 1.9
-DEB_AUTO_UPDATE_AUTOCONF   = 2.63
-DEB_AUTO_UPDATE_AUTOHEADER = 2.63
+%:
+	dh --with quilt,python-central $@
 
-DEB_DH_MAKESHLIBS_ARGS_libsnmp$(LIB_VERSION) := -V"libsnmp$(LIB_VERSION) (>= $(COMPAT_VERSION))"
-DEB_DBG_PACKAGE_libsnmp$(LIB_VERSION) = libsnmp$(LIB_VERSION)-dbg
-DEB_MAKE_INSTALL_TARGET=install	INSTALL_PREFIX=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
-DEB_MAKE_BUILD_TARGET=LD_RUN_PATH=
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+	ln -s /usr/share/misc/config.guess .
+	ln -s /usr/share/misc/config.sub .
+	libtoolize --install --copy
+	aclocal
+	autoheader
+	autoconf
+	dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
 	  --with-persistent-directory=/var/lib/snmp \
 	  --enable-ucd-snmp-compatibility \
 	  --enable-shared --with-cflags="$(CFLAGS) -DNETSNMP_USE_INLINE" \
@@ -54,10 +48,8 @@
 	  --with-mibdirs="\$HOME/.snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp" \
 	  --with-defaults
 
-pre-build::
-	touch aclocal.m4
-
-clean::
+.PHONY: override_dh_clean
+override_dh_clean:
 	dh_clean
 	rm -rf `find . -name .libs`
 	rm -rf `find . -name .svn`
@@ -66,14 +58,13 @@
 	rm -rf python/build
 	rm -rf python/netsnmp_python.egg-info
 
-common-build-arch:: $(PYVERS:%=debian/python-build-stamp-%)
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	dh_auto_build -- LD_RUN_PATH=
 
-debian/python-build-stamp-%:
-	# Build python modules manually as the net-snmp Makefile is too limited.
-	cd python; python$* setup.py build --basedir=$(CURDIR)
-	touch $@
-
-common-install-arch:: $(PYVERS:%=debian/python-install-stamp-%)
+.PHONY: override_dh_auto_install
+override_dh_auto_install: $(PYVERS:%=debian/python-build-stamp-%)
+	dh_auto_install -- INSTALL_PREFIX=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
 	# Install the "broke" headers
 	cp agent/mibgroup/struct.h debian/tmp/usr/include/net-snmp/agent
 	cp agent/mibgroup/util_funcs.h debian/tmp/usr/include/net-snmp
@@ -89,11 +80,46 @@
 	mkdir -p debian/tmp/etc/default
 	cp debian/snmpd.default debian/tmp/etc/default/snmpd
 	dh_installdocs -plibsnmp-base mibs/README.mibs
-
-common-install-indep::
 	# Perform other man pages fixups.
 	bash ./debian/fixman
 
+.PHONY: override_dh_auto_test
+dh_auto_test:
+
+.PHONY: override_dh_makeshlibs
+override_dh_makeshlibs:
+	dh_makeshlibs -plibsnmp$(LIB_VERSION) -V"libsnmp$(LIB_VERSION) (>= $(COMPAT_VERSION))"
+
+.PHONY: override_dh_strip
+override_dh_strip:
+	dh_strip -plibsnmp$(LIB_VERSION) --dbg-package=libsnmp$(LIB_VERSION)-dbg
+	dh_strip
+
+.PHONY: override_dh_install
+override_dh_install: $(PYVERS:%=debian/python-install-stamp-%)
+	dh_installexamples -plibsnmp-perl $(shell ls -d perl/SNMP/examples/* | grep -v SCCS)
+	dh_install
+
+.PHONY: override_dh_installdocs
+override_dh_installdocs:
+	dh_installdocs
+	rm -rf debian/libsnmp-dev/usr/share/doc/libsnmp-dev
+	rm -rf debian/libsnmp$(LIB_VERSION)-dbg/usr/share/doc/libsnmp$(LIB_VERSION)-dbg
+	rm -rf debian/libsnmp-perl/usr/share/doc/libsnmp-perl
+	ln -sf libsnmp$(LIB_VERSION) debian/libsnmp-dev/usr/share/doc/libsnmp-dev
+	ln -sf libsnmp$(LIB_VERSION) debian/libsnmp$(LIB_VERSION)-dbg/usr/share/doc/libsnmp$(LIB_VERSION)-dbg
+	ln -sf libsnmp$(LIB_VERSION) debian/libsnmp-perl/usr/share/doc/libsnmp-perl
+
+.PHONY: override_dh_fixperms
+override_dh_fixperms:
+	dh_fixperms
+	chmod 600 debian/snmpd/etc/snmp/snmp*d.conf
+
+debian/python-build-stamp-%:
+	# Build python modules manually as the net-snmp Makefile is too limited.
+	cd python; python$* setup.py build --basedir=$(CURDIR)
+	touch $@
+
 debian/python-install-stamp-%:
 	# Build python modules manually as the net-snmp Makefile is too limited.
 	cd python; python$* setup.py install --root $(CURDIR)/debian/tmp
@@ -101,19 +127,6 @@
 	   debian/tmp/usr/lib/python$*/$(call py_sitename, $*)/netsnmp_python.egg-info
 	touch $@
 
-binary-install/libsnmp-python::
-	dh_pycentral -plibsnmp-python
-
-binary-install/libsnmp-perl::
-	dh_installexamples -plibsnmp-perl $(shell ls -d perl/SNMP/examples/* | grep -v SCCS)
-
-binary-fixup/snmpd::
-	chmod 600 debian/snmpd/etc/snmp/snmp*d.conf
-
-binary-install/libsnmp$(LIB_VERSION)-dev::
-	rm -rf debian/libsnmp$(LIB_VERSION)-dev/usr/share/doc/libsnmp$(LIB_VERSION)-dev
-	ln -sf libsnmp$(LIB_VERSION) debian/libsnmp$(LIB_VERSION)-dev/usr/share/doc/libsnmp$(LIB_VERSION)-dev
-
 get-orig-source:
 	@uscan --download-version $(UPSTREAM_VERSION) --destdir /tmp --force-download --no-symlink
 	@tar xfz /tmp/net-snmp-$(UPSTREAM_VERSION).tar.gz -C /tmp

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2009-11-17 18:31:34 UTC (rev 307)
+++ trunk/debian/control	2009-11-17 18:33:53 UTC (rev 308)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
 Uploaders: Jochen Friedrich <jochen at scram.de>, Thomas Anders <tanders at users.sourceforge.net>, Noah Meyerhans <noahm at debian.org>
-Build-Depends: debhelper (>=7), libtool, libwrap0-dev, libssl-dev (>> 0.9.8), perl (>=5.8), libperl-dev, python-all-dev, python-central (>=0.5.6), python (>=2.3.5-7), python-setuptools (>=0.6b3), autoconf, automake1.9, debianutils (>=1.13.1), bash (>=2.05), findutils (>=4.1.20), procps, cdbs (>=0.4.51), quilt, libkvm-dev [kfreebsd-i386 kfreebsd-amd64], libsensors4-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+Build-Depends: debhelper (>= 7.0.50~), libtool, libwrap0-dev, libssl-dev (>> 0.9.8), perl (>=5.8), libperl-dev, python-all-dev, python-central (>=0.5.6), python (>=2.3.5-7), python-setuptools (>=0.6b3), autoconf, automake1.9, autotools-dev, debianutils (>=1.13.1), bash (>=2.05), findutils (>=4.1.20), procps, quilt, libkvm-dev [kfreebsd-i386 kfreebsd-amd64], libsensors4-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-net-snmp/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-net-snmp/

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2009-11-17 18:31:34 UTC (rev 307)
+++ trunk/debian/rules	2009-11-17 18:33:53 UTC (rev 308)
@@ -1,13 +1,5 @@
 #!/usr/bin/make -f
 
-# Fix for broken clean target. Must run before reversing patches
-cleanbuilddir::
-	[ ! -f Makefile ] || make clean || true
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
 include /usr/share/python/python.mk
 
 LIB_VERSION = 15
@@ -30,16 +22,18 @@
 endif
 endif
 
-DEB_AUTO_UPDATE_LIBTOOL    = pre
-DEB_AUTO_UPDATE_ACLOCAL    = 1.9
-DEB_AUTO_UPDATE_AUTOCONF   = 2.63
-DEB_AUTO_UPDATE_AUTOHEADER = 2.63
+%:
+	dh --with quilt,python-central $@
 
-DEB_DH_MAKESHLIBS_ARGS_libsnmp$(LIB_VERSION) := -V"libsnmp$(LIB_VERSION) (>= $(COMPAT_VERSION))"
-DEB_DBG_PACKAGE_libsnmp$(LIB_VERSION) = libsnmp$(LIB_VERSION)-dbg
-DEB_MAKE_INSTALL_TARGET=install	INSTALL_PREFIX=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
-DEB_MAKE_BUILD_TARGET=LD_RUN_PATH=
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+	ln -s /usr/share/misc/config.guess .
+	ln -s /usr/share/misc/config.sub .
+	libtoolize --install --copy
+	aclocal
+	autoheader
+	autoconf
+	dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
 	  --with-persistent-directory=/var/lib/snmp \
 	  --enable-ucd-snmp-compatibility \
 	  --enable-shared --with-cflags="$(CFLAGS) -DNETSNMP_USE_INLINE" \
@@ -54,10 +48,8 @@
 	  --with-mibdirs="\$HOME/.snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp" \
 	  --with-defaults
 
-pre-build::
-	touch aclocal.m4
-
-clean::
+.PHONY: override_dh_clean
+override_dh_clean:
 	dh_clean
 	rm -rf `find . -name .libs`
 	rm -rf `find . -name .svn`
@@ -66,14 +58,13 @@
 	rm -rf python/build
 	rm -rf python/netsnmp_python.egg-info
 
-common-build-arch:: $(PYVERS:%=debian/python-build-stamp-%)
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	dh_auto_build -- LD_RUN_PATH=
 
-debian/python-build-stamp-%:
-	# Build python modules manually as the net-snmp Makefile is too limited.
-	cd python; python$* setup.py build --basedir=$(CURDIR)
-	touch $@
-
-common-install-arch:: $(PYVERS:%=debian/python-install-stamp-%)
+.PHONY: override_dh_auto_install
+override_dh_auto_install: $(PYVERS:%=debian/python-build-stamp-%)
+	dh_auto_install -- INSTALL_PREFIX=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
 	# Install the "broke" headers
 	cp agent/mibgroup/struct.h debian/tmp/usr/include/net-snmp/agent
 	cp agent/mibgroup/util_funcs.h debian/tmp/usr/include/net-snmp
@@ -89,11 +80,46 @@
 	mkdir -p debian/tmp/etc/default
 	cp debian/snmpd.default debian/tmp/etc/default/snmpd
 	dh_installdocs -plibsnmp-base mibs/README.mibs
-
-common-install-indep::
 	# Perform other man pages fixups.
 	bash ./debian/fixman
 
+.PHONY: override_dh_auto_test
+dh_auto_test:
+
+.PHONY: override_dh_makeshlibs
+override_dh_makeshlibs:
+	dh_makeshlibs -plibsnmp$(LIB_VERSION) -V"libsnmp$(LIB_VERSION) (>= $(COMPAT_VERSION))"
+
+.PHONY: override_dh_strip
+override_dh_strip:
+	dh_strip -plibsnmp$(LIB_VERSION) --dbg-package=libsnmp$(LIB_VERSION)-dbg
+	dh_strip
+
+.PHONY: override_dh_install
+override_dh_install: $(PYVERS:%=debian/python-install-stamp-%)
+	dh_installexamples -plibsnmp-perl $(shell ls -d perl/SNMP/examples/* | grep -v SCCS)
+	dh_install
+
+.PHONY: override_dh_installdocs
+override_dh_installdocs:
+	dh_installdocs
+	rm -rf debian/libsnmp-dev/usr/share/doc/libsnmp-dev
+	rm -rf debian/libsnmp$(LIB_VERSION)-dbg/usr/share/doc/libsnmp$(LIB_VERSION)-dbg
+	rm -rf debian/libsnmp-perl/usr/share/doc/libsnmp-perl
+	ln -sf libsnmp$(LIB_VERSION) debian/libsnmp-dev/usr/share/doc/libsnmp-dev
+	ln -sf libsnmp$(LIB_VERSION) debian/libsnmp$(LIB_VERSION)-dbg/usr/share/doc/libsnmp$(LIB_VERSION)-dbg
+	ln -sf libsnmp$(LIB_VERSION) debian/libsnmp-perl/usr/share/doc/libsnmp-perl
+
+.PHONY: override_dh_fixperms
+override_dh_fixperms:
+	dh_fixperms
+	chmod 600 debian/snmpd/etc/snmp/snmp*d.conf
+
+debian/python-build-stamp-%:
+	# Build python modules manually as the net-snmp Makefile is too limited.
+	cd python; python$* setup.py build --basedir=$(CURDIR)
+	touch $@
+
 debian/python-install-stamp-%:
 	# Build python modules manually as the net-snmp Makefile is too limited.
 	cd python; python$* setup.py install --root $(CURDIR)/debian/tmp
@@ -101,19 +127,6 @@
 	   debian/tmp/usr/lib/python$*/$(call py_sitename, $*)/netsnmp_python.egg-info
 	touch $@
 
-binary-install/libsnmp-python::
-	dh_pycentral -plibsnmp-python
-
-binary-install/libsnmp-perl::
-	dh_installexamples -plibsnmp-perl $(shell ls -d perl/SNMP/examples/* | grep -v SCCS)
-
-binary-fixup/snmpd::
-	chmod 600 debian/snmpd/etc/snmp/snmp*d.conf
-
-binary-install/libsnmp$(LIB_VERSION)-dev::
-	rm -rf debian/libsnmp$(LIB_VERSION)-dev/usr/share/doc/libsnmp$(LIB_VERSION)-dev
-	ln -sf libsnmp$(LIB_VERSION) debian/libsnmp$(LIB_VERSION)-dev/usr/share/doc/libsnmp$(LIB_VERSION)-dev
-
 get-orig-source:
 	@uscan --download-version $(UPSTREAM_VERSION) --destdir /tmp --force-download --no-symlink
 	@tar xfz /tmp/net-snmp-$(UPSTREAM_VERSION).tar.gz -C /tmp




More information about the Pkg-net-snmp-commits mailing list