[Pkg-wmaker-commits] [wmcalc] 41/65: debian/patches: (01_restore_pristine_code.diff) Remove file; patch applied upstream.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Sun Aug 23 13:54:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmcalc.
commit 8b4ce03b9f6f5dfb2230ab03c59f7c8643bf6943
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Sat Jan 10 15:03:16 2015 -0600
debian/patches: (01_restore_pristine_code.diff) Remove file; patch applied
upstream.
---
debian/patches/01_restore_pristine_code.diff | 182 ---------------------------
debian/patches/series | 1 -
2 files changed, 183 deletions(-)
diff --git a/debian/patches/01_restore_pristine_code.diff b/debian/patches/01_restore_pristine_code.diff
deleted file mode 100644
index 25e0de1..0000000
--- a/debian/patches/01_restore_pristine_code.diff
+++ /dev/null
@@ -1,182 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_restore_pristine_code.dpatch by Sandro Tosi <matrixhasu at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from wmcalc 0.3-3 diff.gz
-
- at DPATCH@
-
---- wmcalc-0.3.orig/Makefile
-+++ wmcalc-0.3/Makefile
-@@ -1,9 +1,17 @@
--INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include
--LIBINC =-L/usr/X11R6/lib
-+INCLUDES =-I/usr/include/X11 -I/usr/local/include
-+LIBINC =-L/usr/lib/X11
- LIBS = -lX11 -lXpm -lXext -lm
-
- TARGET = wmcalc
- OBJECTS = wmcalc.o readln.o wmcalcswitch.o wmcalcfunc.o
-+DESTDIR =
-+PREFIX = /usr/local
-+BINDIR = ${PREFIX}/bin
-+MANDIR = ${PREFIX}/share/man
-+CONF = /etc
-+INSTALL = /usr/bin/install
-+INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
-+INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644
-
- .c.o:
- gcc -O2 -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o
-@@ -14,3 +22,7 @@
- clean::
- for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done
- if [ -e ${TARGET} ] ; then rm ${TARGET}; fi
-+
-+install::
-+ ${INSTALL_PROGRAM} wmcalc ${DESTDIR}${BINDIR}
-+ ${INSTALL_FILE} wmcalc.conf ${DESTDIR}${CONF}
---- wmcalc-0.3.orig/wmcalc.c
-+++ wmcalc-0.3/wmcalc.c
-@@ -90,6 +90,7 @@
- 01/17/01 Updated to use XLookupString to get KeySym
- 11/09/00 Added Events for focus and keyboard work.
- 11/01/00 File Header Added
-+ 21/09/01 Added global configfile by Gordon Fraser
- ****************************************************************/
- int main( int argc, char **argv ) {
- XEvent report;
-@@ -107,6 +108,7 @@
- int bufsize = 20;
- int chcnt = 0;
-
-+
- strcpy(configfile, getenv("HOME")); // Added to wmbutton by Casey Harkin, 3/6/99
- strcat(configfile, CONFFILENAME); // Fixed Bug - didn't look in home directory
- // but startup directory
-@@ -428,7 +430,7 @@
- flush_expose( iconwin );
- XCopyArea(display, visible.pixmap, iconwin, gc, 0, 0,
- visible.attributes.width, visible.attributes.height, 0, 0 );
-- if ( Verbose ) printf("In Redraw()\n");
-+ // if ( Verbose ) printf("In Redraw()\n");
- displaystr();
- } /***** End of function redraw() ********************************/
-
-@@ -471,7 +473,6 @@
- ****************************************************************/
- int whichKey (KeySym keysym) {
- extern int Verbose;
-- extern Display *display;
- int func = NO_BUTTON;
-
- if (Verbose) printf("KeySym 0x%x received, decoding...\n", (int) keysym);
---- wmcalc-0.3.orig/wmcalc_c.h
-+++ wmcalc-0.3/wmcalc_c.h
-@@ -17,6 +17,7 @@
- #define CALC_CMD_SIZE 128
- #define CONFFILENAME "/.wmcalc"
- #define CONFTEMPFILE "/tmp/wmcalc.tmp"
-+#define CONFIGGLOBAL "/etc/wmcalc.conf"
- #define VER 0
- #define REL 3
-
---- wmcalc-0.3.orig/wmcalcswitch.c
-+++ wmcalc-0.3/wmcalcswitch.c
-@@ -399,10 +399,16 @@
-
- /* Open current Config file */
- if ((fp = fopen(configfile, "r")) == NULL) { // Can't find config file
-- printf("%s: Configuration File not found\n", configfile);
-+ printf("%s: Cannot create configuration file\n", configfile);
- return(ERR_FILE_NOT_FOUND);
- }
-
-+ /* We cannot write to the global config-file... */
-+ if(!strcmp(configfile, CONFIGGLOBAL)) {
-+ strcpy(configfile, getenv("HOME")); // Added to wmbutton by Gordon Fraser, 9/21/01
-+ strcat(configfile, CONFFILENAME);
-+ }
-+
- /* Open Temporary File */
- if ((fptmp = fopen(tempfile, "w")) == NULL) { // Can't open file in /tmp
- fprintf(stderr, "%s: Temporary File Open Failed\n", tempfile);
-@@ -476,12 +482,18 @@
- char *sepstr = NULL;
- char sep_ch = '\t';
- char *cfg_var_ptr = NULL;
--
-+
-+
- sepstr = &sep_ch;
-
-- if ((fp = fopen(configfile, "r")) == NULL) { // Can't find config file
-- fprintf(stderr, "%s: Configuration File not found\n", configfile);
-- return(ERR_FILE_NOT_FOUND);
-+ if ((fp = fopen(configfile, "r")) == NULL) { // Can't find config file
-+ strcpy(configfile, CONFIGGLOBAL); // ...so try to open global config
-+ if ((fp = fopen(configfile, "r")) == NULL) { // Can't find global config file
-+ fprintf(stderr, "%s: Configuration File not found\n", configfile);
-+ return(ERR_FILE_NOT_FOUND);
-+ } else {
-+ write_config(); // if global config opened, save in homedir
-+ }
- }
- else {
- if (Verbose) printf("%s: Found Configuration File\n", configfile);
-@@ -498,7 +510,7 @@
- understood */
- i = 0;
- /* Loop while we haven't found the variable */
-- while (((strncmp(line, CfgVarList[i], strlen(CfgVarList[i]))) != NULL)
-+ while (((strncmp(line, CfgVarList[i], strlen(CfgVarList[i]))) != 0)
- && (i < MAX_LABEL)) {
- i++;
- }
-@@ -586,5 +598,8 @@
- } while (line != NULL);
-
- fclose(fp);
-+
-+
-+
- return(err_code);
- } /***** End of function read_config **************************/
---- wmcalc-0.3.orig/wmcalc.conf
-+++ wmcalc-0.3/wmcalc.conf
-@@ -0,0 +1,35 @@
-+# wmcalc Configuration File
-+# Last Manual Update: 10/29/00
-+
-+# General Notes:
-+# * There must be a tab character '\t' between the variable name and
-+# the value, not a series of spaces.
-+# * wmcalc is case sensitive when reading these variables. Examine the
-+# wmcalc_g.h file for currently defined variables.
-+
-+#Calculator Memory Locations
-+#Note: These must all exist, though they may be in any order
-+Mem0 0.000000
-+Mem1 0.000000
-+MEM2 2.718282
-+MEM3 3.141593
-+Mem4 0.000000
-+Mem5 0.000000
-+Mem6 0.000000
-+Mem7 0.000000
-+Mem8 0.000000
-+Mem9 0.000000
-+
-+# The CalcStart variable is intended to allow the user to start a larger
-+# calculator for more complicated needs. Everything after the tab '\t'
-+# character is sent unmodified in a system() call, so anything you can type
-+# at the command prompt may be put here.
-+#CalcStart xterm -T "Basic Calculator" -e bc &
-+#CalcStart xterm -T "gnuplot" -sb -sl 500 -e gnuplot &
-+CalcStart xcalc &
-+
-+# The ImagChar variable allows the user to choose between 'i' and 'j' to
-+# represent the sqrt(-1). (Electrical Engineers (such as myself) use 'j'
-+# rather than 'i.')
-+#ImagChar i
-+ImagChar j
diff --git a/debian/patches/series b/debian/patches/series
index 4ca6c84..00a339a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_restore_pristine_code.diff
10_bts-320597_increase_significant_digits.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmcalc.git
More information about the Pkg-wmaker-commits
mailing list