Control: tags -1 + patch
Dear Robert,
The FTBFS of bicyclerepair can be fixed in one of two ways:
echo 7 > debian/compat
or the attached patch that better updates the package to debhelper compat 10,
gets rid of lots of boilerplate from d/rules and also includes running the
test suite.
However, is bicyclerepair sufficiently dead that it should be removed instead?
Will it be upgraded to support python 3?
cheers
Stuart
--
Stuart Prescott http://www.nanonanonano.net/ stu...@nanonanonano.net
Debian Developer http://www.debian.org/ stu...@debian.org
GPG fingerprint 90E2 D2C1 AD14 6A1B 7EBB 891D BBC1 7EBB 1396 F2F7diff -u bicyclerepair-0.9/debian/compat bicyclerepair-0.9/debian/compat
--- bicyclerepair-0.9/debian/compat
+++ bicyclerepair-0.9/debian/compat
@@ -1 +1 @@
-4
+10
diff -u bicyclerepair-0.9/debian/rules bicyclerepair-0.9/debian/rules
--- bicyclerepair-0.9/debian/rules
+++ bicyclerepair-0.9/debian/rules
@@ -2,67 +2,15 @@
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@ --buildsystem pybuild --with python2
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-PYTHONS=$(shell pyversions -vr debian/control)
-
-build: build-stamp
-
-build-stamp:
- dh_testdir
-
- # Add here commands to compile the package.
- #/usr/bin/docbook-to-man debian/bicyclerepair.sgml > bicyclerepair.1
- #python setup.py build -b build
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- rm -rf build
- find . -name "*.pyc" | xargs -r rm
- #rm -rf debian/pbicyclerepair
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_installdirs
- for version in ${PYTHONS};\
- do\
- python$$version setup.py install --no-compile --root=debian/bicyclerepair --install-layout=deb;\
- done
+override_dh_auto_install:
+ dh_auto_install
cp ide-integration/bike.vim debian/bicyclerepair/usr/share/vim/addons/ftplugin/python_bike.vim
cp debian/vim-python_bike.yaml debian/bicyclerepair/usr/share/vim/registry/
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
-# dh_install
- dh_installman
- dh_compress
- dh_fixperms
- dh_python2
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+override_dh_auto_test:
+ cp testall.py .pybuild/pythonX.Y_2.7/build
+ cd .pybuild/pythonX.Y_2.7/build && ./testall.py
-binary-arch:
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_installchangelogs:
+ dh_installchangelogs ChangeLog
diff -u bicyclerepair-0.9/debian/control bicyclerepair-0.9/debian/control
--- bicyclerepair-0.9/debian/control
+++ bicyclerepair-0.9/debian/control
@@ -2,10 +2,10 @@
Section: devel
Priority: optional
Maintainer: Robert Collins <robe...@robertcollins.net>
-Build-Depends: debhelper (>= 5.0.37.2)
+Build-Depends: debhelper (>= 10), dh-python
Build-Depends-Indep: python-all-dev (>= 2.6.6-3~)
Homepage: http://bicyclerepair.sourceforge.net/
-Standards-Version: 3.7.2
+Standards-Version: 3.9.8
Package: bicyclerepair
Architecture: all
diff -u bicyclerepair-0.9/debian/changelog bicyclerepair-0.9/debian/changelog
--- bicyclerepair-0.9/debian/changelog
+++ bicyclerepair-0.9/debian/changelog
@@ -1,3 +1,11 @@
+bicyclerepair (0.9-6.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to debhelper compat level 10 (Closes: #817376).
+ * Bump standards-version to 3.9.8 (no changes required).
+
+ -- Stuart Prescott <stu...@debian.org> Sun, 06 Nov 2016 17:46:25 +1100
+
bicyclerepair (0.9-6.1) unstable; urgency=low
* Non-maintainer upload.
