On mar., 2011-10-11 at 12:04 +0200, Yves-Alexis Perez wrote: > Here's the debdiff I intend to upload, though I have to admit I have no > idea where the CVS changes come from... > > Regards,
Attached debdiff uploaded to DELAYED/5. Regards, -- Yves-Alexis
diff -Nru xlockmore-5.31/debian/changelog xlockmore-5.31/debian/changelog --- xlockmore-5.31/debian/changelog 2010-07-20 04:31:58.000000000 +0200 +++ xlockmore-5.31/debian/changelog 2011-10-10 18:03:24.000000000 +0200 @@ -1,3 +1,12 @@ +xlockmore (1:5.31-1.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches: + - 07_dpmsblank updated to test if DPMS is disabled before forcing DPMS + level, preventing an Xerror preventing the lock. closes: #630476 + + -- Yves-Alexis Perez <[email protected]> Mon, 10 Oct 2011 18:03:23 +0200 + xlockmore (1:5.31-1) unstable; urgency=low * New upstream version diff -Nru xlockmore-5.31/debian/patches/07_dpmsblank.dpatch xlockmore-5.31/debian/patches/07_dpmsblank.dpatch --- xlockmore-5.31/debian/patches/07_dpmsblank.dpatch 2010-07-20 04:08:55.000000000 +0200 +++ xlockmore-5.31/debian/patches/07_dpmsblank.dpatch 2011-10-10 18:01:56.000000000 +0200 @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' xlockmore-5.31~/modes/blank.c xlockmore-5.31/modes/blank.c ---- xlockmore-5.31~/modes/blank.c 2010-07-19 22:08:20.051789279 -0400 -+++ xlockmore-5.31/modes/blank.c 2010-07-19 22:08:53.368288153 -0400 +--- xlockmore-5.31~/modes/blank.c 2010-07-20 04:39:37.000000000 +0200 ++++ xlockmore-5.31/modes/blank.c 2011-06-06 17:29:31.615513749 +0200 @@ -45,6 +45,10 @@ #include "xlock.h" /* in xlockmore distribution */ #endif /* STANDALONE */ @@ -19,12 +19,18 @@ ModeSpecOpt blank_opts = {0, (XrmOptionDescRec *) NULL, 0, (argtype *) NULL, (OptionStruct *) NULL}; -@@ -61,6 +65,10 @@ +@@ -60,7 +64,16 @@ + void init_blank(ModeInfo * mi) { ++#ifdef USE_DPMS ++ BOOL state = False; ++ CARD16 power_level; ++#endif MI_CLEARWINDOW(mi); +#ifdef USE_DPMS -+ DPMSForceLevel(MI_DISPLAY(mi), DPMSModeOff); ++ if(DPMSInfo(MI_DISPLAY(mi), &power_level, &state) && state) ++ DPMSForceLevel(MI_DISPLAY(mi), DPMSModeOff); +#endif + } diff -Nru xlockmore-5.31/etc/genlauncher/CVS/Entries xlockmore-5.31/etc/genlauncher/CVS/Entries --- xlockmore-5.31/etc/genlauncher/CVS/Entries 2007-10-28 02:52:36.000000000 +0100 +++ xlockmore-5.31/etc/genlauncher/CVS/Entries 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -/Makefile/1.1.1.1/Sun Oct 28 01:49:22 2007// -/README.gui/1.1.1.1/Sun Oct 28 01:49:22 2007// -/etc.xlock.java/1.1.1.1/Sun Oct 28 01:49:22 2007// -/etc.xlock.tcl/1.1.1.1/Sun Oct 28 01:49:22 2007// -/guibuild.pl/1.1.1.1/Sun Oct 28 01:49:22 2007// -/lmode.h/1.1.1.1/Sun Oct 28 01:49:22 2007// -/xglock.modes.tpl/1.1.1.1/Sun Oct 28 01:49:22 2007// -/xlockgen.lex/1.1.1.1/Sun Oct 28 01:49:22 2007// -/xmlock.modes.tpl/1.1.1.1/Sun Oct 28 01:49:22 2007// -D diff -Nru xlockmore-5.31/etc/genlauncher/CVS/Repository xlockmore-5.31/etc/genlauncher/CVS/Repository --- xlockmore-5.31/etc/genlauncher/CVS/Repository 2007-10-28 02:52:36.000000000 +0100 +++ xlockmore-5.31/etc/genlauncher/CVS/Repository 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -xlock/xlockmore/etc/genlauncher diff -Nru xlockmore-5.31/etc/genlauncher/CVS/Root xlockmore-5.31/etc/genlauncher/CVS/Root --- xlockmore-5.31/etc/genlauncher/CVS/Root 2007-10-28 02:52:36.000000000 +0100 +++ xlockmore-5.31/etc/genlauncher/CVS/Root 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -/home/bagleyd/cvsroot diff -Nru xlockmore-5.31/etc/gif/CVS/Entries xlockmore-5.31/etc/gif/CVS/Entries --- xlockmore-5.31/etc/gif/CVS/Entries 2007-10-28 02:52:36.000000000 +0100 +++ xlockmore-5.31/etc/gif/CVS/Entries 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -/README/1.1.1.1/Sun Oct 28 01:49:22 2007// -/deflag.gif/1.1.1.1/Sun Oct 28 01:49:22 2007/-kb/ -/frflag.gif/1.1.1.1/Sun Oct 28 01:49:22 2007/-kb/ -/jpflag.gif/1.1.1.1/Sun Oct 28 01:49:22 2007/-kb/ -/nlflag.gif/1.1.1.1/Sun Oct 28 01:49:22 2007/-kb/ -/ukflag.gif/1.1.1.1/Sun Oct 28 01:49:22 2007/-kb/ -D diff -Nru xlockmore-5.31/etc/gif/CVS/Repository xlockmore-5.31/etc/gif/CVS/Repository --- xlockmore-5.31/etc/gif/CVS/Repository 2007-10-28 02:52:36.000000000 +0100 +++ xlockmore-5.31/etc/gif/CVS/Repository 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -xlock/xlockmore/etc/gif diff -Nru xlockmore-5.31/etc/gif/CVS/Root xlockmore-5.31/etc/gif/CVS/Root --- xlockmore-5.31/etc/gif/CVS/Root 2007-10-28 02:52:36.000000000 +0100 +++ xlockmore-5.31/etc/gif/CVS/Root 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -/home/bagleyd/cvsroot
signature.asc
Description: This is a digitally signed message part
