Control: tags -1 +patch +pending
Dear maintainer, I've prepared an NMU for xcalib (versioned as 0.8.dfsg1-3) and uploaded it to DELAYED/14. Please feel free to tell me if I should delay it longer. Regards. diff -Nru xcalib-0.8.dfsg1/debian/changelog xcalib-0.8.dfsg1/debian/changelog --- xcalib-0.8.dfsg1/debian/changelog 2022-04-14 11:55:34.000000000 -0400 +++ xcalib-0.8.dfsg1/debian/changelog 2022-04-14 11:35:33.000000000 -0400 @@ -1,3 +1,17 @@ +xcalib (0.8.dfsg1-3) unstable; urgency=medium + + * QA upload. + * Take over package maintenance via ITS process. (Closes: 1009068) + * debian/control: + + Bump Standards-Version to 4.6.0. + + Bump debhelper compat to v13. (Closes: #965887) + + Convert package to "3.0 (quilt)" format. + * debian/rules: Convert to dh sequencer. + * debian/patches/0001-use-autoconf.patch: Add patch to use autoconf + and automake instead of manually-written Makefile. + + -- Boyuan Yang <by...@debian.org> Thu, 14 Apr 2022 11:35:33 -0400 + xcalib (0.8.dfsg1-2.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru xcalib-0.8.dfsg1/debian/compat xcalib-0.8.dfsg1/debian/compat --- xcalib-0.8.dfsg1/debian/compat 2022-04-14 11:55:34.000000000 -0400 +++ xcalib-0.8.dfsg1/debian/compat 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -5 diff -Nru xcalib-0.8.dfsg1/debian/control xcalib-0.8.dfsg1/debian/control --- xcalib-0.8.dfsg1/debian/control 2022-04-14 11:55:34.000000000 -0400 +++ xcalib-0.8.dfsg1/debian/control 2022-04-14 11:15:35.000000000 -0400 @@ -1,9 +1,9 @@ Source: xcalib Section: x11 Priority: optional -Maintainer: Jorge Salamero Sanz <ben...@debian.org> -Build-Depends: debhelper (>= 5), libxxf86vm-dev, libxext-dev -Standards-Version: 3.8.0 +Maintainer: Debian QA Group <packa...@qa.debian.org> +Build-Depends: debhelper-compat (= 13), libxxf86vm-dev, libxext-dev +Standards-Version: 4.6.0 Homepage: http://xcalib.sourceforge.net/ Package: xcalib diff -Nru xcalib-0.8.dfsg1/debian/dirs xcalib-0.8.dfsg1/debian/dirs --- xcalib-0.8.dfsg1/debian/dirs 2022-04-14 11:55:34.000000000 -0400 +++ xcalib-0.8.dfsg1/debian/dirs 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -/usr/bin diff -Nru xcalib-0.8.dfsg1/debian/patches/0001-use-autoconf.patch xcalib- 0.8.dfsg1/debian/patches/0001-use-autoconf.patch --- xcalib-0.8.dfsg1/debian/patches/0001-use-autoconf.patch 1969-12-31 19:00:00.000000000 -0500 +++ xcalib-0.8.dfsg1/debian/patches/0001-use-autoconf.patch 2022-04-14 11:35:33.000000000 -0400 @@ -0,0 +1,77 @@ +From: Boyuan Yang <by...@debian.org> +Date: Thu, 14 Apr 2022 11:32:38 -0400 +Subject: use autoconf + +--- + Makefile.am | 9 +++++++++ + configure.ac | 40 ++++++++++++++++++++++++++++++++++++++++ + m4/.placeholder | 0 + 3 files changed, 49 insertions(+) + create mode 100644 Makefile.am + create mode 100644 configure.ac + create mode 100644 m4/.placeholder + +diff --git a/Makefile.am b/Makefile.am +new file mode 100644 +index 0000000..096b39a +--- /dev/null ++++ b/Makefile.am +@@ -0,0 +1,9 @@ ++ACLOCAL_AMFLAGS = -I m4 ++ ++bin_PROGRAMS = xcalib ++ ++xcalib_SOURCES = xcalib.c ++xcalib_CFLAGS = @X_CFLAGS@ ++# AX_PATH_XTRA only specify the root of X11 ++# we still have to include -lX11 ourselves ++xcalib_LDFLAGS = @X_LIBS@ -lX11 -lm -lXxf86vm -lXext +diff --git a/configure.ac b/configure.ac +new file mode 100644 +index 0000000..0a0e624 +--- /dev/null ++++ b/configure.ac +@@ -0,0 +1,40 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.69]) ++AC_INIT([xcalib], [0.8], [http://xcalib.sourceforge.net/]) ++AC_DEFINE([XCALIB_VERSION], ["0.8"], [XCalib version]) ++ ++AC_CONFIG_SRCDIR([xcalib.c]) ++AC_CONFIG_HEADERS([config.h]) ++AC_CONFIG_AUX_DIR([build-aux]) ++AC_CONFIG_MACRO_DIR([m4]) ++ ++AM_INIT_AUTOMAKE([foreign]) ++ ++# Checks for programs. ++AC_PROG_CC ++ ++# Checks for libraries. ++AC_PATH_XTRA ++AS_IF([test "X$no_x" = "Xyes"], ++ [AC_MSG_ERROR([Could not find X11])]) ++AC_CHECK_LIB([X11], [XOpenDisplay], , [AC_MSG_ERROR([Could not find X11])]) ++AC_CHECK_LIB([Xext], [XextAddDisplay], , [AC_MSG_ERROR([Could not find Xext])]) ++AC_CHECK_LIB([Xxf86vm], [XF86VidModeQueryExtension], , [AC_MSG_ERROR([Could not find Xxf86vm])]) ++# No FGLRX support for now ++AC_CHECK_LIB([m], [sin]) ++ ++# Checks for header files. ++AC_PATH_X ++AC_CHECK_HEADERS([fcntl.h]) ++ ++# Checks for typedefs, structures, and compiler characteristics. ++ ++# Checks for library functions. ++AC_FUNC_ERROR_AT_LINE ++AC_FUNC_MALLOC ++AC_CHECK_FUNCS([pow]) ++ ++AC_CONFIG_FILES([Makefile]) ++AC_OUTPUT +diff --git a/m4/.placeholder b/m4/.placeholder +new file mode 100644 +index 0000000..e69de29 diff -Nru xcalib-0.8.dfsg1/debian/patches/0002-xcalib.c-Include-config.h.patch xcalib-0.8.dfsg1/debian/patches/0002-xcalib.c-Include-config.h.patch --- xcalib-0.8.dfsg1/debian/patches/0002-xcalib.c-Include- config.h.patch 1969-12-31 19:00:00.000000000 -0500 +++ xcalib-0.8.dfsg1/debian/patches/0002-xcalib.c-Include- config.h.patch 2022-04-14 11:35:33.000000000 -0400 @@ -0,0 +1,21 @@ +From: Boyuan Yang <by...@debian.org> +Date: Thu, 14 Apr 2022 11:47:46 -0400 +Subject: xcalib.c: Include config.h + +--- + xcalib.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/xcalib.c b/xcalib.c +index 06dc8bb..da94b36 100644 +--- a/xcalib.c ++++ b/xcalib.c +@@ -38,6 +38,8 @@ + + /* vim: set ai ts=2 sw=2 expandtab: */ + ++#include "config.h" ++ + #include <ctype.h> + #include <errno.h> + #include <stdio.h> diff -Nru xcalib-0.8.dfsg1/debian/patches/series xcalib- 0.8.dfsg1/debian/patches/series --- xcalib-0.8.dfsg1/debian/patches/series 1969-12-31 19:00:00.000000000 -0500 +++ xcalib-0.8.dfsg1/debian/patches/series 2022-04-14 11:35:33.000000000 -0400 @@ -0,0 +1,2 @@ +0001-use-autoconf.patch +0002-xcalib.c-Include-config.h.patch diff -Nru xcalib-0.8.dfsg1/debian/rules xcalib-0.8.dfsg1/debian/rules --- xcalib-0.8.dfsg1/debian/rules 2022-04-14 11:55:34.000000000 -0400 +++ xcalib-0.8.dfsg1/debian/rules 2022-04-14 11:35:33.000000000 -0400 @@ -1,66 +1,20 @@ #!/usr/bin/make -f - +# -*- makefile -*- # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +# export DH_VERBOSE=1 + +# see FEATURE AREAS in dpkg-buildflags(1) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +export DEB_LDFLAGS_MAINT_APPEND = DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk include /usr/share/dpkg/buildtools.mk -XCALIB_VERSION = 0.8 - - -configure: configure-stamp - -configure-stamp: - dh_testdir - - touch $@ - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - $(CC) $(CFLAGS) -c xcalib.c -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" - $(CC) $(CFLAGS) -o xcalib xcalib.o -lm -lX11 -lXxf86vm -lXext - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - rm -f xcalib.o xcalib - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - install -o 0 -g 0 -m 0755 xcalib $(CURDIR)/debian/xcalib/usr/bin/xcalib - -binary-indep: - -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installchangelogs - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +%: + dh $@ diff -Nru xcalib-0.8.dfsg1/debian/source/format xcalib- 0.8.dfsg1/debian/source/format --- xcalib-0.8.dfsg1/debian/source/format 1969-12-31 19:00:00.000000000 -0500 +++ xcalib-0.8.dfsg1/debian/source/format 2022-04-14 11:14:46.000000000 -0400 @@ -0,0 +1 @@ +3.0 (quilt)
signature.asc
Description: This is a digitally signed message part
