Hello,
On Thu, 16 Jun 2016, Raphael Hertzog wrote:
> please find attached two patches to apply to the pkg-net-snmp git
> repository. The first one is the inclusion of the last NMU by Steinar
> Gundersson. The second one adds two systemd service files with the
> required packaging changes.
>
> Hideki, you seem to be the only active maintainer lately, can you apply
> those patches and make an upload or would you prefer an non-maintainer
> upload?
Since I haven't gotten any answer yet, I uploaded a NMU to DELAYED/7
(it's a source only upload).
I attach two supplementary patches on top of the former patches. The first
one fixes the build so that we can build "Arch:all" alone (required for
the source only upload) and the second one is just changing the target
distribution for the actual upload.
Cheers,
--
Raphaël Hertzog ◈ Debian Developer
Support Debian LTS: http://www.freexian.com/services/debian-lts.html
Learn to master Debian: http://debian-handbook.info/get/
>From b5ff732a294f2d36b768e6cf4ab0ab7f9e6da4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hert...@debian.org>
Date: Mon, 20 Jun 2016 10:17:40 +0200
Subject: [PATCH 3/4] Fix the package so that it can build "Arch: all" without
"Arch: any"
And thus letting us make source only uploads.
---
debian/changelog | 5 +++++
debian/rules | 25 ++++++++++++++-----------
2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bc94a83..9c2e03f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
net-snmp (5.7.3+dfsg-1.4) UNRELEASED; urgency=medium
+ [ Sophie Brun ]
* Non-maintainer upload.
* Add a snmpd.service and a snmptrapd.service (Closes: #782243)
+ [ Raphaël Hertzog ]
+ * Fix the package so that it can build "Arch: all" without "Arch: any" (and
+ thus letting us make source only uploads).
+
-- Sophie Brun <sop...@freexian.com> Fri, 10 Jun 2016 10:48:02 +0200
net-snmp (5.7.3+dfsg-1.3) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 61ef247..9eb8d2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,6 +60,16 @@ override_dh_auto_configure:
# --with-python-modules="" # don't specify it, since dh_python2 cannot handle it.
# --with-dnssec-local-validation # not enabled since libval doesn't exist in Debian yet
+override_dh_auto_build:
+ dh_auto_build
+ cd python; python setup.py build --basedir=$(CURDIR)
+
+override_dh_auto_install:
+ dh_auto_install
+ cd python; python setup.py install --root=$(CURDIR)/debian/tmp \
+ --install-layout=deb --basedir=$(CURDIR) ; \
+ find $(CURDIR) -name *.pyc -delete
+
override_dh_clean:
dh_clean
rm -rf `find . -name .libs` \
@@ -77,14 +87,12 @@ override_dh_strip:
override_dh_makeshlibs:
dh_makeshlibs -plibsnmp$(LIB_VERSION) -V"libsnmp$(LIB_VERSION) (>= $(COMPAT_VERSION))"
-override_dh_install:
- cd python; python setup.py build --basedir=$(CURDIR) ; \
- python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb --basedir=$(CURDIR) ; \
- find $(CURDIR) -name *.pyc -delete
- install $(CURDIR)/EXAMPLE.conf $(CURDIR)/debian/snmpd/etc/snmp/snmpd.conf
+override_dh_install-arch:
dh_install
+ install $(CURDIR)/EXAMPLE.conf $(CURDIR)/debian/snmpd/etc/snmp/snmpd.conf
override_dh_installdocs:
+ dh_installdocs -plibsnmp-perl -ptkmib -plibsnmp-base -plibsnmp$(LIB_VERSION)
dh_installdocs --link-doc=libsnmp$(LIB_VERSION) \
-plibsnmp-dev \
-plibsnmp$(LIB_VERSION)-dbg \
@@ -92,13 +100,8 @@ override_dh_installdocs:
-psnmpd \
-psnmptrapd \
-psnmp
- dh_installdocs -plibsnmp-perl -ptkmib -plibsnmp-base
- # dh_installdocs has a bug when --link-doc is called it don't install copyright file to referenced package
- # so specify to copy it
- install -d $(CURDIR)/debian/libsnmp$(LIB_VERSION)/usr/share/doc/libsnmp$(LIB_VERSION)/
- install -m644 debian/copyright $(CURDIR)/debian/libsnmp$(LIB_VERSION)/usr/share/doc/libsnmp$(LIB_VERSION)/
-override_dh_fixperms:
+override_dh_fixperms-arch:
dh_fixperms
chmod -x debian/libsnmp-dev/etc/snmp/*.conf
chmod 600 debian/snmpd/etc/snmp/snmp*d.conf
--
2.8.1
>From c96998f899ffb56ab7f465d50749338eda734ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hert...@debian.org>
Date: Mon, 20 Jun 2016 10:24:43 +0200
Subject: [PATCH 4/4] Prepare for release
---
debian/changelog | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9c2e03f..5d9389c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-net-snmp (5.7.3+dfsg-1.4) UNRELEASED; urgency=medium
+net-snmp (5.7.3+dfsg-1.4) unstable; urgency=medium
[ Sophie Brun ]
* Non-maintainer upload.
@@ -8,7 +8,7 @@ net-snmp (5.7.3+dfsg-1.4) UNRELEASED; urgency=medium
* Fix the package so that it can build "Arch: all" without "Arch: any" (and
thus letting us make source only uploads).
- -- Sophie Brun <sop...@freexian.com> Fri, 10 Jun 2016 10:48:02 +0200
+ -- Raphaël Hertzog <hert...@debian.org> Mon, 20 Jun 2016 10:24:35 +0200
net-snmp (5.7.3+dfsg-1.3) unstable; urgency=medium
--
2.8.1
