Bug#902225: RFS: ii/1.8-1
Control: tags -1 moreinfo -pending
On Sat, 23 Jun 2018 15:09:00 +0000 itd <itd@firemail.cc> wrote:
> Package: sponsorship-requests
> Severity: normal
>
> Dear mentors,
>
> @Nico: I added myself to Uploaders. Please shout, if that is not what
> you meant in #890995 [1].
>
> [...]
>
> Changes since the last upload:
>
> * New upstream release (Closes: #890995).
> * Fix watchfile (upstream URL changed).
> * Bump compat level and debhelper dependency to 11.
> * Bump standards version to 4.1.4.
> * Update patch respect_dpkg_buildflags.patch.
> * Enable hardening (requires dpkg-dev >= 1.16.1.1).
> * Switch to machine-readable copyright file.
> * Experimental autopkgtest smoke-test.
> * Switch to HTTPS upstream links.
> * Add myself to Uploaders.
>
>
> Regards,
> itd
>
> [1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=890995#10
>
Hi,
Thanks for working on improving Debian. :)
I had a look at reviewing your package; I got one question/remark before
I sponsor it and then some optional suggestions for improvements.
# The remark:
In debian/rules, I noticed the following line:
"""
rm -f =$(CURDIR)/debian/ii/usr/share/doc/ii/CHANGES
"""
It seems strange that there would be a valid path starting with "=", so
I am guessing that is a typo (AFAICT, left-over from previous versions
of ii).
To be honest, I think the line can be removed if you call
dh_installchangelogs *without* the CHANGES argument and bump the
Build-Dependency on debhelper to "debhelper (>= 11.3.2~)". As of that
version of debhelper, dh_installchangelogs should do what you want out
of the box. (This fix though is optional; fixing the above typo is also
a valid solution)
# Optional suggestions:
These are suggestions that I think would make your package better,
easier to maintain in the long turn or otherwise improve it. These can
be done in a separate upload.
* Relicense the patches to the same as upstream (requires approval from
the previous maintainer). We already spoke about this on IRC.
- If / when the previous maintainer approves it, it is simply a
question of updating the debian/copyright to reflect the special
license for debian/patches/*
* Set [Rules-Requires-Root] to "no" as the source package does not need
(fake)root to build the .debs. It is a one-line change to the
debian/control file.
(see attached debdiff)
* Use debhelper's dh_auto_* tools instead of calling $(MAKE) to support
cross-building. Literally no additional changes will be required
(see attached debdiff).
* Consider rewriting debian/rules into a "dh7" style rules file.
(see [rules.tiny] for a basis example to build on). This will have
the advantage that dh can skip some helpers automatic if there is
nothing to do and new helpers will be enabled automatically in new
compat levels.
- It might be useful to postpone this change to a later revision.
Especially if you have never worked with dh(1) before.
* Have you considered setting up a git repository for the packaging on
salsa.debian.org?
# Summary:
Once you have resolved the remark about a typo in d/rules, I am happy to
sponsor the package. The optional suggestions can be done either now or
in later revisions.
Thanks,
~Niels
[Rules-Requires-Root]:
https://www.debian.org/doc/debian-policy/ch-controlfields.html#rules-requires-root
[rules.tiny]:
/usr/share/doc/debhelper/examples/rules.tiny
You will probably also need to read "man dh" to learn about "OVERRIDE
TARGETS". The dh manpage contains examples for how to use these
override targets.
diff -Nru ii-1.8/debian/control ii-1.8/debian/control
--- ii-1.8/debian/control 2018-06-23 10:49:42.000000000 +0200
+++ ii-1.8/debian/control 2018-08-08 11:16:33.000000000 +0200
@@ -6,6 +6,7 @@
Build-Depends: debhelper (>= 11~), dpkg-dev (>= 1.16.1.1)
Standards-Version: 4.2.0
Homepage: https://tools.suckless.org/ii/
+Rules-Requires-Root: no
Package: ii
Architecture: any
diff -Nru ii-1.8/debian/rules ii-1.8/debian/rules
--- ii-1.8/debian/rules 2018-06-23 10:49:42.000000000 +0200
+++ ii-1.8/debian/rules 2018-08-08 11:16:33.000000000 +0200
@@ -12,7 +12,8 @@
dh_testdir
# Building package
- CFLAGS="$(CFLAGS)" $(MAKE) PREFIX=/usr
+ #CFLAGS="$(CFLAGS)" $(MAKE) PREFIX=/usr
+ dh_auto_build
touch build-stamp
@@ -22,7 +23,8 @@
rm -f build-stamp
# Cleaning package
- [ ! -f Makefile ] || $(MAKE) clean
+ #[ ! -f Makefile ] || $(MAKE) clean
+ dh_auto_clean
dh_clean
@@ -33,7 +35,8 @@
dh_installdirs
# Installing package
- $(MAKE) install DESTDIR=$(CURDIR)/debian/ii PREFIX=/usr
+ #$(MAKE) install DESTDIR=$(CURDIR)/debian/ii PREFIX=/usr
+ dh_auto_install -- PREFIX=/usr
rm -f =$(CURDIR)/debian/ii/usr/share/doc/ii/CHANGES
# Removing double files
Reply to: