Control: tags 929641 + pending Dear maintainer,
I've prepared an NMU for xdesktopwaves (versioned as 1.3-4.1) and uploaded it to DELAYED/15. Please feel free to tell me if I should delay it longer. Regards, Boyuan Yang diff -Nru xdesktopwaves-1.3/debian/changelog xdesktopwaves- 1.3/debian/changelog --- xdesktopwaves-1.3/debian/changelog 2012-11-27 03:50:31.000000000 -0500 +++ xdesktopwaves-1.3/debian/changelog 2021-09-09 20:47:38.000000000 -0400 @@ -1,3 +1,24 @@ +xdesktopwaves (1.3-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/source/options: Dropped, prefer default option. + * debian/control: + + Bump debhelper compat to v13. + + Bump Standards-Version to 4.6.0. + + Add Vcs-* fields for git packaging repo under + Debian Salsa GitLab. + + Enable "Rules-Requires-Root: no". + * debian/xdesktopwaves.menu: Dropped per tech-ctte's decision. + * debian/xdesktopwaves*.desktop: Drop obsolete Encoding field. + * debian/patches/makefile.patch: Dropped in favor of autotools + as buildsystem. + * debian/patches/0002-use-autotools.patch: Use autotools as + buildsystem to avoid all kinds of problems. + * debian/rules: Use dh sequencer. + + Fixes FTCBFS. (Closes: #929641) + + -- Boyuan Yang <by...@debian.org> Thu, 09 Sep 2021 20:47:38 -0400 + xdesktopwaves (1.3-4) unstable; urgency=low * Using source package format "3.0 (quilt)" @@ -40,4 +61,3 @@ * Initial Debian version. -- Miriam Ruiz <little_m...@yahoo.es> Wed, 8 Dec 2004 19:46:34 +0100 - diff -Nru xdesktopwaves-1.3/debian/compat xdesktopwaves-1.3/debian/compat --- xdesktopwaves-1.3/debian/compat 2012-11-23 09:41:42.000000000 -0500 +++ xdesktopwaves-1.3/debian/compat 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -9 diff -Nru xdesktopwaves-1.3/debian/control xdesktopwaves-1.3/debian/control --- xdesktopwaves-1.3/debian/control 2012-11-23 09:41:22.000000000 -0500 +++ xdesktopwaves-1.3/debian/control 2021-09-09 20:46:43.000000000 -0400 @@ -2,10 +2,13 @@ Section: games Priority: optional Maintainer: Miriam Ruiz <mir...@debian.org> -Build-Depends: debhelper (>= 9), quilt, libx11-dev, +Build-Depends: debhelper-compat (= 13), libx11-dev, x11proto-core-dev, x11proto-xext-dev, libxext-dev -Standards-Version: 3.9.3 +Standards-Version: 4.6.0 +Rules-Requires-Root: no Homepage: http://xdesktopwaves.sourceforge.net/ +Vcs-Git: https://salsa.debian.org/debian/xdesktopwaves.git +Vcs-Browser: https://salsa.debian.org/debian/xdesktopwaves Package: xdesktopwaves Architecture: any diff -Nru xdesktopwaves-1.3/debian/patches/0002-use-autotools.patch xdesktopwaves-1.3/debian/patches/0002-use-autotools.patch --- xdesktopwaves-1.3/debian/patches/0002-use-autotools.patch 1969-12-31 19:00:00.000000000 -0500 +++ xdesktopwaves-1.3/debian/patches/0002-use-autotools.patch 2021-09-09 20:41:01.000000000 -0400 @@ -0,0 +1,63 @@ +From: Boyuan Yang <by...@debian.org> +Date: Thu, 9 Sep 2021 20:40:56 -0400 +Subject: use autotools + +--- + Makefile.am | 10 ++++++++++ + configure.ac | 30 ++++++++++++++++++++++++++++++ + 2 files changed, 40 insertions(+) + create mode 100644 Makefile.am + create mode 100644 configure.ac + +diff --git a/Makefile.am b/Makefile.am +new file mode 100644 +index 0000000..4b04474 +--- /dev/null ++++ b/Makefile.am +@@ -0,0 +1,10 @@ ++gamesdir = $(prefix)/games ++games_PROGRAMS = xdesktopwaves ++ ++xdesktopwaves_SOURCES = xdesktopwaves.c ++xdesktopwaves_CPPFLAGS = -DXDW_MAX_OPTIMIZATION=2 ++ ++dist_man_MANS = xdesktopwaves.1 ++ ++pixmapsdir = $(datadir)/pixmaps/ ++pixmaps_DATA = xdesktopwaves.xpm +diff --git a/configure.ac b/configure.ac +new file mode 100644 +index 0000000..10010f1 +--- /dev/null ++++ b/configure.ac +@@ -0,0 +1,30 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.69]) ++AC_INIT([xdesktopwaves], [1.3], [xdesktopwaves.sourceforge.net]) ++AC_CONFIG_SRCDIR([xdesktopwaves.c]) ++AC_CONFIG_HEADERS([config.h]) ++AM_INIT_AUTOMAKE([foreign]) ++ ++# Checks for programs. ++AC_PROG_CC ++AC_PROG_INSTALL ++ ++# Checks for libraries. ++AC_CHECK_LIB([X11], [XOpenDisplay]) ++AC_CHECK_LIB([Xext], [XextCreateExtension]) ++AC_CHECK_LIB([m], [sin]) ++ ++# Checks for header files. ++AC_PATH_X ++AC_CHECK_HEADERS([unistd.h]) ++ ++# Checks for typedefs, structures, and compiler characteristics. ++ ++# Checks for library functions. ++AC_FUNC_MALLOC ++AC_CHECK_FUNCS([memset sqrt strerror]) ++ ++AC_CONFIG_FILES([Makefile]) ++AC_OUTPUT diff -Nru xdesktopwaves-1.3/debian/patches/makefile.patch xdesktopwaves- 1.3/debian/patches/makefile.patch --- xdesktopwaves-1.3/debian/patches/makefile.patch 2012-11-23 09:37:15.000000000 -0500 +++ xdesktopwaves-1.3/debian/patches/makefile.patch 1969-12-31 19:00:00.000000000 -0500 @@ -1,47 +0,0 @@ ---- xdesktopwaves-1.3.orig/Makefile -+++ xdesktopwaves-1.3/Makefile -@@ -22,11 +22,20 @@ - - #============================ Installer configuration ========================== - --BINDIR = /usr/X11R6/bin --MAN1DIR = /usr/X11R6/man/man1 -+BINDIR = /usr/games -+MAN1DIR = /usr/share/man/man1 -+PIXMAPS = /usr/share/pixmaps - INSTALL = install - RM = rm -f -v - -+# DESTDIR Added for Debian packaging -+DESTDIR = -+ -+INST_OWN = -o root -g root -+MAKE_DIR = $(INSTALL) -p -d $(INST_OWN) -m 755 -+INST_FILE = $(INSTALL) -c $(INST_OWN) -m 444 -+INST_PROG = $(INSTALL) -c $(INST_OWN) -m 755 -s -+ - #============================================================================= == - - all: xdesktopwaves -@@ -40,10 +49,17 @@ - clean: - $(RM) xdesktopwaves.o - -+distclean: clean -+ $(RM) xdesktopwaves -+ - install: xdesktopwaves xdesktopwaves.1 -- $(INSTALL) -c -m 0755 -s xdesktopwaves $(BINDIR)/xdesktopwaves -- $(INSTALL) -c -m 0444 xdesktopwaves.1 $(MAN1DIR)/xdesktopwaves.1 -+ $(MAKE_DIR) $(DESTDIR)$(BINDIR)/ -+ $(MAKE_DIR) $(DESTDIR)$(MAN1DIR)/ -+ $(MAKE_DIR) $(DESTDIR)$(PIXMAPS)/ -+ $(INST_PROG) xdesktopwaves $(DESTDIR)$(BINDIR)/xdesktopwaves -+ $(INST_FILE) xdesktopwaves.1 $(DESTDIR)$(MAN1DIR)/xdesktopwaves.1 -+ $(INST_FILE) xdesktopwaves.xpm $(DESTDIR)$(PIXMAPS)/xdesktopwaves.xpm - - uninstall: -- $(RM) $(BINDIR)/xdesktopwaves -- $(RM) $(MAN1DIR)/xdesktopwaves.1 -+ $(RM) $(DESTDIR)$(BINDIR)/xdesktopwaves -+ $(RM) $(DESTDIR)$(MAN1DIR)/xdesktopwaves.1 diff -Nru xdesktopwaves-1.3/debian/patches/series xdesktopwaves- 1.3/debian/patches/series --- xdesktopwaves-1.3/debian/patches/series 2012-11-23 09:37:15.000000000 -0500 +++ xdesktopwaves-1.3/debian/patches/series 2021-09-09 20:47:34.000000000 -0400 @@ -1 +1 @@ -makefile.patch +0002-use-autotools.patch diff -Nru xdesktopwaves-1.3/debian/rules xdesktopwaves-1.3/debian/rules --- xdesktopwaves-1.3/debian/rules 2012-11-26 07:53:52.000000000 -0500 +++ xdesktopwaves-1.3/debian/rules 2021-09-09 20:46:07.000000000 -0400 @@ -1,69 +1,19 @@ #!/usr/bin/make -f - +# -*- makefile -*- # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -LDFLAGS2:=-Wl,-z,defs -Wl,-as-needed -Wl,--no-undefined - -configure: configure-stamp -configure-stamp: - dh_testdir - $(MAKE) -f /usr/share/quilt/quilt.make patch - touch $@ - -build-stamp: configure-stamp - dh_testdir - $(MAKE) CFLAGS="$(CFLAGS) $(CPPFLAGS)" LFLAGS="$(LDFLAGS) $(LDFLAGS2)" - touch $@ - -build-indep: configure-stamp - -build-arch: build-stamp - -build: build-arch build-indep - -clean: - dh_testdir - dh_testroot - $(MAKE) -f /usr/share/quilt/quilt.make patch - $(MAKE) distclean - $(MAKE) -f /usr/share/quilt/quilt.make unpatch - rm -f build-stamp configure-stamp - dh_clean +# export DH_VERBOSE=1 -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - $(MAKE) DESTDIR=$(CURDIR)/debian/xdesktopwaves install +# see FEATURE AREAS in dpkg-buildflags(1) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all -# Build architecture-independent files here. -binary-indep: build install +# 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 = -Wl,--no-undefined -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_install - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_installmenu - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb +export DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/default.mk -binary: binary-indep binary-arch -.PHONY: build-indep build-arch build clean binary-indep binary-arch binary install configure +%: + dh $@ diff -Nru xdesktopwaves-1.3/debian/source/options xdesktopwaves- 1.3/debian/source/options --- xdesktopwaves-1.3/debian/source/options 2012-11-20 17:54:09.000000000 -0500 +++ xdesktopwaves-1.3/debian/source/options 1969-12-31 19:00:00.000000000 -0500 @@ -1,5 +0,0 @@ -# Bzip2 compression for debian.tar -compression = "bzip2" -compression-level = 7 -# Do not generate diff for changes in config.(sub|guess) -extend-diff-ignore = "(^|/)config.(sub|guess)$" diff -Nru xdesktopwaves-1.3/debian/xdesktopwaves.menu xdesktopwaves- 1.3/debian/xdesktopwaves.menu --- xdesktopwaves-1.3/debian/xdesktopwaves.menu 2012-11-27 03:52:14.000000000 -0500 +++ xdesktopwaves-1.3/debian/xdesktopwaves.menu 1969-12-31 19:00:00.000000000 -0500 @@ -1,4 +0,0 @@ -?package(xdesktopwaves):needs="x11" section="Games/Toys" \ - title="xdesktopwaves: start" command="xdesktopwaves -rain 5" -?package(xdesktopwaves):needs="x11" section="Games/Toys" \ - title="xdesktopwaves: stop" command="xdesktopwaves -end" diff -Nru xdesktopwaves-1.3/debian/xdesktopwaves-start.desktop xdesktopwaves- 1.3/debian/xdesktopwaves-start.desktop --- xdesktopwaves-1.3/debian/xdesktopwaves-start.desktop 2012-11-27 03:52:11.000000000 -0500 +++ xdesktopwaves-1.3/debian/xdesktopwaves-start.desktop 2021-09-09 20:21:58.000000000 -0400 @@ -3,7 +3,5 @@ Type=Application Exec=xdesktopwaves -rain 5 Icon=xdesktopwaves -Encoding=UTF-8 Terminal=false Categories=Application;Game;Amusement; - diff -Nru xdesktopwaves-1.3/debian/xdesktopwaves-stop.desktop xdesktopwaves- 1.3/debian/xdesktopwaves-stop.desktop --- xdesktopwaves-1.3/debian/xdesktopwaves-stop.desktop 2012-11-27 03:52:06.000000000 -0500 +++ xdesktopwaves-1.3/debian/xdesktopwaves-stop.desktop 2021-09-09 20:22:11.000000000 -0400 @@ -3,7 +3,5 @@ Type=Application Exec=xdesktopwaves -end Icon=xdesktopwaves-stop -Encoding=UTF-8 Terminal=false Categories=Application;Game;Amusement; -
signature.asc
Description: This is a digitally signed message part
