On Wed, 7 Dec 2016 21:05:24 +0100 Vincent Carluer <vcarl...@gmail.com> wrote: > Hello, > > I would be glad to adopt this package if it is OK with you. > I am a senior dev newbie with Debian dev/packaging but motivated :D > > I've talked about the idea to adopt this package to debian-mentors and it > seems they agree it could be a good idea. > > They said to me there is a RC bug (Fails To Build From Source) I should > start to fix and than the stretch freeze is close. > > So do you agree than I adopt xmacro? > Can you help me a little to start? > What is the next step? > Do you have any other advice?
Hello, no special advice. You can take it if you want but I really hope that you actually use it and don't take it as a sandbox for practicing. You can find the diff attached. This is something I wanted to upload today (in the hope that it will make it before freeze) since I forgot about your mail (and I cannot find it anymore in my mailbox, sorry). It's not perfect way of solving this in terms of best packaging practices (inline patch instead of patch series, installed as auto-generated single-debian-patch). But I wouldn't mess with patch series maintenance for such trivial changes. Regards, Eduard.
diff --git a/debian/changelog b/debian/changelog index a400044..c19da21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xmacro (0.3pre-20000911-7) unstable; urgency=medium + + * Fixing build failure with GCC-6 via rearanging the header order + (closes: #831195) + * Align DH compat level and build dependency, require 9+ + + -- Eduard Bloch <bl...@debian.org> Fri, 22 Jul 2016 22:26:14 +0200 + xmacro (0.3pre-20000911-6) unstable; urgency=low * Proper build with original tarball diff --git a/debian/compat b/debian/compat index f599e28..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +9 diff --git a/debian/control b/debian/control index 9263595..3945804 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xmacro Section: utils Priority: optional Maintainer: Eduard Bloch <bl...@debian.org> -Build-Depends: debhelper (>> 5.0), libx11-dev, libxtst-dev +Build-Depends: debhelper (>> 9), libx11-dev, libxtst-dev Standards-Version: 3.9.2 Package: xmacro diff --git a/debian/rules b/debian/rules index 84df31e..cd9d3c8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,87 +1,16 @@ #!/usr/bin/make -f -# 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 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk +-include /usr/share/quilt/quilt.make -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif +%: + dh $@ --parallel --with quilt -CXXFLAGS=-g -O2 -export CXXFLAGS - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #/usr/bin/docbook-to-man debian/xmacro-0.3pre.sgml > xmacro-0.3pre.1 - - touch build-stamp - -clean: +override_dh_install: dh_testdir dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - $(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k + dh_prep dh_installdirs - - # Add here commands to install the package into debian/xmacro-0.3pre. - install -Dpv xmacroplay-keys xmacroplay xmacrorec xmacrorec2 $(CURDIR)/debian/xmacro/usr/bin - -build-arch: build - -build-indep: build - -# 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_installdocs - dh_installexamples - dh_installmenu - dh_installcron - dh_installman - dh_installinfo - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms - chmod -x $(CURDIR)/debian/xmacro/usr/share/doc/xmacro/examples/* - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb -- -Zxz - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure + install -Dpv xmacroplay-keys xmacroplay xmacrorec xmacrorec2 debian/xmacro/usr/bin diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..4332117 --- /dev/null +++ b/debian/source/options @@ -0,0 +1,3 @@ +compression=xz +single-debian-patch +auto-commit diff --git a/run b/run index b6d2409..2a19076 100755 --- a/run +++ b/run @@ -1,3 +1,4 @@ +#!/bin/sh mydisp=:5.0 if [ $# -lt 1 ] diff --git a/xmacroplay.cpp b/xmacroplay.cpp index c48f6c7..8eb206c 100644 --- a/xmacroplay.cpp +++ b/xmacroplay.cpp @@ -34,7 +34,13 @@ /***************************************************************************** * Includes ****************************************************************************/ -#include <stdio.h> +/***************************************************************************** + * What iostream do we have? + ****************************************************************************/ +#include <iostream> +#include <iomanip> + +#include <stdio.h> #include <stdlib.h> #include <unistd.h> #include <ctype.h> @@ -47,16 +53,6 @@ #include <X11/extensions/XTest.h> #include "chartbl.h" -/***************************************************************************** - * What iostream do we have? - ****************************************************************************/ -#ifdef HAVE_IOSTREAM -#include <iostream> -#include <iomanip> -#else -#include <iostream.h> -#include <iomanip.h> -#endif using namespace std; diff --git a/xmacrorec.cpp b/xmacrorec.cpp index 7526eb1..64090bf 100644 --- a/xmacrorec.cpp +++ b/xmacrorec.cpp @@ -36,6 +36,10 @@ /***************************************************************************** * Includes ****************************************************************************/ + +#include <iostream> +#include <iomanip> + #include <stdio.h> #include <stdlib.h> #include <X11/Xlibint.h> @@ -46,17 +50,6 @@ #include <X11/keysym.h> #include <X11/extensions/XTest.h> -/***************************************************************************** - * What iostream do we have? - ****************************************************************************/ -#ifdef HAVE_IOSTREAM -#include <iostream> -#include <iomanip> -#else -#include <iostream.h> -#include <iomanip.h> -#endif - using namespace std; #define PROG "xmacrorec" diff --git a/xmacrorec2.cpp b/xmacrorec2.cpp index 09e10bb..7f5c437 100644 --- a/xmacrorec2.cpp +++ b/xmacrorec2.cpp @@ -38,6 +38,8 @@ /***************************************************************************** * Includes ****************************************************************************/ +#include <iostream> +#include <iomanip> #include <stdio.h> #include <stdlib.h> #include <X11/Xlibint.h> @@ -48,16 +50,6 @@ #include <X11/keysym.h> #include <X11/extensions/record.h> -/***************************************************************************** - * What iostream do we have? - ****************************************************************************/ -#ifdef HAVE_IOSTREAM -#include <iostream> -#include <iomanip> -#else -#include <iostream.h> -#include <iomanip.h> -#endif using namespace std;