diff -Nru xflip-1.01/debian/changelog xflip-1.01/debian/changelog --- xflip-1.01/debian/changelog 2016-12-30 14:22:00.000000000 +0000 +++ xflip-1.01/debian/changelog 2020-04-04 03:16:11.000000000 +0000 @@ -1,3 +1,24 @@ +xflip (1.01-28) unstable; urgency=medium + + * QA upload. + * Using new DH level format. Consequently: + - debian/compat: removed. + - debian/control: changed from 'debhelper' to 'debhelper-compat' in + Build-Depends field and bumped level to 12. + * debian/control: + - Added 'Rules-Requires-Root: no' to source stanza. + - Bumped Standards-Version to 4.5.0. + - Created VCS fields. + * debian/copyright: updated packaging copyright years. + * debian/patches/: + - 10_avoid_direct_changes.patch: renamed to 10_avoid-direct-changes.patch. + - 20_fix-executable-name.patch: created to show xflip instead of flip in + help. + * debian/salsa-ci.yml: added to provide CI tests for Salsa. + * debian/tests/control: created to perform trivial CI tests. + + -- Joao Eriberto Mota Filho Sat, 04 Apr 2020 00:16:11 -0300 + xflip (1.01-27) unstable; urgency=medium * QA upload. @@ -44,7 +65,7 @@ xflip (1.01-24) unstable; urgency=low - * removing unneeded dependency of libXext (thx to checklib) + * removing unneeded dependency of libXext (thx to checklib) (using sed on the Makefile after imake... but it works) -- Joachim Breitner Wed, 18 Oct 2006 09:57:25 +0000 @@ -55,7 +76,7 @@ * (meltdown) make -planes do it all the way * Just noticed that I have not uploaded these changes from Sun, 24 Oct 2004 23:37:20 +0200... - * Bump standards, no change + * Bump standards, no change -- Joachim Breitner Sun, 13 Aug 2006 16:31:38 +0000 diff -Nru xflip-1.01/debian/compat xflip-1.01/debian/compat --- xflip-1.01/debian/compat 2016-12-30 14:22:00.000000000 +0000 +++ xflip-1.01/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru xflip-1.01/debian/control xflip-1.01/debian/control --- xflip-1.01/debian/control 2016-12-30 14:22:00.000000000 +0000 +++ xflip-1.01/debian/control 2020-04-04 03:16:11.000000000 +0000 @@ -1,9 +1,12 @@ Source: xflip Section: games Priority: optional -Build-Depends: debhelper (>= 10), libx11-dev, xutils-dev +Build-Depends: debhelper-compat (= 12), libx11-dev, xutils-dev Maintainer: Debian QA Group -Standards-Version: 3.9.8 +Standards-Version: 4.5.0 +Rules-Requires-Root: no +Vcs-Browser: https://salsa.debian.org/debian/xflip +Vcs-Git: https://salsa.debian.org/debian/xflip.git Package: xflip Architecture: any diff -Nru xflip-1.01/debian/copyright xflip-1.01/debian/copyright --- xflip-1.01/debian/copyright 2016-12-30 14:22:00.000000000 +0000 +++ xflip-1.01/debian/copyright 2020-04-04 03:16:11.000000000 +0000 @@ -11,7 +11,7 @@ Copyright: 1996-2000 Joey Hess 2000-2003 Tony Mancill 2004-2008 Joachim Breitner - 2015-2016 Joao Eriberto Mota Filho + 2015-2020 Joao Eriberto Mota Filho License: MIT License: MIT diff -Nru xflip-1.01/debian/patches/10_avoid_direct_changes.patch xflip-1.01/debian/patches/10_avoid_direct_changes.patch --- xflip-1.01/debian/patches/10_avoid_direct_changes.patch 2015-12-15 00:43:03.000000000 +0000 +++ xflip-1.01/debian/patches/10_avoid_direct_changes.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,137 +0,0 @@ -Description: avoid direct changes in upstream source code. -Author: Joao Eriberto Mota Filho -Last-Update: 2015-12-14 -Index: xflip-1.01/Imakefile -=================================================================== ---- xflip-1.01.orig/Imakefile -+++ xflip-1.01/Imakefile -@@ -1,7 +1,3 @@ --#ifdef HPArchitecture --CCOPTIONS = -Ae --#endif -- - OBJS1 = meltdown.o - OBJS2 = flip.o - -@@ -11,7 +7,10 @@ PROGRAMS = meltdown flip - - AllTarget($(PROGRAMS)) - -+XCOMM debian likes all games in /usr/games. -+BINDIR = /usr/games -+ - NormalProgramTarget(meltdown, $(OBJS1), , , $(LOCAL_LIBRARIES)) - NormalProgramTarget(flip, $(OBJS2), , , $(LOCAL_LIBRARIES)) --InstallProgram(meltdown,$(BINDIR)) --InstallProgram(flip,$(BINDIR)) -+InstallProgram(meltdown,$(PREFIX)/$(BINDIR)) -+InstallProgram(flip,$(PREFIX)/$(BINDIR)) -Index: xflip-1.01/meltdown.c -=================================================================== ---- xflip-1.01.orig/meltdown.c -+++ xflip-1.01/meltdown.c -@@ -34,6 +34,7 @@ - * @(#)meltdown.c 1.2 90/02/22 - * - */ -+/* (c) Joachim Breitner 2004 for the -wait option */ - - #include - #include -@@ -63,12 +64,14 @@ Window win; - GC copygc, fillgc; - int screen; - int depth; -+int delay=0; -+int wait=-1; - - short **heights; - - usage() - { -- fprintf(stderr, "Usage: meltdown [-planes] [-display ]\n"); -+ fprintf(stderr, "Usage: meltdown [-planes] [-display ] [-delay x] [-wait n | -wait 0 ]\n"); - exit(1); - } - -@@ -93,6 +96,16 @@ int i; - usage(); - } else if (strncmp(argv[i], "-p", 2) == 0) { - use_planes = 1; -+ } else if (strncmp(argv[i], "-del", 4) == 0) { -+ if (argv[i+1]) -+ delay=atoi(argv[++i]); -+ else -+ usage(); -+ } else if (strncmp(argv[i], "-wait", 5) == 0) { -+ if (argv[i+1]) -+ wait=atoi(argv[++i]); -+ else -+ usage(); - } else - usage(); - } -@@ -138,6 +151,26 @@ int i; - exit(0); - } - -+finish() -+{ -+ XEvent e; -+ -+ XSelectInput(dpy, win, ButtonPressMask | KeyPressMask ); -+ XSetInputFocus(dpy, win, RevertToParent, CurrentTime); -+ if ( wait == 0 ) -+ while (1) { -+ XNextEvent(dpy, &e); -+ if (e.type == KeyPress) -+ break; -+ if (e.type == ButtonPress) -+ break; -+ } -+ if ( wait > 0 ) sleep (wait); -+ -+ XSync(dpy, 0); -+ exit(0); -+} -+ - do_planes() - { - int finished = 0; -@@ -181,17 +214,15 @@ short **heights; - - heights[depth][i] = max(heights[depth][i], yloc); - } -- if (finished >= (DisplayWidth(dpy, screen) - FINISHED)) { -- XSync(dpy, 0); -- exit(0); -- } -+ if (finished >= DisplayPlanes(dpy, screen) * (DisplayWidth(dpy, screen) - FINISHED)) -+ finish(); - } - } - - do_all() - { - int finished = 0; --int width, xloc, yloc, dist, size, i; -+int width, xloc, yloc, dist, size, i, cnt=0; - short *heights; - - heights = (short *) calloc(sizeof(short), DisplayWidth(dpy, screen)); -@@ -227,9 +258,12 @@ short *heights; - - heights[i] = max(heights[i], yloc); - } -- if (finished >= (DisplayWidth(dpy, screen) - FINISHED)) { -- XSync(dpy, 0); -- exit(0); -+ if (finished >= (DisplayWidth(dpy, screen) - FINISHED)) -+ finish(); -+ -+ if (delay > 0 && cnt++ == delay) { -+ usleep(1); -+ cnt=0; - } - } - } diff -Nru xflip-1.01/debian/patches/10_avoid-direct-changes.patch xflip-1.01/debian/patches/10_avoid-direct-changes.patch --- xflip-1.01/debian/patches/10_avoid-direct-changes.patch 1970-01-01 00:00:00.000000000 +0000 +++ xflip-1.01/debian/patches/10_avoid-direct-changes.patch 2020-04-04 03:16:11.000000000 +0000 @@ -0,0 +1,137 @@ +Description: avoid direct changes in upstream source code. +Author: Joao Eriberto Mota Filho +Last-Update: 2015-12-14 +Index: xflip-1.01/Imakefile +=================================================================== +--- xflip-1.01.orig/Imakefile ++++ xflip-1.01/Imakefile +@@ -1,7 +1,3 @@ +-#ifdef HPArchitecture +-CCOPTIONS = -Ae +-#endif +- + OBJS1 = meltdown.o + OBJS2 = flip.o + +@@ -11,7 +7,10 @@ PROGRAMS = meltdown flip + + AllTarget($(PROGRAMS)) + ++XCOMM debian likes all games in /usr/games. ++BINDIR = /usr/games ++ + NormalProgramTarget(meltdown, $(OBJS1), , , $(LOCAL_LIBRARIES)) + NormalProgramTarget(flip, $(OBJS2), , , $(LOCAL_LIBRARIES)) +-InstallProgram(meltdown,$(BINDIR)) +-InstallProgram(flip,$(BINDIR)) ++InstallProgram(meltdown,$(PREFIX)/$(BINDIR)) ++InstallProgram(flip,$(PREFIX)/$(BINDIR)) +Index: xflip-1.01/meltdown.c +=================================================================== +--- xflip-1.01.orig/meltdown.c ++++ xflip-1.01/meltdown.c +@@ -34,6 +34,7 @@ + * @(#)meltdown.c 1.2 90/02/22 + * + */ ++/* (c) Joachim Breitner 2004 for the -wait option */ + + #include + #include +@@ -63,12 +64,14 @@ Window win; + GC copygc, fillgc; + int screen; + int depth; ++int delay=0; ++int wait=-1; + + short **heights; + + usage() + { +- fprintf(stderr, "Usage: meltdown [-planes] [-display ]\n"); ++ fprintf(stderr, "Usage: meltdown [-planes] [-display ] [-delay x] [-wait n | -wait 0 ]\n"); + exit(1); + } + +@@ -93,6 +96,16 @@ int i; + usage(); + } else if (strncmp(argv[i], "-p", 2) == 0) { + use_planes = 1; ++ } else if (strncmp(argv[i], "-del", 4) == 0) { ++ if (argv[i+1]) ++ delay=atoi(argv[++i]); ++ else ++ usage(); ++ } else if (strncmp(argv[i], "-wait", 5) == 0) { ++ if (argv[i+1]) ++ wait=atoi(argv[++i]); ++ else ++ usage(); + } else + usage(); + } +@@ -138,6 +151,26 @@ int i; + exit(0); + } + ++finish() ++{ ++ XEvent e; ++ ++ XSelectInput(dpy, win, ButtonPressMask | KeyPressMask ); ++ XSetInputFocus(dpy, win, RevertToParent, CurrentTime); ++ if ( wait == 0 ) ++ while (1) { ++ XNextEvent(dpy, &e); ++ if (e.type == KeyPress) ++ break; ++ if (e.type == ButtonPress) ++ break; ++ } ++ if ( wait > 0 ) sleep (wait); ++ ++ XSync(dpy, 0); ++ exit(0); ++} ++ + do_planes() + { + int finished = 0; +@@ -181,17 +214,15 @@ short **heights; + + heights[depth][i] = max(heights[depth][i], yloc); + } +- if (finished >= (DisplayWidth(dpy, screen) - FINISHED)) { +- XSync(dpy, 0); +- exit(0); +- } ++ if (finished >= DisplayPlanes(dpy, screen) * (DisplayWidth(dpy, screen) - FINISHED)) ++ finish(); + } + } + + do_all() + { + int finished = 0; +-int width, xloc, yloc, dist, size, i; ++int width, xloc, yloc, dist, size, i, cnt=0; + short *heights; + + heights = (short *) calloc(sizeof(short), DisplayWidth(dpy, screen)); +@@ -227,9 +258,12 @@ short *heights; + + heights[i] = max(heights[i], yloc); + } +- if (finished >= (DisplayWidth(dpy, screen) - FINISHED)) { +- XSync(dpy, 0); +- exit(0); ++ if (finished >= (DisplayWidth(dpy, screen) - FINISHED)) ++ finish(); ++ ++ if (delay > 0 && cnt++ == delay) { ++ usleep(1); ++ cnt=0; + } + } + } diff -Nru xflip-1.01/debian/patches/20_fix-executable-name.patch xflip-1.01/debian/patches/20_fix-executable-name.patch --- xflip-1.01/debian/patches/20_fix-executable-name.patch 1970-01-01 00:00:00.000000000 +0000 +++ xflip-1.01/debian/patches/20_fix-executable-name.patch 2020-04-04 03:16:11.000000000 +0000 @@ -0,0 +1,29 @@ +Description: use xflip instead of flip. +Author: Joao Eriberto Mota Filho +Last-Update: 2020-04-04 +Index: xflip/flip.c +=================================================================== +--- xflip.orig/flip.c ++++ xflip/flip.c +@@ -84,7 +84,7 @@ int do_half = 1; /* divisor for how muc + + usage() + { +- fprintf(stderr, "Usage: flip [-planes] [-vert] [-oblic] [-fast | -random] [-times] [-display ]\n"); ++ fprintf(stderr, "Usage: xflip [-planes] [-vert] [-oblic] [-fast | -random] [-times] [-display ]\n"); + exit(1); + } + +Index: xflip/flip.c.cln +=================================================================== +--- xflip.orig/flip.c.cln ++++ xflip/flip.c.cln +@@ -78,7 +78,7 @@ int do_half = 1; /* divisor for how muc + + usage() + { +- fprintf(stderr, "Usage: flip [-planes] [-vert] [-fast | -random] [-times] [-display ]\n"); ++ fprintf(stderr, "Usage: xflip [-planes] [-vert] [-fast | -random] [-times] [-display ]\n"); + exit(1); + } + diff -Nru xflip-1.01/debian/patches/series xflip-1.01/debian/patches/series --- xflip-1.01/debian/patches/series 2015-12-15 02:19:49.000000000 +0000 +++ xflip-1.01/debian/patches/series 2020-04-04 03:16:11.000000000 +0000 @@ -1 +1,2 @@ -10_avoid_direct_changes.patch +10_avoid-direct-changes.patch +20_fix-executable-name.patch diff -Nru xflip-1.01/debian/salsa-ci.yml xflip-1.01/debian/salsa-ci.yml --- xflip-1.01/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ xflip-1.01/debian/salsa-ci.yml 2020-04-04 03:16:11.000000000 +0000 @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -Nru xflip-1.01/debian/tests/control xflip-1.01/debian/tests/control --- xflip-1.01/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ xflip-1.01/debian/tests/control 2020-04-04 03:16:11.000000000 +0000 @@ -0,0 +1,4 @@ +Test-Command: /usr/games/xflip --help 2>&1 | grep Usage + +Test-Command: xvfb-run -a /usr/games/xflip & +Depends: @, xauth, xvfb