[Pkg-wmaker-commits] [wmclock] 27/66: Imported Debian patch 1.0.14-1
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 10:52:51 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmclock.
commit 08e495458cb3aa416f1e5287fcb3ae494f8f580d
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Sun Jan 4 23:07:01 2015 -0600
Imported Debian patch 1.0.14-1
---
asclock-orig/INSTALL | 3 -
asclock-orig/Imakefile | 12 -
asclock-orig/README | 145 -------
asclock-orig/asclock.c | 623 -------------------------------
asclock-orig/asclock.man | 105 ------
asclock-orig/configure | 77 ----
asclock-orig/mask.xpm | 70 ----
debian/changelog | 11 +
debian/control | 3 +-
debian/patches/fix_12_year_display.patch | 8 +-
debian/patches/manpage_fixes.patch | 17 +-
debian/patches/manpage_xpm_notes.patch | 8 +-
12 files changed, 24 insertions(+), 1058 deletions(-)
diff --git a/asclock-orig/INSTALL b/asclock-orig/INSTALL
deleted file mode 100644
index 7d417da..0000000
--- a/asclock-orig/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-1. Check in the Imakefile if all LIBS are ok for your system.
-2. `configure`
-3. `make` (Send me the output if this fails)
diff --git a/asclock-orig/Imakefile b/asclock-orig/Imakefile
deleted file mode 100644
index 100e236..0000000
--- a/asclock-orig/Imakefile
+++ /dev/null
@@ -1,12 +0,0 @@
-
-XPMLIB = -L/usr/lib/X11 -lXpm
-DEPLIBS = $(DEPXLIB)
-
-LOCAL_LIBRARIES = $(XPMLIB) $(XLIB)
-
-LINTLIBS = $(LINTXLIB)
-
-SRCS = asclock.c
-OBJS = asclock.o
-
-ComplexProgramTarget(asclock)
diff --git a/asclock-orig/README b/asclock-orig/README
deleted file mode 100644
index 5fd82b9..0000000
--- a/asclock-orig/README
+++ /dev/null
@@ -1,145 +0,0 @@
-=============================================
-asclock - afterstep clock
-
-the best clock for the best X-windowmanager!
-=============================================
-
-RELEASE 12
- 27. September 1998
- by Beat Christen, spiff at longstreet.ch
-
-COPYING
- This is GPL2 software. Read the file COPYING for infos!
-
-VERSION 1.3
- Please note, that there is also a GTK version. Find out more
- about this here:
- http://www.gtk.org
-
- And even an applet for the gnome desktop: See the link below for
- more infos!
- http://www.gnome.org
-
- This version (now called 'classic asclock') is still being
- maintained and will keep being supported until gnome has taken over
- all of our desktops at work.
-
-AVAILABILITY
- the latest release should be available from
- http://www.longstreet.ch/asclock
-
- All other flavours of asclock are also maintained there.
-
-INSTALL
- 1. Check in the Imakefile if all LIBS are ok for your system.
- 2. `configure`
- 3. `make` (Send me the output if this fails)
-
-
-FEEDBACK
- Please send me language customized 'month.xpm' and 'weekday.xpm' files.
- I prefer uuencoded mail.
-
-AUTHOR
- Beat Christen
-
-CONTRIBUTORS
-
- low-network-
- bandwidth-patch: Tim Phipps
-
- close-color-matching-
- patch: Patrick Rogan
-
- year-display-patch: Nick Vargish
-
- dynamic xpm Fredrik Hallenberg
- loading
-
- Shape Extensions Dan Weeks
- and man page
-
- language specific Carlos Canau
- files Frank Larsen
- Andy Lo A Foe
- Dan Weeks
- Emanuele Caratti
- Jorgen Pehrson
- Vadim V. Klimenko (vadim at max.odessa.ua)
- Alexey L. Yarovinsky" <aleshka at cortext.co.il>
- and many more. look at the changes for the
- respective names.
-CHANGES
- 26-Sep-98 - applied different patches supplied by Tim Phipps, Patrick
- Rogan, Nick Vargish
- Thanks to all authors for keeping those patches coming!!!
- 11-Apr-98 - loadable xpm's...
- 15-May-97 - slovene added
- 10-Dec-96 - ukrainian & russian added
- 26-Aug-96 - czech added
- 13-Aug-96 - french added
- 6-Aug-96 - spanish added (thanks to David Lazaro Saz khelekir at encomix.es)
- - hungarian added
- (thanks to Gyula Matics mgyula at garfield.sch.bme.hu)
- - breton added (thanks to Jean-Pierre.Messager at univ-brest.fr)
-
- 30-Jul-96 - ClassHints added (patch by Peter Parnes peppar at cdt.luth.se)
-
- 23-Jul-96 - swedish added (by Jorgen Pehrson d93jpe at blg.du.se)
-
- 4-Jul-96 - italian added (by Emanuele Caratti)
- - improved configure
-
- 21-Jun-96 - '-iconic' state added
- - usleep did not exist on Solaris 2.4: changed to poll()
- - better error messages
-
- 8-Jun-96 - '-noblink' feature added
- - final switch to imake
-
- 30-May-96 - am/pm should not show 0:00 am/pm but 12:00 am/pm
- - portuguese weekday resized
- - man page (by Dan Weeks)
-
- 25-May-96 - '-geometry' is now '-position' and it _works_ !!!
- - in AM/PM mode, no leading one was visible...
- - '-led' command line option added
-
- 24-May-96 - asclock can start an executable: as default you get a
- message on console
- - command line options added (-exe, -geometry, -shape, -12, -24)
- - Shape-Extension (by Dan Weeks)
- - now it's a Build script
- - dutch added (by Andy Lo A Foe <arloafoe at cs.vu.nl>)
- - norwegian added (by Frank Larsen <frankrl at stud.cs.uit.no>)
-
- 22-May-96 - obscure, not necessary XRaiseWindow removed :)
- - error-message if Xpm-conversion failed
- - name changed to 'afterstep clock'
- - blinking optimized
- - color selection in Configure
- - color led added (by James Robinson <jimr at simons-rock.edu>)
- - portuguese added (by Carlos Canau <canau at dawn.EUnet.pt>)
- - Makefile improvements
- - Configure is now for sh
-
- 20-May-96 - english support added (by Dan Weeks <dan at mango.sfasu.edu>)
- - Language configure script
- - german weekday widened to same size as english...
- - Makefile changes for Solaris
-
- 18-May-96 - 8bit greyscale support added
- - slightly moved the time-led's
- - no bmclock directory was created while decompressing
---
-END OF FILE
-
-
-
-
-
-
-
-
-
-
diff --git a/asclock-orig/asclock.c b/asclock-orig/asclock.c
deleted file mode 100644
index 8849a8d..0000000
--- a/asclock-orig/asclock.c
+++ /dev/null
@@ -1,623 +0,0 @@
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/xpm.h>
-#include <X11/extensions/shape.h>
-#include <time.h>
-#include <sys/time.h>
-#include <X11/Xatom.h>
-#include <unistd.h>
-
-#include "clk.xpm"
-#include "led.xpm"
-#include "month.xpm"
-#include "date.xpm"
-#include "weekday.xpm"
-#include "xpm/mask.xbm"
-#include "xpm/mask.xpm"
-
-int SHOWAMPM=0; /* default value is 24h format */
-int ONLYSHAPE=0; /* default value is noshape */
-int ITBLINKS=1; /* default is blinking */
-int ICONIFIED=0; /* default is not iconified */
-int YEAR=0; /* default is to show time, not year */
-/* led positions *************************************************************/
-int twelve[5] = {5, 14, 24, 28, 37};
-int twfour[5] = {4, 8, 17, 22, 31};
-/* with shape */
-int ws_posx[11] = {0,0,0,0,0,40, 17, 17, 22, 27, 15};
-int ws_posy[4] = {3, 21, 30, 45};
-
-/* no shape */
-int ns_posx[11] = {5,5,5,5,5,45, 21, 21, 26, 31, 19};
-int ns_posy[4] = {7, 25, 34, 49};
-
-int posx[11];
-int posy[4];
-
-/* X11 Variablen *************************************************************/
-Display *dpy; /* welches DISPLAY */
-Window Root; /* Hintergrund-Drawable */
-int screen;
-int x_fd;
-int d_depth;
-XSizeHints mysizehints;
-XWMHints mywmhints;
-Pixel back_pix, fore_pix;
-GC NormalGC;
-Window iconwin, win; /* My home is my window */
-char *ProgName;
-char *Geometry;
-char *LedColor = "LightSeaGreen";
-char Execute[] = "echo no program has been specified >/dev/console";
-char *ERR_colorcells = "not enough free color cells or xpm not found\n";
-char *ampers = " &";
-int readmonthxpm = 0;
-char monthxpm[256];
-int readclockxpm = 0;
-char clockxpm[256];
-int readweekxpm = 0;
-char weekxpm[256];
-
-/* XPM Variablen *************************************************************/
-typedef struct _XpmIcon {
- Pixmap pixmap;
- Pixmap mask;
- XpmAttributes attributes;
-} XpmIcon;
-
-XpmIcon asclock, led, month, date, weekday;
-XpmIcon visible;
-time_t actualtime;
-long actualmin;
-
-/* lokale Funktionen *********************************************************/
-#define MW_EVENTS (ExposureMask | ButtonPressMask | StructureNotifyMask)
-#define FALSE 0
-void GetXPM(void);
-Pixel GetColor(char *name);
-void RedrawWindow( XpmIcon *v);
-void InsertTime();
-/*****************************************************************************/
-/*****************************************************************************/
-static char *help_message[] = {
-"where options include:",
-" -12 12 hour format",
-" -24 24 hour format",
-" -exe <program> program to start on click",
-" -led <color> color of the led",
-" -monthxpm <xpm> month xpm",
-" -clockxpm <xpm> clock xpm",
-" -weekdayxpm <xpm> weekday xpm",
-" -position [+|-]x[+|-]y position of asclock",
-" -shape without groundplate",
-" -noblink don't blink",
-" -iconic start up as icon",
-" -year show year instead of time",
-NULL
-};
-
-void usage()
-{
- char **cpp;
-
- fprintf(stderr,"usage: %s [-options ...] \n", ProgName);
- for (cpp = help_message; *cpp; cpp++) {
- fprintf(stderr, "%s\n", *cpp);
- }
- fprintf(stderr,"\n");
- exit(1);
-}
-int main(int argc,char *argv[])
-{
- int i;
- unsigned int borderwidth ;
- char *display_name = NULL;
- char *wname = "asclock";
- XGCValues gcv;
- unsigned long gcm;
- XEvent Event;
- XTextProperty name;
- XClassHint classHint;
- Pixmap pixmask;
- ProgName = argv[0];
- Geometry = "";
-
- /* Parse command line options */
- ProgName = argv[0];
-
- for(i=1;i<argc;i++) {
- char *arg= argv[i];
-
- if (arg[0] == '-') {
- switch(arg[1]) {
- case '1':
- SHOWAMPM=1;
- continue;
- case '2':
- SHOWAMPM=0;
- continue;
- case 'e':
- if(++i >=argc) usage();
- strcpy(&Execute[0], argv[i]);
- strcat(&Execute[0], " &");
- continue;
- case 'c':
- if(++i >=argc) usage();
- strcpy(&clockxpm[0], argv[i]);
- readclockxpm = 1;
- continue;
- case 'm':
- if(++i >=argc) usage();
- strcpy(&monthxpm[0], argv[i]);
- readmonthxpm = 1;
- continue;
- case 'w':
- if(++i >=argc) usage();
- strcpy(&weekxpm[0], argv[i]);
- readweekxpm = 1;
- continue;
- case 's':
- ONLYSHAPE=1;
- continue;
- case 'p':
- if(++i >=argc) usage();
- Geometry = argv[i];
- continue;
- case 'i':
- ICONIFIED=1;
- continue;
- case 'l':
- if(++i >=argc) usage();
- LedColor = argv[i];
- continue;
- case 'n':
- ITBLINKS = 0;
- continue;
- case 'y':
- YEAR = 1;
- continue;
- default:
- usage();
- }
- }
- }
- /* init led position */
- for(i=0;i<4;i++)
- posy[i] = ONLYSHAPE ? ws_posy[i] : ns_posy[i];
- for(i=0;i<11;i++)
- posx[i] = ONLYSHAPE ? ws_posx[i] : ns_posx[i];
- for(i=0;i<5;i++)
- posx[i] += SHOWAMPM ? twfour[i] : twelve[i];
-
- /* Open the display */
- if (!(dpy = XOpenDisplay(display_name)))
- {
- fprintf(stderr,"asclock: can't open display %s\n",
- XDisplayName(display_name));
- exit (1);
- }
- screen= DefaultScreen(dpy);
- Root = RootWindow(dpy, screen);
- d_depth = DefaultDepth(dpy, screen);
- x_fd = XConnectionNumber(dpy);
-
- /* Icon Daten nach XImage konvertieren */
- GetXPM();
-
- /* Create a window to hold the banner */
- mysizehints.flags= USSize|USPosition;
- mysizehints.x = 0;
- mysizehints.y = 0;
-
- back_pix = GetColor("white");
- fore_pix = GetColor("black");
-
- XWMGeometry(dpy, screen, Geometry, NULL, (borderwidth =1), &mysizehints,
- &mysizehints.x,&mysizehints.y,&mysizehints.width,&mysizehints.height, &i);
-
- mysizehints.width = asclock.attributes.width;
- mysizehints.height= asclock.attributes.height;
-
- win = XCreateSimpleWindow(dpy,Root,mysizehints.x,mysizehints.y,
- mysizehints.width,mysizehints.height,
- borderwidth,fore_pix,back_pix);
- iconwin = XCreateSimpleWindow(dpy,win,mysizehints.x,mysizehints.y,
- mysizehints.width,mysizehints.height,
- borderwidth,fore_pix,back_pix);
-
-
-
- /* Hints aktivieren */
- XSetWMNormalHints(dpy, win, &mysizehints);
- classHint.res_name = "asclock";
- classHint.res_class = " ASClock";
- XSetClassHint(dpy, win, &classHint);
-
- XSelectInput(dpy,win,MW_EVENTS);
- XSelectInput(dpy,iconwin,MW_EVENTS);
-
- if (XStringListToTextProperty(&wname, 1, &name) ==0) {
- fprintf(stderr, "asclock: can't allocate window name\n");
- exit(-1);
- }
- XSetWMName(dpy, win, &name);
-
- /* Create a GC for drawing */
- gcm = GCForeground|GCBackground|GCGraphicsExposures;
- gcv.foreground = fore_pix;
- gcv.background = back_pix;
- gcv.graphics_exposures = FALSE;
- NormalGC = XCreateGC(dpy, Root, gcm, &gcv);
-
- if (ONLYSHAPE) { /* try to make shaped window here */
- pixmask = XCreateBitmapFromData(dpy, win, mask_bits, mask_width,
- mask_height);
- XShapeCombineMask(dpy, win, ShapeBounding, 0, 0, pixmask, ShapeSet);
- XShapeCombineMask(dpy, iconwin, ShapeBounding, 0, 0, pixmask, ShapeSet);
- }
-
- mywmhints.initial_state = (ICONIFIED ? IconicState : NormalState);
- mywmhints.icon_window = iconwin;
- mywmhints.icon_x = mysizehints.x;
- mywmhints.icon_y = mysizehints.y;
- mywmhints.flags = StateHint | IconWindowHint | IconPositionHint;
- XSetWMHints(dpy, win, &mywmhints);
-
- XMapWindow(dpy,win);
-
- InsertTime();
- RedrawWindow(&visible);
- while(1)
- {
- if (actualtime != mytime())
- {
- actualtime = mytime();
- if(actualmin != actualtime / 60)
- {
- InsertTime();
- if (!ITBLINKS) RedrawWindow(&visible);
- }
-
- if (ITBLINKS && (! YEAR))
- {
- if (actualtime % 2)
- /* Sekunden Doppelpunkt ein */
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 90,0,3,11,posx[2], posy[0]);
- else
- /* Sekunden Doppelpunkt aus */
- XCopyArea(dpy, asclock.pixmap, visible.pixmap, NormalGC,
- 27,6,3,11,posx[2], posy[0]);
-
- RedrawWindow(&visible);
- }
- }
-
- /* read a packet */
- while (XPending(dpy))
- {
- XNextEvent(dpy,&Event);
- switch(Event.type)
- {
- case Expose:
- if(Event.xexpose.count == 0 )
- RedrawWindow(&visible);
- break;
- case ButtonPress:
- system(Execute);
- break;
- case DestroyNotify:
- /*
- XFreeGC(dpy, NormalGC);
- XDestroyWindow(dpy, win);
- XDestroyWindow(dpy, iconwin);
- */
- XCloseDisplay(dpy);
- exit(0);
- default:
- break;
- }
- }
- XFlush(dpy);
-#ifdef SYSV
- if (YEAR) {
- poll((struct poll *) 0, (size_t) 0, 200);
- } else
- poll((struct poll *) 0, (size_t) 0, 50);
-#else
- if (YEAR) {
- usleep(200000L); /* 1/5 sec */
- } else
- usleep(50000L); /* 5/100 sec */
-#endif
- }
- return 0;
-}
-/****************************************************************************/
-void nocolor(char *a, char *b)
-{
- fprintf(stderr,"asclock: can't %s %s\n", a,b);
-}
-/****************************************************************************/
-/* Konvertiere XPMIcons nach XImage */
-void GetXPM(void)
-{
- static char **clock_xpm;
- XColor col;
- XWindowAttributes attributes;
- char led1[23];
- char led2[23];
- int ret;
-
- clock_xpm =ONLYSHAPE ? mask_xpm : clk_xpm;
-
- /* for the colormap */
- XGetWindowAttributes(dpy,Root,&attributes);
-
- /* get user-defined color */
- if (!XParseColor (dpy, attributes.colormap, LedColor, &col))
- {
- nocolor("parse",LedColor);
- }
-
- sprintf(&led1[0], ". c #%4X%4X%4X", col.red, col.green, col.blue);
- for(ret=10;ret<22;ret++)
- if(led1[ret]==' ') led1[ret]='0';
- led_xpm[2] = &led1[0];
-
- col.red = (col.red /10) *3;
- col.green = (col.green/10) *3;
- col.blue = (col.blue /10) *3;
- sprintf(&led2[0], "X c #%4X%4X%4X", col.red, col.green, col.blue);
- for(ret=10;ret<22;ret++)
- if(led2[ret]==' ') led2[ret]='0';
- led_xpm[3] = &led2[0];
-
-
- asclock.attributes.closeness = 40000; /* Allow for "similar" colors */
- asclock.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions | XpmCloseness);
-
- if (readclockxpm)
- ret = XpmReadFileToPixmap(dpy, Root, clockxpm,
- &asclock.pixmap, &asclock.mask, &asclock.attributes);
- else
- ret = XpmCreatePixmapFromData(dpy, Root, clock_xpm, &asclock.pixmap,
- &asclock.mask, &asclock.attributes);
- if(ret != XpmSuccess)
- {nocolor("create asclock xpm", ERR_colorcells);exit(1);}
-
- visible.attributes.closeness = 40000; /* Allow for "similar" colors */
- visible.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions | XpmCloseness);
- ret = XpmCreatePixmapFromData(dpy, Root, clk_xpm, &visible.pixmap,
- &visible.mask, &visible.attributes);
-
- led.attributes.closeness = 40000; /* Allow for "similar" colors */
- led.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions | XpmCloseness);
- ret = XpmCreatePixmapFromData(dpy, Root, led_xpm, &led.pixmap,
- &led.mask, &led.attributes);
- if(ret != XpmSuccess)
- {nocolor("create led xpm", ERR_colorcells);exit(1);}
-
- month.attributes.closeness = 40000; /* Allow for "similar" colors */
- month.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions | XpmCloseness);
-
- if (readmonthxpm)
- ret = XpmReadFileToPixmap(dpy, Root, monthxpm,
- &month.pixmap, &month.mask, &month.attributes);
- else
- ret = XpmCreatePixmapFromData(dpy, Root, month_xpm, &month.pixmap,
- &month.mask, &month.attributes);
- if(ret != XpmSuccess)
- {nocolor("create month xpm", ERR_colorcells);exit(1);}
-
- date.attributes.closeness = 40000; /* Allow for "similar" colors */
- date.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions | XpmCloseness);
- ret = XpmCreatePixmapFromData(dpy, Root, date_xpm, &date.pixmap,
- &date.mask, &date.attributes);
- if(ret != XpmSuccess)
- {nocolor("create date xpm", ERR_colorcells);exit(1);}
-
- weekday.attributes.closeness = 40000; /* Allow for "similar" colors */
- weekday.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions | XpmCloseness);
-
-
- if (readweekxpm)
- ret = XpmReadFileToPixmap(dpy, Root, weekxpm,
- &weekday.pixmap, &weekday.mask, &weekday.attributes);
- else
- ret = XpmCreatePixmapFromData(dpy, Root, weekday_xpm, &weekday.pixmap,
- &weekday.mask, &weekday.attributes);
- if(ret != XpmSuccess)
- {nocolor("create weekday xpm", ERR_colorcells);exit(1);}
-
-}
-/****************************************************************************/
-/* Removes expose events for a specific window from the queue */
-int flush_expose (Window w)
-{
- XEvent dummy;
- int i=0;
-
- while (XCheckTypedWindowEvent (dpy, w, Expose, &dummy))i++;
- return i;
-}
-
-/****************************************************************************/
-/* Draws the icon window */
-void RedrawWindow( XpmIcon *v)
-{
- flush_expose (iconwin);
- XCopyArea(dpy,v->pixmap,iconwin,NormalGC,
- 0,0,v->attributes.width, v->attributes.height,0,0);
- flush_expose (win);
- XCopyArea(dpy,v->pixmap,win,NormalGC,
- 0,0,v->attributes.width, v->attributes.height,0,0);
-
-}
-/****************************************************************************/
-Pixel GetColor(char *name)
-{
- XColor color;
- XWindowAttributes attributes;
-
- XGetWindowAttributes(dpy,Root,&attributes);
- color.pixel = 0;
- if (!XParseColor (dpy, attributes.colormap, name, &color))
- {
- nocolor("parse",name);
- }
- else if(!XAllocColor (dpy, attributes.colormap, &color))
- {
- nocolor("alloc",name);
- }
- return color.pixel;
-}
-
-/****************************************************************************/
-static struct tm *clk;
-void Year()
-{
- int year;
-
- year = clk->tm_year + 1900;
-
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 9*(year / 1000),0,9,11,posx[0],posy[0]);
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 9*((year % 1000) / 100),0,9,11,posx[1], posy[0]);
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 9*((year % 100) / 10),0,9,11,posx[3],posy[0]);
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 9*(year % 10),0,9,11,posx[4],posy[0]);
-}
-
-void Twelve()
-{
- int thishour;
- /* Stunde ohne am/pm */
- thishour = clk->tm_hour % 12;
- if (thishour == 0 )
- thishour = 12;
-
- if (clk->tm_hour >= 12)
- {
- /* PM */
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 107,5,11,6,posx[5],posy[0]+5);
- }
- else
- /* AM */
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 94,5,12,6,posx[5],posy[0]+5);
-
- if (thishour>9)
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 13,0,5,11,posx[0], posy[0]);
-
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 9*(thishour % 10),0,9,11,posx[1], posy[0]);
-
- /* Minute, drawn first, so am/pm won't be overwritten */
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 9*(clk->tm_min / 10),0,9,11,posx[3],posy[0]);
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 9*(clk->tm_min % 10),0,9,11,posx[4],posy[0]);
-
-
-}
-
-void TwentyFour()
-{
- /* Stunde ohne am/pm */
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 9*(clk->tm_hour / 10),0,9,11,posx[0],posy[0]);
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 9*(clk->tm_hour % 10),0,9,11,posx[1], posy[0]);
-
- /* Minute */
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 9*(clk->tm_min / 10),0,9,11,posx[3],posy[0]);
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 9*(clk->tm_min % 10),0,9,11,posx[4],posy[0]);
-
-}
-/****************************************************************************/
-
-int mytime()
-{
- struct timeval tv;
- struct timezone tz;
-
- gettimeofday(&tv, &tz);
-
- return tv.tv_sec;
-}
-/****************************************************************************/
-void InsertTime()
-{
- int thismonth, thisweekday, thisdate;
-
- /* Zeit auslesen */
- actualtime = mytime();
- actualmin = actualtime / 60;
-
- clk = localtime(&actualtime);
-
- /* leere asclock holen */
- XCopyArea(dpy, asclock.pixmap, visible.pixmap, NormalGC,
- 0,0,mysizehints.width,mysizehints.height,0,0);
-
- if (YEAR) {
- Year();
- } else if (SHOWAMPM)
- {
- Twelve();
- }
- else
- TwentyFour();
-
-
- /* Monat */
- XCopyArea(dpy, month.pixmap, visible.pixmap, NormalGC,
- 0,6*(clk->tm_mon ),22,6,posx[10],posy[3]);
-
- /* Datum */
- if (clk->tm_mday>9)
- {
- XCopyArea(dpy, date.pixmap, visible.pixmap, NormalGC,
- 9*((clk->tm_mday / 10 +9) % 10),0,9,13,posx[7],posy[2]);
- XCopyArea(dpy, date.pixmap, visible.pixmap, NormalGC,
- 9*((clk->tm_mday % 10 +9) % 10),0,9,13,posx[9],posy[2]);
- }
- else
- XCopyArea(dpy, date.pixmap, visible.pixmap, NormalGC,
- 9*(clk->tm_mday -1),0,9,13,posx[8], posy[2]);
-
- /* Wochentag */
- XCopyArea(dpy, weekday.pixmap, visible.pixmap, NormalGC,
- 0,6*((clk->tm_wday +6) % 7),21,7,posx[6], posy[1]);
-
- if ((! ITBLINKS) && (! YEAR))
- /* Sekunden Doppelpunkt ein */
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
- 90,0,3,11,posx[2], posy[0]);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/asclock-orig/asclock.man b/asclock-orig/asclock.man
deleted file mode 100644
index 122529e..0000000
--- a/asclock-orig/asclock.man
+++ /dev/null
@@ -1,105 +0,0 @@
-.TH asclock 0.99 "23 July 1996" asclock
-.UC
-.SH NAME
-\fBasclock\fP \- the AfterStep clock
-.SH SYNOPSIS
-.B asclock
-[ -help] [-12 | -24] [-shape]
- [-position \fI[+|-]x[+|-]y\fP]
- [-exe \fIprogram\fP]
- [-led \fIcolor\fP]
- [-noblink] [-iconic]
-.SH DESCRIPTION
-The \fBasclock\fP is a clock written to emulate the date/time application on
-the NEXTSTEP(tm) operating system. \fBasclock\fP supports multiple languages,
-military and AM/PM time formats, program execution, and the shape extention
-to X-Windows.
-.SH CONFIGURATION OPTIONS
-.IP "-help"
-.RS
-prints the usage message:
-.nf
- usage: asclock [-options ...]
- where options include:
- -12 12 hour format
- -24 24 hour format
- -exe <program> program to start on click
- -led <color> color of the led
- -position [+|-]x[+|-]y position of asclock
- -shape without groundplate
- -noblink don't blink
- -iconic start up as icon
-.fi
-.RE
-.IP "-12 or -24"
-.RS
-sets the desired time format to either twelve hour
-with AM/PM ( -12 ) or military time ( -24 ). If no
-option is given military time is used.
-.RE
-.IP "-shape"
-.RS
-turn on shaped window support for \fBasclock\fP. When this is turned on the
-\fBasclock\fP windows will only appear to be the led and date pad. By default
-shaped windows are turned off and the clock will appear on a 64 pixel by 64
-pixel base.
-.RE
-.IP "-led <color>"
-.RS
-specifies the color of the led. To find out what colors are available, try
-.I showrgb
-.P (part of X11).
-.RE
-.IP "-position [+|-]x[+|-]y "
-.RS
-specifies the starting position of \fBasclock\fP. The [+|-] works like the standard X-Windows x/y geometry option.
-.RE
-.IP "-exe <program>"
-.RS
-specifies the application to start when the pointer is activated over \fBasclock\fP. To invoke applications with parameters, you have to set quotes around the command. See example below...
-.RE
-.IP "-noblink"
-.RS
-specifies if asclock should blink.
-.RE
-.IP "-iconic"
-.RS
-This gives weird output with AfterStep, so don't bother. It's for mwm and other wm's with no hint functionality.
-.RE
-.SH INVOCATION
-\fBasclock\fP can be called from one of many ways. The most common invocation
-is the command line:
-.nf
-
- [user at host] ~% asclock -12 -exe 'xlock -mode hop' &
-
-.fi
-Another way to call \fBasclock\fP is from the window manager:
-.nf
-
- *Wharf - - MaxSwallow "asclock" asclock -shape -12&
-
-.fi
-
-
-This line, when placed in the \fI.steprc\fP file in the users home directory
-will cause \fBasclock\fP to use the shape extensions so that it will be a
-button on the \fBWharf (1)\fP button bar under the \fBafterstep (1)\fP
-window manager.
-.SH BUGS
-we don't have bugs :)
-.SH COPYRIGHTS
-Copyright 1996, Beat Christen <bchriste at iiic.ethz.ch>. No guarantees or
-warranties or anything are provided or implied in any way whatsoever.
-Use this program at your own risk. Permission to use this program for
-any purpose is given, as long as the copyright is kept intact.
-.SH AUTHORS
-Beat Christen <bchriste at iiic.ethz.ch> -- application
-.sp
-Dan Weeks <dan at mango.sfasu.edu> -- man page
-
-
-
-
-
-
diff --git a/asclock-orig/configure b/asclock-orig/configure
deleted file mode 100755
index 0eb3b24..0000000
--- a/asclock-orig/configure
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-clear
-echo
-echo ASclock configure:
-echo ------------------
-echo
-echo 'Choose language from:'
-echo
-echo '1) english [DEFAULT]'
-echo '2) german'
-echo '3) portuguese'
-echo '4) dutch'
-echo '5) norwegian'
-echo '6) italian'
-echo '7) swedish'
-echo '8) spanish'
-echo '9) hungarian'
-echo '0) breton'
-echo 'a) french'
-echo 'b) czech'
-echo 'c) russian'
-echo 'd) ukrainian'
-echo 'e) slovene'
-echo 'f) indonesian'
-echo 'g) danish'
-echo
-printf "Select a language from above :"
-read LANG
-rm -f weekday.xpm asclock month.xpm asclock.o
-case $LANG in
- g) ANS=danish;;
- f) ANS=indonesian;;
- e) ANS=slovene;;
- d) ANS=ukrainian;;
- c) ANS=russian;;
- b) ANS=czech;;
- a) ANS=french;;
- 0) ANS=breton;;
- 9) ANS=hungarian;;
- 8) ANS=spanish;;
- 7) ANS=swedish;;
- 6) ANS=italian;;
- 5) ANS=norwegian;;
- 4) ANS=dutch;;
- 3) ANS=portuguese;;
- 2) ANS=german;;
- *) ANS=english;;
-esac
- ln -s ./$ANS/month.xpm ./month.xpm
- ln -s ./$ANS/weekday.xpm ./weekday.xpm
- echo $ANS has been chosen!
-#################################################################
-echo ----
-echo 'Choose paneltype from:'
-echo
-echo '1) 8bit AfterStep-colors (47 colors) [DEFAULT]'
-echo '2) 8bit NeXTStep -colors (76 colors)'
-echo '3) 2bit greyscale ( 4 colors)'
-echo
-printf "Select from [1..3] : "
-read PANEL
-rm -f ./clk.xpm
-case $PANEL in
- 3) echo '2bit panel'
- ln -s ./xpm/clk2.xpm ./clk.xpm
- ;;
- 2) echo 'Wharf-style, b/w led (44 colors)'
- ln -s ./xpm/color.xpm ./clk.xpm
- ;;
- *) echo '8bit Wharf-style color led (~50 colors)'
- ln -s ./xpm/color.xpm ./clk.xpm
- ;;
-esac
-xmkmf
-echo ------------------------------------------------------------
-printf " type 'make' now !\n"
-echo ------------------------------------------------------------
diff --git a/asclock-orig/mask.xpm b/asclock-orig/mask.xpm
deleted file mode 100644
index 6bfe853..0000000
--- a/asclock-orig/mask.xpm
+++ /dev/null
@@ -1,70 +0,0 @@
-/* XPM */
-static char * mask_xpm[] = {
-/* width height num_colors chars_per_pixel */
-" 55 57 6 1",
-/* colors */
-". c None",
-"# c #aaaaaa",
-"a c #000000",
-"b c #282828",
-"c c #ffffff",
-"d c #4d4d4d",
-/* pixels */
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc",
-"bcccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-".......................................................",
-".......................................................",
-"..........ccccccccccccccccccccccccccccccccc............",
-"..........ccccccccccccccccccccccccccccccccca...........",
-"..........cccccccccccccccccccccccccccccccccaa..........",
-"..........cccccccccccccccccccccccccccccccccaaa.........",
-"..........cccccccccccccccccccccccccccccccccaaad........",
-"..........cccccccccccccccccccccccccccccccccaaadd.......",
-"..........cccccccccccccccccccccccccccccccccaaaddd......",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-"..........cccccccccccccccccccccccccccccccccaaadddd.....",
-".........ccccccccccccccccccccccccccccccccccaaadddd.....",
-".........ccccccccccccccccccccccccccccccccccaaadddd.....",
-".........cccccccccccccccccccccccccccccccccbaaadddd.....",
-"........ccccccccccccccccccccccccccccccccccbaaadddd.....",
-".......ccccccccccccccccccccccccccccccccccbbaaadddd.....",
-"..........bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbaaadddd.....",
-"..........#################################aaadddd.....",
-"..........aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadddd.....",
-"...........aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadddd.....",
-"............dddddddddddddddddddddddddddddddddddddd....."
-};
diff --git a/debian/changelog b/debian/changelog
index e0bd84b..7c9804e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+wmclock (1.0.14-1) unstable; urgency=low
+
+ * New upstream release.
+
+ * debian/control:
+ + Do not recommend wmaker, as dockapps can be used with a number of other
+ window managers (closes: #624484).
+ + Bump Standards-Version to 3.9.2 (no changes).
+
+ -- Julien BLACHE <jblache at debian.org> Thu, 02 Jun 2011 12:07:58 +0200
+
wmclock (1.0.13-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 00ed75d..989cbfb 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,12 @@ Section: x11
Priority: optional
Maintainer: Julien BLACHE <jblache at debian.org>
Build-Depends: debhelper (>= 5), libxpm-dev, libx11-dev, libxt-dev, libxext-dev, xutils-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://www.bluestop.org/wmclock/
Package: wmclock
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: wmaker
Description: dockable clock applet for Window Maker
wmclock is an applet for Window Maker which displays the date and
time in a dockable tile. It features multiple language support, 24h
diff --git a/debian/patches/fix_12_year_display.patch b/debian/patches/fix_12_year_display.patch
index 4cfd953..2760941 100644
--- a/debian/patches/fix_12_year_display.patch
+++ b/debian/patches/fix_12_year_display.patch
@@ -2,11 +2,11 @@ Description: Fix display when both -12 and -year are given
Author: Vino Fernando Crescini <jcrescin at cit.uws.edu.au>
Bug-Debian: http://bugs.debian.org/228985
-Index: wmclock-1.0.13/wmclock.c
+Index: wmclock-1.0.14/wmclock.c
===================================================================
---- wmclock-1.0.13.orig/wmclock.c 2010-12-03 21:49:51.000000000 +0100
-+++ wmclock-1.0.13/wmclock.c 2010-12-04 17:39:27.215473570 +0100
-@@ -850,7 +850,14 @@
+--- wmclock-1.0.14.orig/wmclock.c 2010-12-22 13:12:28.000000000 +0100
++++ wmclock-1.0.14/wmclock.c 2011-06-02 12:11:51.233840631 +0200
+@@ -849,7 +849,14 @@
#endif /* !ONLY_SHAPED_WINDOW */
for (i = 0; i < NUM_TIME_POSITIONS; i++)
{
diff --git a/debian/patches/manpage_fixes.patch b/debian/patches/manpage_fixes.patch
index 6b778fd..38fbf46 100644
--- a/debian/patches/manpage_fixes.patch
+++ b/debian/patches/manpage_fixes.patch
@@ -2,11 +2,11 @@ Description: Manpage fixes
Fix first line and use proper escape sequence for (c) character.
Author: Sandro Tosi <matrixhasu at gmail.com>
-Index: wmclock-1.0.13/wmclock.man.in
+Index: wmclock-1.0.14/wmclock.man.in
===================================================================
---- wmclock-1.0.13.orig/wmclock.man.in 2010-12-03 21:47:21.000000000 +0100
-+++ wmclock-1.0.13/wmclock.man.in 2010-12-04 17:39:17.764387469 +0100
-@@ -25,9 +25,7 @@
+--- wmclock-1.0.14.orig/wmclock.man.in 2010-12-22 13:12:19.000000000 +0100
++++ wmclock-1.0.14/wmclock.man.in 2011-06-02 12:11:40.157887000 +0200
+@@ -24,9 +24,7 @@
.TH wmclock 1x "@DATE@" "Version @VERSION@"
.\" ----------------------------------------------------------------
.SH NAME
@@ -17,12 +17,3 @@ Index: wmclock-1.0.13/wmclock.man.in
.\" ----------------------------------------------------------------
.SH SYNOPSIS
.HP
-@@ -199,7 +197,7 @@
- .\" ----------------------------------------------------------------
- .SH COPYRIGHT AND LICENSE
- .PP
--Copyright � 1999 by Jim Knoble <jmknoble at pobox.com>. Significant
-+Copyright \(co 1999 by Jim Knoble <jmknoble at pobox.com>. Significant
- portions of
- .B wmclock
- are directly derived from
diff --git a/debian/patches/manpage_xpm_notes.patch b/debian/patches/manpage_xpm_notes.patch
index cc6002d..5662d7e 100644
--- a/debian/patches/manpage_xpm_notes.patch
+++ b/debian/patches/manpage_xpm_notes.patch
@@ -2,11 +2,11 @@ Description: Document Debian-specific XPM files location
Add a section about usage of translated XPM files in Debian.
Author: Sandro Tosi <matrixhasu at gmail.com>
-Index: wmclock-1.0.13/wmclock.man.in
+Index: wmclock-1.0.14/wmclock.man.in
===================================================================
---- wmclock-1.0.13.orig/wmclock.man.in 2010-12-04 17:39:17.764387469 +0100
-+++ wmclock-1.0.13/wmclock.man.in 2010-12-04 17:39:22.043973644 +0100
-@@ -161,6 +161,21 @@
+--- wmclock-1.0.14.orig/wmclock.man.in 2011-06-02 12:11:40.157887000 +0200
++++ wmclock-1.0.14/wmclock.man.in 2011-06-02 12:11:45.337865330 +0200
+@@ -160,6 +160,21 @@
the bottom. The weekday abbreviations must also be arranged
vertically, beginning with Monday at the top and continuing to Sunday
at the bottom.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmclock.git
More information about the Pkg-wmaker-commits
mailing list