[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: pcb.git: branch: master updated (4570d66a094c717cd8986ebc56d7e2c1e25cfb73)
The branch, master has been updated
via 4570d66a094c717cd8986ebc56d7e2c1e25cfb73 (commit)
via f862f65e2e9da0689d64f7a5fbff44e95ba10b0a (commit)
via 00c556b02dfa0113eab62b894eff4cf5d55b8e5f (commit)
from bf409070b0558b4f63b3b78f3a29b57da6b97bb2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
configure.ac | 2 +-
doc/gs/fb-blinker.pcb | 3 ---
doc/gs/fb-led-5.pcb | 3 ---
doc/gs/fb-led.pcb | 3 ---
doc/gs/fb-smt.pcb | 3 ---
doc/gs/term-annulus-1.pcb | 3 ---
doc/gs/term-clearance-1.pcb | 3 ---
doc/gs/term-element-1.pcb | 3 ---
doc/gs/term-pad-1.pcb | 3 ---
doc/gs/term-pin-1.pcb | 3 ---
doc/gs/term-platedhole-1.pcb | 3 ---
doc/gs/term-tented-1.pcb | 3 ---
doc/gs/term-thermal-1.pcb | 3 ---
doc/gs/term-thickness-1.pcb | 3 ---
doc/pad.pcb | 2 --
doc/puller.pcb | 3 ---
doc/thermal.pcb | 3 ---
example/LED.pcb | 3 ---
example/LED2.pcb | 3 ---
src/file.c | 34 +++-------------------------------
tests/inputs/bom_general.pcb | 3 ---
tests/inputs/gcode_oneline.pcb | 3 ---
tests/inputs/gerber_oneline.pcb | 3 ---
tutorial/tut1.pcb | 3 ---
24 files changed, 4 insertions(+), 97 deletions(-)
=================
Commit Messages
=================
commit 4570d66a094c717cd8986ebc56d7e2c1e25cfb73
Author: Markus Hitter <mah@xxxxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
configure.ac: remove the now obsolete test for gethostname().
No longer required since commit 00c556b02dfa0113eab62b894eff4cf5d55b8e5f
Reviewed-by: Peter Clifton <pcjc2@xxxxxxxxx>
Affects-bug: lp-703914
:100644 100644 e405819... 8fde977... M configure.ac
commit f862f65e2e9da0689d64f7a5fbff44e95ba10b0a
Author: Markus Hitter <mah@xxxxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
Remove all date, user and host comments on all test and sample files.
These items are no longer written, so sample files shouldn't
contain them either. Usually, this was line 2...4.
Reviewed-by: Peter Clifton <pcjc2@xxxxxxxxx>
Affects-bug: lp-703914
:100644 100644 26066ef... 787704a... M doc/gs/fb-blinker.pcb
:100644 100644 f9d6ac9... bb59791... M doc/gs/fb-led-5.pcb
:100644 100644 c67e652... 74f8e9d... M doc/gs/fb-led.pcb
:100644 100644 2b224b0... 4e6f0c9... M doc/gs/fb-smt.pcb
:100644 100644 d3a36ed... 51ab107... M doc/gs/term-annulus-1.pcb
:100644 100644 732df82... 21cdef0... M doc/gs/term-clearance-1.pcb
:100644 100644 ce5579d... e3ce630... M doc/gs/term-element-1.pcb
:100644 100644 c06b12f... e0b1f7f... M doc/gs/term-pad-1.pcb
:100644 100644 a291e3b... ff589fa... M doc/gs/term-pin-1.pcb
:100644 100644 d1f4a82... a4289b3... M doc/gs/term-platedhole-1.pcb
:100644 100644 1abeab2... 4af338a... M doc/gs/term-tented-1.pcb
:100644 100644 8921a76... 37f69a2... M doc/gs/term-thermal-1.pcb
:100644 100644 3bec124... ada246c... M doc/gs/term-thickness-1.pcb
:100644 100644 31218bc... bea2ec2... M doc/pad.pcb
:100644 100644 016ad72... 3cd03d5... M doc/puller.pcb
:100644 100644 bce2f09... 82d0afa... M doc/thermal.pcb
:100755 100755 b3da6f4... a4da6cc... M example/LED.pcb
:100644 100644 63754b5... 7585a8b... M example/LED2.pcb
:100644 100644 d61b301... d11ffe8... M tests/inputs/bom_general.pcb
:100644 100644 c20eacf... 6788491... M tests/inputs/gcode_oneline.pcb
:100644 100644 c20eacf... 6788491... M tests/inputs/gerber_oneline.pcb
:100644 100644 a49095a... d384f52... M tutorial/tut1.pcb
commit 00c556b02dfa0113eab62b894eff4cf5d55b8e5f
Author: Markus Hitter <mah@xxxxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
src/file.c: don't write user name or date to the stored layout file.
Notes from Peter Clifton:
The consensus from bug lp-703914 was that that recording the username,
data and host which produced the file is unnecessary and causes
version control clashes which are otherwise unnecessary.
Reviewed-by: Peter Clifton <pcjc2@xxxxxxxxx>
Closes-bug: lp-703914
:100644 100644 1df23d5... e87aeea... M src/file.c
=========
Changes
=========
commit 4570d66a094c717cd8986ebc56d7e2c1e25cfb73
Author: Markus Hitter <mah@xxxxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
configure.ac: remove the now obsolete test for gethostname().
No longer required since commit 00c556b02dfa0113eab62b894eff4cf5d55b8e5f
Reviewed-by: Peter Clifton <pcjc2@xxxxxxxxx>
Affects-bug: lp-703914
diff --git a/configure.ac b/configure.ac
index e405819..8fde977 100644
--- a/configure.ac
+++ b/configure.ac
@@ -650,7 +650,7 @@ AC_CHECK_FUNCS(strerror)
AC_CHECK_FUNCS(regcomp re_comp)
AC_CHECK_FUNCS(logf expf rint)
AC_CHECK_FUNCS(vsnprintf)
-AC_CHECK_FUNCS(getpwuid gethostname getcwd)
+AC_CHECK_FUNCS(getpwuid getcwd)
AC_CHECK_FUNCS(random)
AC_CHECK_FUNCS(stat)
commit f862f65e2e9da0689d64f7a5fbff44e95ba10b0a
Author: Markus Hitter <mah@xxxxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
Remove all date, user and host comments on all test and sample files.
These items are no longer written, so sample files shouldn't
contain them either. Usually, this was line 2...4.
Reviewed-by: Peter Clifton <pcjc2@xxxxxxxxx>
Affects-bug: lp-703914
diff --git a/doc/gs/fb-blinker.pcb b/doc/gs/fb-blinker.pcb
index 26066ef..787704a 100644
--- a/doc/gs/fb-blinker.pcb
+++ b/doc/gs/fb-blinker.pcb
@@ -1,7 +1,4 @@
# release: gpcb 1.99w
-# date: Sun Mar 16 03:12:26 2008
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/fb-led-5.pcb b/doc/gs/fb-led-5.pcb
index f9d6ac9..bb59791 100644
--- a/doc/gs/fb-led-5.pcb
+++ b/doc/gs/fb-led-5.pcb
@@ -1,7 +1,4 @@
# release: gpcb 1.99w
-# date: Fri Dec 7 23:20:12 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/fb-led.pcb b/doc/gs/fb-led.pcb
index c67e652..74f8e9d 100644
--- a/doc/gs/fb-led.pcb
+++ b/doc/gs/fb-led.pcb
@@ -1,7 +1,4 @@
# release: gpcb 1.99w
-# date: Wed Dec 26 17:46:01 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/fb-smt.pcb b/doc/gs/fb-smt.pcb
index 2b224b0..4e6f0c9 100644
--- a/doc/gs/fb-smt.pcb
+++ b/doc/gs/fb-smt.pcb
@@ -1,7 +1,4 @@
# release: gpcb 1.99w
-# date: Sat Aug 2 23:54:58 2008
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-annulus-1.pcb b/doc/gs/term-annulus-1.pcb
index d3a36ed..51ab107 100644
--- a/doc/gs/term-annulus-1.pcb
+++ b/doc/gs/term-annulus-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 00:24:16 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-clearance-1.pcb b/doc/gs/term-clearance-1.pcb
index 732df82..21cdef0 100644
--- a/doc/gs/term-clearance-1.pcb
+++ b/doc/gs/term-clearance-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 00:37:50 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-element-1.pcb b/doc/gs/term-element-1.pcb
index ce5579d..e3ce630 100644
--- a/doc/gs/term-element-1.pcb
+++ b/doc/gs/term-element-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 00:46:21 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-pad-1.pcb b/doc/gs/term-pad-1.pcb
index c06b12f..e0b1f7f 100644
--- a/doc/gs/term-pad-1.pcb
+++ b/doc/gs/term-pad-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 00:55:56 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-pin-1.pcb b/doc/gs/term-pin-1.pcb
index a291e3b..ff589fa 100644
--- a/doc/gs/term-pin-1.pcb
+++ b/doc/gs/term-pin-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 00:57:02 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-platedhole-1.pcb b/doc/gs/term-platedhole-1.pcb
index d1f4a82..a4289b3 100644
--- a/doc/gs/term-platedhole-1.pcb
+++ b/doc/gs/term-platedhole-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 01:29:49 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-tented-1.pcb b/doc/gs/term-tented-1.pcb
index 1abeab2..4af338a 100644
--- a/doc/gs/term-tented-1.pcb
+++ b/doc/gs/term-tented-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 01:25:16 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-thermal-1.pcb b/doc/gs/term-thermal-1.pcb
index 8921a76..37f69a2 100644
--- a/doc/gs/term-thermal-1.pcb
+++ b/doc/gs/term-thermal-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sat Dec 1 22:42:34 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-thickness-1.pcb b/doc/gs/term-thickness-1.pcb
index 3bec124..ada246c 100644
--- a/doc/gs/term-thickness-1.pcb
+++ b/doc/gs/term-thickness-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 00:40:19 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/pad.pcb b/doc/pad.pcb
index 31218bc..bea2ec2 100644
--- a/doc/pad.pcb
+++ b/doc/pad.pcb
@@ -1,6 +1,4 @@
# release: pcb-bin 1.99q
-# date: Tue Mar 21 18:28:39 2006
-# user: mcmahill (Dan McMahill)
PCB["pad" 600000 500000]
diff --git a/doc/puller.pcb b/doc/puller.pcb
index 016ad72..3cd03d5 100644
--- a/doc/puller.pcb
+++ b/doc/puller.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99s
-# date: Fri Apr 14 23:17:49 2006
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
PCB["" 110000 30000]
diff --git a/doc/thermal.pcb b/doc/thermal.pcb
index bce2f09..82d0afa 100644
--- a/doc/thermal.pcb
+++ b/doc/thermal.pcb
@@ -1,7 +1,4 @@
# release: pcb-bin 1.99q
-# date: Fri Mar 24 21:29:02 2006
-# user: Dan
-# host: none
PCB["thermal" 300000 300000]
diff --git a/example/LED.pcb b/example/LED.pcb
index b3da6f4..a4da6cc 100755
--- a/example/LED.pcb
+++ b/example/LED.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.7.0.ALPHA
-# date: Wed Apr 11 11:54:53 2001
-# user: root (root)
-# host: tse-eatonha2
PCB("" 3500 3300)
diff --git a/example/LED2.pcb b/example/LED2.pcb
index 63754b5..7585a8b 100644
--- a/example/LED2.pcb
+++ b/example/LED2.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.9.9d.ALPHA
-# date: Sun Jan 20 18:53:49 2002
-# user: root (root)
-# host: localhost
PCB("" 3500 3300)
diff --git a/tests/inputs/bom_general.pcb b/tests/inputs/bom_general.pcb
index d61b301..d11ffe8 100644
--- a/tests/inputs/bom_general.pcb
+++ b/tests/inputs/bom_general.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99y
-# date: Wed Jun 17 10:41:24 2009
-# user: dan (Dan McMahill,At Home ,258-8142,)
-# host: bondage
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/tests/inputs/gcode_oneline.pcb b/tests/inputs/gcode_oneline.pcb
index c20eacf..6788491 100644
--- a/tests/inputs/gcode_oneline.pcb
+++ b/tests/inputs/gcode_oneline.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99y
-# date: Wed Jun 24 12:26:14 2009
-# user: dan (Dan McMahill,At Home ,258-8142,)
-# host: bondage
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/tests/inputs/gerber_oneline.pcb b/tests/inputs/gerber_oneline.pcb
index c20eacf..6788491 100644
--- a/tests/inputs/gerber_oneline.pcb
+++ b/tests/inputs/gerber_oneline.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99y
-# date: Wed Jun 24 12:26:14 2009
-# user: dan (Dan McMahill,At Home ,258-8142,)
-# host: bondage
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/tutorial/tut1.pcb b/tutorial/tut1.pcb
index a49095a..d384f52 100644
--- a/tutorial/tut1.pcb
+++ b/tutorial/tut1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.9.9d.ALPHA
-# date: Sun Jan 20 18:58:24 2002
-# user: root (root)
-# host: localhost
PCB("" 3500 3300)
commit 00c556b02dfa0113eab62b894eff4cf5d55b8e5f
Author: Markus Hitter <mah@xxxxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
src/file.c: don't write user name or date to the stored layout file.
Notes from Peter Clifton:
The consensus from bug lp-703914 was that that recording the username,
data and host which produced the file is unnecessary and causes
version control clashes which are otherwise unnecessary.
Reviewed-by: Peter Clifton <pcjc2@xxxxxxxxx>
Closes-bug: lp-703914
diff --git a/src/file.c b/src/file.c
index 1df23d5..e87aeea 100644
--- a/src/file.c
+++ b/src/file.c
@@ -491,44 +491,16 @@ WriteAttributeList (FILE * FP, AttributeListTypePtr list, char *prefix)
/* ---------------------------------------------------------------------------
* writes layout header information
- * date, UID and name of user
*/
static void
WritePCBInfoHeader (FILE * FP)
{
-#ifdef HAVE_GETPWUID
- struct passwd *pwentry;
-#endif
-
-#ifdef HAVE_GETHOSTNAME
- static struct hostent *hostentry = NULL;
- char hostname[256];
-#endif
- time_t currenttime;
-
/* write some useful comments */
- currenttime = time (NULL);
fprintf (FP, "# release: %s " VERSION "\n", Progname);
- fprintf (FP, "# date: %s", asctime (localtime (¤ttime)));
-
-#ifdef HAVE_GETPWUID
- pwentry = getpwuid (getuid ());
- fprintf (FP, "# user: %s (%s)\n", pwentry->pw_name, pwentry->pw_gecos);
-#else
- fprintf (FP, "# user: Unknown\n");
-#endif
-#ifdef HAVE_GETHOSTNAME
- if (gethostname (hostname, 255) != -1)
- {
- if (hostentry == NULL)
- hostentry = gethostbyname (hostname);
- fprintf (FP, "# host: %s\n",
- hostentry ? hostentry->h_name : hostname);
- }
-#else
- fprintf (FP, "# host: Unknown\n");
-#endif
+ /* avoid writing things like user name or date, as these cause merge
+ * conflicts in collaborative environments using version control systems
+ */
}
/* ---------------------------------------------------------------------------
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs