[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-cvs: gaf.git: branch: master updated (1.6.1-20100214-280-g502ab80)



The branch, master has been updated
       via  502ab80495c45e092eca6052edd6cf8e7ff55429 (commit)
       via  e1c3ba4c453716f3b0cb475a9cc358f34a4683d9 (commit)
       via  28ee546a15e360ab1b870205437905abc876e82e (commit)
       via  c538d2c97885876d695ff45a8457c8d74e872809 (commit)
       via  06f09ecaee96c130825f238689aef530657f892f (commit)
       via  6e54d862d31c1cd97ae54eb457c980f8053b4f10 (commit)
       via  16b3d32fcf8458389a491aed9437be835131b4b9 (commit)
       via  8a3a0bb070d1b288fceac2fcdd7b317a8f77a464 (commit)
       via  47390a485d7c44d8fde27a879f494e4dd90a92c6 (commit)
       via  beba4a7399109038329be6c40a9516244cda30c5 (commit)
       via  e75242de61fd66316694936c3b547d15b93affdd (commit)
       via  9ae03d499783cbbc42dfd5180d0abfa88b8ed8f0 (commit)
       via  8d708818425dea37690d739a5e9eaf26eb9cf46c (commit)
       via  91e46719dcf1722db86c527eebd3f32b696ce06b (commit)
       via  dd6edbc063472ab92f77bac39d9da38536c45274 (commit)
       via  b31c5728f430bd5e223b557cca9eeace74a563f1 (commit)
       via  2dc5ea4877955e55d57e59de3e2eaa0098171037 (commit)
       via  0a3f632252785b4f1f1678686722bc1257d2a540 (commit)
       via  bafbcd605c7beaacfdaf9a46801553be5b0c97ad (commit)
       via  4491d031d5f02a43ec72443a3be6668c9cdc58b6 (commit)
      from  27f7a522a2bb895853697b0013d1344dda3cd5e6 (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
=========

 NEWS                                 |   26 ++++++++++++++++----------
 autogen.sh                           |    2 +-
 build-tools/desktop-i18n             |    4 ++--
 examples/gTAG/copyleft.sym           |    2 +-
 gattrib/include/globals.h            |    2 +-
 gattrib/include/gtksheet_2_2.h       |    4 ++--
 gattrib/include/i_vars.h             |    2 +-
 gattrib/include/struct.h             |    2 +-
 gattrib/include/x_states.h           |    2 +-
 gattrib/src/f_export.c               |    2 +-
 gattrib/src/g_rc.c                   |    2 +-
 gattrib/src/g_register.c             |    2 +-
 gattrib/src/gattrib.c                |    2 +-
 gattrib/src/globals.c                |    2 +-
 gattrib/src/gtksheet_2_2.c           |    4 ++--
 gattrib/src/i_basic.c                |    2 +-
 gattrib/src/i_vars.c                 |    2 +-
 gattrib/src/parsecmd.c               |    2 +-
 gattrib/src/s_attrib.c               |    2 +-
 gattrib/src/s_misc.c                 |    2 +-
 gattrib/src/s_object.c               |    2 +-
 gattrib/src/s_rename.c               |    2 +-
 gattrib/src/s_sheet_data.c           |    2 +-
 gattrib/src/s_string_list.c          |    2 +-
 gattrib/src/s_table.c                |    2 +-
 gattrib/src/s_toplevel.c             |    2 +-
 gattrib/src/s_visibility.c           |    2 +-
 gattrib/src/x_dialog.c               |    2 +-
 gattrib/src/x_fileselect.c           |    2 +-
 gattrib/src/x_gtksheet.c             |    2 +-
 gattrib/src/x_window.c               |    2 +-
 gnetlist/include/globals.h           |    2 +-
 gnetlist/include/i_vars.h            |    2 +-
 gnetlist/include/papersizes.h        |    2 +-
 gnetlist/scheme/gnet-partslist1.scm  |    2 +-
 gnetlist/scheme/gnet-partslist2.scm  |    2 +-
 gnetlist/scheme/gnet-partslist3.scm  |    2 +-
 gnetlist/scheme/partslist-common.scm |    2 +-
 gnetlist/src/g_netlist.c             |    2 +-
 gnetlist/src/g_rc.c                  |    2 +-
 gnetlist/src/g_register.c            |    2 +-
 gnetlist/src/globals.c               |    2 +-
 gnetlist/src/gnetlist.c              |    2 +-
 gnetlist/src/i_vars.c                |    2 +-
 gnetlist/src/parsecmd.c              |    2 +-
 gnetlist/src/s_cpinlist.c            |    2 +-
 gnetlist/src/s_hierarchy.c           |    2 +-
 gnetlist/src/s_misc.c                |    2 +-
 gnetlist/src/s_net.c                 |    2 +-
 gnetlist/src/s_netattrib.c           |    2 +-
 gnetlist/src/s_netlist.c             |    2 +-
 gnetlist/src/s_rename.c              |    2 +-
 gnetlist/src/s_traverse.c            |    2 +-
 gschem/include/gettext.h             |    4 ++--
 gschem/include/globals.h             |    2 +-
 gschem/include/gschem_accel_label.h  |    6 +++---
 gschem/include/gschem_pango.h        |    6 +++---
 gschem/include/x_states.h            |    2 +-
 gschem/scheme/auto-uref.scm          |    2 +-
 gschem/scheme/print-NB-attribs.scm   |    2 +-
 gschem/src/a_pan.c                   |    2 +-
 gschem/src/a_zoom.c                  |    2 +-
 gschem/src/g_funcs.c                 |    2 +-
 gschem/src/g_hook.c                  |    2 +-
 gschem/src/g_keys.c                  |    2 +-
 gschem/src/g_rc.c                    |    2 +-
 gschem/src/g_register.c              |    2 +-
 gschem/src/globals.c                 |    2 +-
 gschem/src/gschem.c                  |    2 +-
 gschem/src/gschem_accel_label.c      |    6 +++---
 gschem/src/gschem_action.c           |    2 +-
 gschem/src/gschem_cairo.c            |    2 +-
 gschem/src/gschem_dialog.c           |    2 +-
 gschem/src/gschem_pango.c            |    6 +++---
 gschem/src/gschem_toplevel.c         |    2 +-
 gschem/src/i_basic.c                 |    2 +-
 gschem/src/i_callbacks.c             |    2 +-
 gschem/src/i_vars.c                  |    2 +-
 gschem/src/m_basic.c                 |    2 +-
 gschem/src/o_arc.c                   |    2 +-
 gschem/src/o_attrib.c                |    2 +-
 gschem/src/o_basic.c                 |    2 +-
 gschem/src/o_box.c                   |    2 +-
 gschem/src/o_buffer.c                |    2 +-
 gschem/src/o_bus.c                   |    2 +-
 gschem/src/o_circle.c                |    2 +-
 gschem/src/o_complex.c               |    2 +-
 gschem/src/o_copy.c                  |    2 +-
 gschem/src/o_cue.c                   |    2 +-
 gschem/src/o_delete.c                |    2 +-
 gschem/src/o_find.c                  |    2 +-
 gschem/src/o_grips.c                 |    2 +-
 gschem/src/o_line.c                  |    2 +-
 gschem/src/o_misc.c                  |    2 +-
 gschem/src/o_move.c                  |    2 +-
 gschem/src/o_net.c                   |    2 +-
 gschem/src/o_path.c                  |    2 +-
 gschem/src/o_picture.c               |    2 +-
 gschem/src/o_pin.c                   |    2 +-
 gschem/src/o_place.c                 |    2 +-
 gschem/src/o_select.c                |    2 +-
 gschem/src/o_slot.c                  |    2 +-
 gschem/src/o_text.c                  |    2 +-
 gschem/src/o_undo.c                  |    2 +-
 gschem/src/parsecmd.c                |    2 +-
 gschem/src/s_stretch.c               |    2 +-
 gschem/src/x_attribedit.c            |    2 +-
 gschem/src/x_autonumber.c            |    2 +-
 gschem/src/x_basic.c                 |    2 +-
 gschem/src/x_clipboard.c             |    2 +-
 gschem/src/x_color.c                 |    2 +-
 gschem/src/x_compselect.c            |    2 +-
 gschem/src/x_dialog.c                |    2 +-
 gschem/src/x_event.c                 |    2 +-
 gschem/src/x_fileselect.c            |    2 +-
 gschem/src/x_grid.c                  |    2 +-
 gschem/src/x_image.c                 |    2 +-
 gschem/src/x_log.c                   |    2 +-
 gschem/src/x_menus.c                 |    2 +-
 gschem/src/x_multiattrib.c           |    2 +-
 gschem/src/x_pagesel.c               |    2 +-
 gschem/src/x_preview.c               |    2 +-
 gschem/src/x_print.c                 |    2 +-
 gschem/src/x_script.c                |    2 +-
 gschem/src/x_stroke.c                |    2 +-
 gschem/src/x_window.c                |    2 +-
 gschem/tests/multiline2.sch          |    4 ++--
 gsymcheck/include/i_vars.h           |    2 +-
 gsymcheck/include/papersizes.h       |    3 ++-
 gsymcheck/src/i_vars.c               |    2 +-
 libgeda/include/gettext_priv.h       |    6 +++---
 libgeda/include/libgeda/papersizes.h |    3 ++-
 libgeda/src/a_basic.c                |    2 +-
 libgeda/src/f_basic.c                |    2 +-
 libgeda/src/f_print.c                |    2 +-
 libgeda/src/g_basic.c                |    2 +-
 libgeda/src/g_rc.c                   |    2 +-
 libgeda/src/g_register.c             |    2 +-
 libgeda/src/g_smob.c                 |    2 +-
 libgeda/src/geda_list.c              |    2 +-
 libgeda/src/i_vars.c                 |    2 +-
 libgeda/src/libgeda.c                |    2 +-
 libgeda/src/m_basic.c                |    2 +-
 libgeda/src/m_bounds.c               |    2 +-
 libgeda/src/m_box.c                  |    2 +-
 libgeda/src/m_circle.c               |    2 +-
 libgeda/src/m_hatch.c                |    2 +-
 libgeda/src/m_line.c                 |    2 +-
 libgeda/src/m_polygon.c              |    2 +-
 libgeda/src/m_transform.c            |    2 +-
 libgeda/src/o_arc_basic.c            |    2 +-
 libgeda/src/o_attrib.c               |    2 +-
 libgeda/src/o_basic.c                |    2 +-
 libgeda/src/o_box_basic.c            |    2 +-
 libgeda/src/o_bus_basic.c            |    2 +-
 libgeda/src/o_circle_basic.c         |    2 +-
 libgeda/src/o_complex_basic.c        |    2 +-
 libgeda/src/o_embed.c                |    2 +-
 libgeda/src/o_line_basic.c           |    2 +-
 libgeda/src/o_list.c                 |    2 +-
 libgeda/src/o_net_basic.c            |    2 +-
 libgeda/src/o_path_basic.c           |    2 +-
 libgeda/src/o_picture.c              |    2 +-
 libgeda/src/o_pin_basic.c            |    2 +-
 libgeda/src/o_selection.c            |    2 +-
 libgeda/src/o_text_basic.c           |    2 +-
 libgeda/src/s_attrib.c               |    2 +-
 libgeda/src/s_basic.c                |    2 +-
 libgeda/src/s_clib.c                 |    2 +-
 libgeda/src/s_color.c                |    2 +-
 libgeda/src/s_conn.c                 |    2 +-
 libgeda/src/s_cue.c                  |    2 +-
 libgeda/src/s_hierarchy.c            |    2 +-
 libgeda/src/s_log.c                  |    2 +-
 libgeda/src/s_menu.c                 |    2 +-
 libgeda/src/s_page.c                 |    2 +-
 libgeda/src/s_papersizes.c           |    2 +-
 libgeda/src/s_path.c                 |    4 ++--
 libgeda/src/s_slib.c                 |    2 +-
 libgeda/src/s_slot.c                 |    2 +-
 libgeda/src/s_textbuffer.c           |    2 +-
 libgeda/src/s_tile.c                 |    2 +-
 libgeda/src/s_toplevel.c             |    2 +-
 libgeda/src/s_undo.c                 |    2 +-
 libgeda/src/u_basic.c                |    2 +-
 m4/geda-assert.m4                    |    2 +-
 m4/geda-awk.m4                       |    2 +-
 m4/geda-data-dirs.m4                 |    2 +-
 m4/geda-desktop-i18n.m4              |    2 +-
 m4/geda-desktop.m4                   |    2 +-
 m4/geda-doxygen.m4                   |    2 +-
 m4/geda-gattrib.m4                   |    2 +-
 m4/geda-gcc-flags.m4                 |    2 +-
 m4/geda-git-version.m4               |    2 +-
 m4/geda-git.m4                       |    2 +-
 m4/geda-groff.m4                     |    2 +-
 m4/geda-guile.m4                     |    2 +-
 m4/geda-libgeda.m4                   |    2 +-
 m4/geda-stroke.m4                    |    2 +-
 m4/geda-windows.m4                   |    2 +-
 m4/pcb-data-dirs.m4                  |    2 +-
 utils/gschlas/globals.c              |    2 +-
 utils/gschlas/i_vars.c               |    2 +-
 utils/gschlas/parsecmd.c             |    2 +-
 utils/include/globals.h              |    2 +-
 utils/include/i_vars.h               |    2 +-
 utils/include/papersizes.h           |    2 +-
 utils/scripts/garchive.py            |    2 +-
 utils/scripts/gschupdate             |    2 +-
 utils/scripts/gsymupdate             |    2 +-
 utils/src/convert_sym.c              |    2 +-
 utils/src/geda_sym_format.h          |    2 +-
 utils/src/grenum.c                   |    2 +-
 utils/src/gsch2pcb.c                 |    2 +-
 utils/src/olib.l                     |    2 +-
 utils/src/smash_megafile.c           |    2 +-
 216 files changed, 249 insertions(+), 241 deletions(-)


=================
 Commit Messages
=================

commit e1c3ba4c453716f3b0cb475a9cc358f34a4683d9
Author: Krzysztof Kosciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: invalidate bounds in attribute promotion
    
    Call o_bounds_invalidate in o_complex_promote_attribs
    and in o_complex_remove_promotable_attribs.
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
    Reviewed-by: Peter Clifton <pcjc2@xxxxxxxxx>
    Closes-bug: lp-700841
    
    (cherry picked from commit 2d07ac4933633837fc394e5001a452c7db290d13)

:100644 100644 58a372e... eddd343... M	libgeda/src/o_complex_basic.c

commit 28ee546a15e360ab1b870205437905abc876e82e
Author: Krzysztof Kosciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: getter for object visibility field
    
    Add method o_is_visible to query value of visibility field.
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
    Reviewed-by: Peter Clifton <pcjc2@xxxxxxxxx>
    Affects-bug: lp-700841
    Affects-bug: lp-701431
    
    (cherry picked from commit 45cb94eff246e342a0331bf8b0c908fdccda1359)

:100644 100644 48e1e1b... d0ec1e3... M	libgeda/include/prototype_priv.h
:100644 100644 8afa46a... 74bed77... M	libgeda/src/f_print.c
:100644 100644 16d48ab... e816a07... M	libgeda/src/o_basic.c
:100644 100644 69b638a... 58a372e... M	libgeda/src/o_complex_basic.c
:100644 100644 b8e5883... aa65a73... M	libgeda/src/o_text_basic.c

commit c538d2c97885876d695ff45a8457c8d74e872809
Author: Krzysztof Kosciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: setter for object visibility field
    
    Add method o_set_visibility to change value of visibility field.
    If object visibility is changed, mark its cached bounds as invalid.
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
    Reviewed-by: Peter Clifton <pcjc2@xxxxxxxxx>
    Affects-bug: lp-700841
    Affects-bug: lp-701431
    
    (cherry picked from commit 37f3c42bf3d509bde85dec3150bfdca0a3e81551)

:100644 100644 fce2c75... 48e1e1b... M	libgeda/include/prototype_priv.h
:100644 100644 d43b609... 16d48ab... M	libgeda/src/o_basic.c
:100644 100644 b83a90c... 69b638a... M	libgeda/src/o_complex_basic.c
:100644 100644 41022e4... b8e5883... M	libgeda/src/o_text_basic.c

commit 06f09ecaee96c130825f238689aef530657f892f
Author: Krzysztof Kosciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: add recursion in o_bounds_invalidate
    
    Instead of invalidating cached bounds for single object, follow the
    hierarchy and invalidate cached bounds of all parents as well.
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
    Reviewed-by: Peter Clifton <pcjc2@xxxxxxxxx>
    Affects-bug: lp-700841
    
    (cherry picked from commit bb27719f730b078dc250196af40141ff7cac8636)

:100644 100644 635ede4... d43b609... M	libgeda/src/o_basic.c

commit 6e54d862d31c1cd97ae54eb457c980f8053b4f10
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Update NEWS re: `gnetlist-arg' change.
    
    Adds info on commit 16b3d32fcf84 to NEWS.

:100644 100644 8b7f9c9... 41e35bd... M	NEWS

commit 16b3d32fcf8458389a491aed9437be835131b4b9
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gsch2pcb: Don't allow `gnetlist-arg' in project file.
    
    Closes-bug: lp-700194

:100644 100644 1d48899... d320dc0... M	utils/src/gsch2pcb.c

commit 8a3a0bb070d1b288fceac2fcdd7b317a8f77a464
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Update FSF address in copyright headers.
    
    The FSF have now moved to 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301 USA.  Our GPL and LPGL copyright headers need to updated to
    reflect this.
    
    Only files remaining with old address are wiki files (although the
    wiki has now been updated) and PostScript files.

:100755 100755 b8502ec... 5f9ec34... M	autogen.sh
:100755 100755 113c44b... 9ec0c06... M	build-tools/desktop-i18n
:100644 100644 c751076... 5421d3e... M	examples/gTAG/copyleft.sym
:100644 100644 c1ffd6c... 7d5f515... M	gattrib/include/globals.h
:100644 100644 f261c9b... 5b90b39... M	gattrib/include/gtksheet_2_2.h
:100644 100644 3b5bd05... 65c3932... M	gattrib/include/i_vars.h
:100644 100644 904b13a... 412baf9... M	gattrib/include/struct.h
:100644 100644 6e992da... 121a8b2... M	gattrib/include/x_states.h
:100644 100644 06f0683... cb1bbbd... M	gattrib/src/f_export.c
:100644 100644 f64d93b... cf959c3... M	gattrib/src/g_rc.c
:100644 100644 e09aa6c... e3e2273... M	gattrib/src/g_register.c
:100644 100644 03626f8... 8d9445f... M	gattrib/src/gattrib.c
:100644 100644 2f44812... ad99f55... M	gattrib/src/globals.c
:100644 100644 f01da10... 05710ad... M	gattrib/src/gtksheet_2_2.c
:100644 100644 cbd49f8... 39c4c15... M	gattrib/src/i_basic.c
:100644 100644 14b22dd... c69aad4... M	gattrib/src/i_vars.c
:100644 100644 97caf2f... d19ee6e... M	gattrib/src/parsecmd.c
:100644 100644 4effa6b... f24ed92... M	gattrib/src/s_attrib.c
:100644 100644 012bf65... a669da9... M	gattrib/src/s_misc.c
:100644 100644 92031f5... ae63b3a... M	gattrib/src/s_object.c
:100644 100644 a647303... 259dba6... M	gattrib/src/s_rename.c
:100644 100644 32ba957... e7c2dee... M	gattrib/src/s_sheet_data.c
:100644 100644 ede385a... 2ba4ee2... M	gattrib/src/s_string_list.c
:100644 100644 6f419c1... 09294ed... M	gattrib/src/s_table.c
:100644 100644 e8babd9... 1727afe... M	gattrib/src/s_toplevel.c
:100644 100644 56b19c4... 539340a... M	gattrib/src/s_visibility.c
:100644 100644 703f1ea... dd12240... M	gattrib/src/x_dialog.c
:100644 100644 5b734a9... fec509d... M	gattrib/src/x_fileselect.c
:100644 100644 56d933e... f49991f... M	gattrib/src/x_gtksheet.c
:100644 100644 521a96a... a50f5d9... M	gattrib/src/x_window.c
:100644 100644 edf497c... a75a00e... M	gnetlist/include/globals.h
:100644 100644 da6dd69... e904c83... M	gnetlist/include/i_vars.h
:100644 100644 c0b0a16... 32b4434... M	gnetlist/include/papersizes.h
:100644 100644 eac539e... d4c235d... M	gnetlist/scheme/gnet-partslist-common.scm
:100644 100644 a8a21cf... a9e02b3... M	gnetlist/scheme/gnet-partslist1.scm
:100644 100644 10a54f5... 6abd02c... M	gnetlist/scheme/gnet-partslist2.scm
:100644 100644 8b450f9... 03f331b... M	gnetlist/scheme/gnet-partslist3.scm
:100644 100644 b3af8fa... 90dbdf8... M	gnetlist/src/g_netlist.c
:100644 100644 fd22ef4... 2185ebc... M	gnetlist/src/g_rc.c
:100644 100644 b46215d... 3771a26... M	gnetlist/src/g_register.c
:100644 100644 99d1b41... a543285... M	gnetlist/src/globals.c
:100644 100644 9b51b7b... 9eb2744... M	gnetlist/src/gnetlist.c
:100644 100644 8c9c1c5... 3b7e2e3... M	gnetlist/src/i_vars.c
:100644 100644 c7b8592... f58a229... M	gnetlist/src/parsecmd.c
:100644 100644 f65a314... 734d8ce... M	gnetlist/src/s_cpinlist.c
:100644 100644 7b8f07a... 134b211... M	gnetlist/src/s_hierarchy.c
:100644 100644 c8ae8c4... 402e5a7... M	gnetlist/src/s_misc.c
:100644 100644 85412ae... 8aca89f... M	gnetlist/src/s_net.c
:100644 100644 6dc2d04... 957735c... M	gnetlist/src/s_netattrib.c
:100644 100644 920513d... ba2c98f... M	gnetlist/src/s_netlist.c
:100644 100644 8fae09a... 406a8a8... M	gnetlist/src/s_rename.c
:100644 100644 7269dc2... 42abd42... M	gnetlist/src/s_traverse.c
:100644 100644 673b3bc... 73d6bdd... M	gschem/include/gettext.h
:100644 100644 8fbeb75... 385490f... M	gschem/include/globals.h
:100644 100644 9cf36a1... 096d8ad... M	gschem/include/gschem_accel_label.h
:100644 100644 ce16193... 552e606... M	gschem/include/gschem_pango.h
:100644 100644 e73d4bb... 076ebaa... M	gschem/include/x_states.h
:100644 100644 a94d62e... e5527c7... M	gschem/scheme/auto-uref.scm
:100644 100644 b1732b1... 6288b7d... M	gschem/scheme/print-NB-attribs.scm
:100644 100644 04c2db9... a6c27e2... M	gschem/src/a_pan.c
:100644 100644 3bc50d0... ada08c5... M	gschem/src/a_zoom.c
:100644 100644 ecfc83a... 63a86ab... M	gschem/src/g_funcs.c
:100644 100644 8686295... 04b2b09... M	gschem/src/g_hook.c
:100644 100644 4bee5d3... d32cc91... M	gschem/src/g_keys.c
:100644 100644 cf61190... 8806627... M	gschem/src/g_rc.c
:100644 100644 3ae65ed... 98a6c4a... M	gschem/src/g_register.c
:100644 100644 e11a110... 7ce26f3... M	gschem/src/globals.c
:100644 100644 7911b55... 3b20732... M	gschem/src/gschem.c
:100644 100644 f49a03d... e5ace3e... M	gschem/src/gschem_accel_label.c
:100644 100644 0e6bf01... 0e68a09... M	gschem/src/gschem_action.c
:100644 100644 c9d05f3... 4e35da0... M	gschem/src/gschem_cairo.c
:100644 100644 79ad04c... 1585eab... M	gschem/src/gschem_dialog.c
:100644 100644 52a6644... 934b341... M	gschem/src/gschem_pango.c
:100644 100644 c9f4a58... 5a83022... M	gschem/src/gschem_toplevel.c
:100644 100644 2bdfbde... e2728d8... M	gschem/src/i_basic.c
:100644 100644 2fb1e4f... 03fa09a... M	gschem/src/i_callbacks.c
:100644 100644 cb48f6f... d14ddd9... M	gschem/src/i_vars.c
:100644 100644 a014042... 1897cd0... M	gschem/src/m_basic.c
:100644 100644 16c5b1a... 435b9e3... M	gschem/src/o_arc.c
:100644 100644 a4ac6d1... 2e18a6d... M	gschem/src/o_attrib.c
:100644 100644 1e4f730... 488e892... M	gschem/src/o_basic.c
:100644 100644 1ea00c1... 1722ab5... M	gschem/src/o_box.c
:100644 100644 ddf32b1... d35c15f... M	gschem/src/o_buffer.c
:100644 100644 5d6c7c1... 44f940d... M	gschem/src/o_bus.c
:100644 100644 0c5cdb4... 43867a0... M	gschem/src/o_circle.c
:100644 100644 826bb8f... 34fcdba... M	gschem/src/o_complex.c
:100644 100644 6e2f63d... 3101171... M	gschem/src/o_copy.c
:100644 100644 d1d4ea8... ce24338... M	gschem/src/o_cue.c
:100644 100644 d7d323a... d91c5c1... M	gschem/src/o_delete.c
:100644 100644 e2e9993... 0ddae57... M	gschem/src/o_find.c
:100644 100644 7ccb1be... d759fec... M	gschem/src/o_grips.c
:100644 100644 719ae69... 2946c3c... M	gschem/src/o_line.c
:100644 100644 011079c... d50c1ec... M	gschem/src/o_misc.c
:100644 100644 ddb81dd... 1a38d88... M	gschem/src/o_move.c
:100644 100644 14bd87d... b0a2c88... M	gschem/src/o_net.c
:100644 100644 682bda5... 4105e82... M	gschem/src/o_path.c
:100644 100644 d738cad... f4dfff0... M	gschem/src/o_picture.c
:100644 100644 a5b7f80... d901f56... M	gschem/src/o_pin.c
:100644 100644 63e168c... c90a85c... M	gschem/src/o_place.c
:100644 100644 23788c3... 35764fe... M	gschem/src/o_select.c
:100644 100644 6c0f712... 22ef393... M	gschem/src/o_slot.c
:100644 100644 596b81b... 70f2671... M	gschem/src/o_text.c
:100644 100644 b1b1406... 1b8f793... M	gschem/src/o_undo.c
:100644 100644 8b72d6a... a6fca88... M	gschem/src/parsecmd.c
:100644 100644 dd98c06... a7c1f1b... M	gschem/src/x_attribedit.c
:100644 100644 ebe5f2b... 18ce828... M	gschem/src/x_autonumber.c
:100644 100644 6a3a78a... af0879f... M	gschem/src/x_basic.c
:100644 100644 b70fe3c... 5ff1de1... M	gschem/src/x_clipboard.c
:100644 100644 23e35c2... f4b4c4e... M	gschem/src/x_color.c
:100644 100644 eba6035... 13e93f4... M	gschem/src/x_compselect.c
:100644 100644 e8efe73... dfe3e0a... M	gschem/src/x_dialog.c
:100644 100644 dfb4ffa... 0aca709... M	gschem/src/x_event.c
:100644 100644 53d1904... d3711d6... M	gschem/src/x_fileselect.c
:100644 100644 0f85e4d... f31bc54... M	gschem/src/x_grid.c
:100644 100644 aa7b845... 4a8a1c0... M	gschem/src/x_image.c
:100644 100644 747b7b8... 22f4e38... M	gschem/src/x_log.c
:100644 100644 7dc3d04... cbdd18a... M	gschem/src/x_menus.c
:100644 100644 5863d39... d79cdd0... M	gschem/src/x_multiattrib.c
:100644 100644 29dfc34... 969e5e5... M	gschem/src/x_pagesel.c
:100644 100644 271b545... 06c6389... M	gschem/src/x_preview.c
:100644 100644 3de2205... 39ab5bd... M	gschem/src/x_print.c
:100644 100644 61e0c83... 9deef86... M	gschem/src/x_script.c
:100644 100644 0259619... 1e87273... M	gschem/src/x_stroke.c
:100644 100644 5488bf4... d180f95... M	gschem/src/x_window.c
:100644 100644 65b2f44... 6bee4c5... M	gschem/tests/multiline2.sch
:100644 100644 6484352... 0c2d729... M	gsymcheck/include/i_vars.h
:100644 100644 a910dd0... 4fc120f... M	gsymcheck/include/papersizes.h
:100644 100644 ddd8105... b2d9285... M	gsymcheck/src/i_vars.c
:100644 100644 5a3876e... e099d02... M	libgeda/include/gettext_priv.h
:100644 100644 e214ca7... d6d15d9... M	libgeda/include/libgeda/papersizes.h
:100644 100644 d4ec258... fd6615b... M	libgeda/src/a_basic.c
:100644 100644 12c0c69... 1dd6089... M	libgeda/src/f_basic.c
:100644 100644 5bb9d3d... 8afa46a... M	libgeda/src/f_print.c
:100644 100644 e4d2083... 54881a3... M	libgeda/src/g_basic.c
:100644 100644 d901128... b1319e4... M	libgeda/src/g_rc.c
:100644 100644 b69b9d5... 7f7e9bd... M	libgeda/src/g_register.c
:100644 100644 58ca68e... 8dec95e... M	libgeda/src/g_smob.c
:100644 100644 62b5df9... b0b08d4... M	libgeda/src/gdk-pixbuf-hacks.c
:100644 100644 0f93161... c144327... M	libgeda/src/geda_list.c
:100644 100644 c1c6897... f1f87da... M	libgeda/src/i_vars.c
:100644 100644 ea11b92... 3bb3d12... M	libgeda/src/libgeda.c
:100644 100644 d00380f... 998554b... M	libgeda/src/m_basic.c
:100644 100644 81bc5af... 93d033e... M	libgeda/src/m_bounds.c
:100644 100644 a0845d0... 16dffbf... M	libgeda/src/m_box.c
:100644 100644 5ead8b9... 4fc7923... M	libgeda/src/m_circle.c
:100644 100644 e42d4f1... 4e270a3... M	libgeda/src/m_hatch.c
:100644 100644 bea514a... 73c098f... M	libgeda/src/m_line.c
:100644 100644 8d100d4... ee2c3c6... M	libgeda/src/m_polygon.c
:100644 100644 96e8a48... 9da18e3... M	libgeda/src/m_transform.c
:100644 100644 baeb169... 95275a1... M	libgeda/src/o_arc_basic.c
:100644 100644 12a36ac... 4a69d29... M	libgeda/src/o_attrib.c
:100644 100644 c8a4e6c... 635ede4... M	libgeda/src/o_basic.c
:100644 100644 3260864... 5faa5fd... M	libgeda/src/o_box_basic.c
:100644 100644 2421c89... 71fe9f3... M	libgeda/src/o_bus_basic.c
:100644 100644 9da6077... 7c271d9... M	libgeda/src/o_circle_basic.c
:100644 100644 2a091cc... b83a90c... M	libgeda/src/o_complex_basic.c
:100644 100644 cb3699d... d3dfb4a... M	libgeda/src/o_embed.c
:100644 100644 cdc1a17... 4c050b2... M	libgeda/src/o_line_basic.c
:100644 100644 9eec71c... 0620f35... M	libgeda/src/o_list.c
:100644 100644 c2c5af1... f36f98b... M	libgeda/src/o_net_basic.c
:100644 100644 ed502c1... 6cf1363... M	libgeda/src/o_path_basic.c
:100644 100644 aae9ba1... 957eab2... M	libgeda/src/o_picture.c
:100644 100644 b0c83d2... 824f5e0... M	libgeda/src/o_pin_basic.c
:100644 100644 8e8f9c9... 578d7c0... M	libgeda/src/o_selection.c
:100644 100644 29f66e5... 41022e4... M	libgeda/src/o_text_basic.c
:100644 100644 beab243... b281bfa... M	libgeda/src/s_attrib.c
:100644 100644 69f8e42... 9ae4219... M	libgeda/src/s_basic.c
:100644 100644 b06f13e... b23f53f... M	libgeda/src/s_clib.c
:100644 100644 b8b1186... 731173e... M	libgeda/src/s_color.c
:100644 100644 4985071... 823f7dc... M	libgeda/src/s_conn.c
:100644 100644 ac78b42... b50c679... M	libgeda/src/s_cue.c
:100644 100644 584fc58... e2a5efb... M	libgeda/src/s_hierarchy.c
:100644 100644 d1e4933... c99cea8... M	libgeda/src/s_log.c
:100644 100644 74599db... 23862af... M	libgeda/src/s_menu.c
:100644 100644 0306da1... cb4acf8... M	libgeda/src/s_page.c
:100644 100644 92f440b... af1acb0... M	libgeda/src/s_papersizes.c
:100644 100644 c2df0c5... 794ff75... M	libgeda/src/s_path.c
:100644 100644 87e019c... 5db771e... M	libgeda/src/s_slib.c
:100644 100644 e47b76f... f371fac... M	libgeda/src/s_slot.c
:100644 100644 395f3fb... 5608548... M	libgeda/src/s_stretch.c
:100644 100644 21f8aca... 785921e... M	libgeda/src/s_textbuffer.c
:100644 100644 5b7094f... ebbd849... M	libgeda/src/s_tile.c
:100644 100644 e237c4c... 56f750d... M	libgeda/src/s_toplevel.c
:100644 100644 44b94bf... 444933f... M	libgeda/src/s_undo.c
:100644 100644 e32d30c... b16cb6f... M	libgeda/src/u_basic.c
:100644 100644 9c7adb2... 972fe07... M	m4/geda-assert.m4
:100644 100644 b5ac48e... 885d273... M	m4/geda-awk.m4
:100644 100644 551814a... 640c3ef... M	m4/geda-data-dirs.m4
:100644 100644 c48d4fd... 18f36a0... M	m4/geda-desktop-i18n.m4
:100644 100644 00b34ad... 8ca0104... M	m4/geda-desktop.m4
:100644 100644 034341d... 7cb4118... M	m4/geda-doxygen.m4
:100644 100644 4f035ed... c9b08d3... M	m4/geda-gattrib.m4
:100644 100644 6884533... 76ad5aa... M	m4/geda-gcc-flags.m4
:100644 100644 ad16213... bdf3a1e... M	m4/geda-git-version.m4
:100644 100644 3d4e1af... 4b04349... M	m4/geda-git.m4
:100644 100644 a0c7881... f2bed22... M	m4/geda-groff.m4
:100644 100644 96abf18... 1bc4b11... M	m4/geda-guile.m4
:100644 100644 45846ca... c373baf... M	m4/geda-libgeda.m4
:100644 100644 cadaffa... 90b9dd1... M	m4/geda-stroke.m4
:100644 100644 1e9b45f... 4658d3c... M	m4/geda-windows.m4
:100644 100644 49faf17... ac7aa44... M	m4/pcb-data-dirs.m4
:100644 100644 c823e20... 0b65381... M	utils/gschlas/globals.c
:100644 100644 9c0ae37... 9b6a1dd... M	utils/gschlas/i_vars.c
:100644 100644 2163e59... f65730e... M	utils/gschlas/parsecmd.c
:100644 100644 414538d... 568369b... M	utils/include/globals.h
:100644 100644 39bb53b... 79eddd0... M	utils/include/i_vars.h
:100644 100644 f55b644... e8e1c05... M	utils/include/papersizes.h
:100644 100644 58446a3... 7306fa1... M	utils/scripts/garchive.py
:100755 100755 18bf40b... d791c0a... M	utils/scripts/gschupdate
:100755 100755 63c4691... 163835a... M	utils/scripts/gsymupdate
:100644 100644 fa61810... eacb830... M	utils/src/convert_sym.c
:100644 100644 135ec16... 0221eff... M	utils/src/geda_sym_format.h
:100644 100644 086aef2... 2b7ef87... M	utils/src/grenum.c
:100644 100644 4d3a825... 1d48899... M	utils/src/gsch2pcb.c
:100644 100644 9a24376... 22d669e... M	utils/src/olib.l
:100644 100644 d2910bd... 385476d... M	utils/src/smash_megafile.c

commit 47390a485d7c44d8fde27a879f494e4dd90a92c6
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Update NEWS for 1.6.2.

:100644 100644 5acfd81... 8b7f9c9... M	NEWS

commit beba4a7399109038329be6c40a9516244cda30c5
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Update README to reflect move from SF.net to Launchpad for bugs.
    
    Cherry picked from commit e045f84435ed3e07d7a54a41015bf145335c5094.

:100644 100644 7112ba4... 2af142d... M	README

commit e75242de61fd66316694936c3b547d15b93affdd
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    build-sys: Check for pdflatex if doxygen is enabled. [3108442]
    (cherry picked from commit e045f84435ed3e07d7a54a41015bf145335c5094)

:100644 100644 9e4a1d4... 034341d... M	m4/geda-doxygen.m4

commit 9ae03d499783cbbc42dfd5180d0abfa88b8ed8f0
Author: Wojciech Kazubski <wk0@xxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gschem: Don't crop the png output [3100660] [3100680]
    
    Gschem sometimes crops the image exported to bitmap file (png,
    bmp... but not eps). This appears in certain range of picture
    proportions, landscape but close to square.
    
    This patch alters the algorithm that adjusts the image proportions to
    remove this problem.

:100644 100644 d2153ca... aa7b845... M	gschem/src/x_image.c

commit 8d708818425dea37690d739a5e9eaf26eb9cf46c
Author: Patrick Bernaud <patrickb@xxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: Check attribute string before requesting name/value [3032626]

:100644 100644 f3bff22... 58ca68e... M	libgeda/src/g_smob.c

commit 91e46719dcf1722db86c527eebd3f32b696ce06b
Author: أحÙ?د اÙ?Ù?Ø­Ù?Ù?دÙ? (Ahmed El-Mahmoudy) <aelmahmoudy@xxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: Fix bashism in sch2eaglepos.sh [2999951]
    
    Note that even with #!/bin/bash the original code gave the error that 3 is an
    invalid file descriptor.

:100755 100755 df835eb... 5f098a7... M	gnetlist/scripts/sch2eaglepos.sh

commit dd6edbc063472ab92f77bac39d9da38536c45274
Author: أحÙ?د اÙ?Ù?Ø­Ù?Ù?دÙ? (Ahmed El-Mahmoudy) <aelmahmoudy@xxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    utils: Don't use string exceptions in Python code. [3014181]
    
    utils/scripts/garchive.py uses string exceptions which have been deprecated in
    Python 2.5, and has been removed in Python 2.6. The attached patch fixes this
    issue.

:100644 100644 15d97e5... 58446a3... M	utils/scripts/garchive.py

commit b31c5728f430bd5e223b557cca9eeace74a563f1
Author: Richard Barlow <richardbarlow@xxxxxxxxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: Handle hierarchy refdes correctly in partslist*. [3044478]
    
    When producing a part list with the partslist[1-3] backend the refdes
    values output to the file do not contain the prepended refdeses of the
    parent component.
    
    E.g.
    
    Master schematic with symbol 'S1' (representing sub-schematic) and a
    resistor 'R1' Sub-schematic containing resistor 'R1'
    
    The geda backend produces a netlist containing two resistors 'R1' and
    'S1/R1', they're unique and everything is fine and dandy.  The
    partslist[1-3] backends contain two components with the refdes 'R1'
    which then causes problems when processing this file further.
    
    This is caused by the partslist[1-3] backends adding the value of the
    refdes attribute to the file rather than the value returned by the
    'packages' function.
    
    The supplied patch alters the backends to use the value from the
    packages function directly, rather than looking up the refdes
    attribute of the component.

:100644 100644 943b28e... eac539e... M	gnetlist/scheme/gnet-partslist-common.scm

commit 2dc5ea4877955e55d57e59de3e2eaa0098171037
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Use @builddir@ instead of $(builddir) because versions of automake
    before 1.10 didn't define it.  Should fix build problems noted by
    Stuart Brorson and John Griessen.

:100644 100644 efc8682... dcbc582... M	gnetlist/scheme/Makefile.am

commit 0a3f632252785b4f1f1678686722bc1257d2a540
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    build-sys: Build desktop-i18n locale data correctly with DESTDIR set.
    
    When doing an out-of-tree build with DESTDIR set, desktop-i18n's
    temporary locale data tree was getting put in the wrong place.  Fix
    this by clearing DESTDIR and forcing prefix and localedir to the
    correct values.
    
    Fix suggested & tested by: Dan McMahill <dan@xxxxxxxxxxxx>
    Bug reported & fix tested by: Charles Lepple <clepple@xxxxxxxxx>

:100755 100755 e3c44d4... 113c44b... M	build-tools/desktop-i18n

commit bafbcd605c7beaacfdaf9a46801553be5b0c97ad
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gschem: Exit any current event state before switching pages
    
    If we don't do this, state from an operation on one page can cause
    corruption and genereral chaos. This was reproducable by moving
    some objects (em), then switching pages with a key-binding.

:100644 100644 8ab13e8... 5488bf4... M	gschem/src/x_window.c

commit 4491d031d5f02a43ec72443a3be6668c9cdc58b6
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Fix hiding the command prompt window on Win32 builds with -mwindows
    
    There was a mistake in gschem and gattrib's Makefile.am, where it
    included the non-existant MINGW_GUI_CFLAGS rather than pulling in
    MINGW_GUI_LDFLAGS where the required -mwindows was set.
    
    Cherry-picked from: e5f32954a1fb23534309d6fa06d887859afbc664
    and subsequent fix: 66e54fd03f75f70d9fcf101d6ed3cad1bb354b13

:100644 100644 623b639... 275571c... M	gattrib/src/Makefile.am
:100644 100644 2cd0d90... d3d6681... M	gschem/src/Makefile.am

=========
 Changes
=========

commit e1c3ba4c453716f3b0cb475a9cc358f34a4683d9
Author: Krzysztof Kosciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: invalidate bounds in attribute promotion
    
    Call o_bounds_invalidate in o_complex_promote_attribs
    and in o_complex_remove_promotable_attribs.
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
    Reviewed-by: Peter Clifton <pcjc2@xxxxxxxxx>
    Closes-bug: lp-700841
    
    (cherry picked from commit 2d07ac4933633837fc394e5001a452c7db290d13)

diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index 58a372e..eddd343 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -348,6 +348,9 @@ GList *o_complex_promote_attribs (TOPLEVEL *toplevel, OBJECT *object)
         g_list_remove (object->complex->prim_objs, o_removed);
     }
     promoted = promotable;
+    /* Invalidate the object's bounds since we may have
+     * stolen objects from inside it. */
+    o_bounds_invalidate (toplevel, object);
   }
 
   /* Attach promoted attributes to the original complex object */
@@ -392,6 +395,7 @@ static void o_complex_remove_promotable_attribs (TOPLEVEL *toplevel, OBJECT *obj
     }
   }
 
+  o_bounds_invalidate (toplevel, object);
   g_list_free (promotable);
 }
 

commit 28ee546a15e360ab1b870205437905abc876e82e
Author: Krzysztof Kosciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: getter for object visibility field
    
    Add method o_is_visible to query value of visibility field.
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
    Reviewed-by: Peter Clifton <pcjc2@xxxxxxxxx>
    Affects-bug: lp-700841
    Affects-bug: lp-701431
    
    (cherry picked from commit 45cb94eff246e342a0331bf8b0c908fdccda1359)

diff --git a/libgeda/include/prototype_priv.h b/libgeda/include/prototype_priv.h
index 48e1e1b..d0ec1e3 100644
--- a/libgeda/include/prototype_priv.h
+++ b/libgeda/include/prototype_priv.h
@@ -112,6 +112,7 @@ OBJECT *o_attrib_find_attrib_by_name(const GList *list, char *name, int count);
 /* o_basic.c */
 void o_bounds_invalidate(TOPLEVEL *toplevel, OBJECT *object);
 double o_shortest_distance_full(OBJECT *object, int x, int y, int force_solid);
+gboolean o_is_visible (TOPLEVEL *toplevel, OBJECT *object);
 void o_set_visibility (TOPLEVEL *toplevel, OBJECT *object, int visibility);
 
 /* o_box_basic.c */
diff --git a/libgeda/src/f_print.c b/libgeda/src/f_print.c
index 8afa46a..74bed77 100644
--- a/libgeda/src/f_print.c
+++ b/libgeda/src/f_print.c
@@ -298,7 +298,7 @@ void f_print_objects (TOPLEVEL *toplevel, FILE *fp, const GList *obj_list,
         break;
 
       case(OBJ_TEXT):
-        if (o_current->visibility == VISIBLE) {
+        if (o_is_visible (toplevel, o_current)) {
           /* Output text */
           save_last_ps_color = toplevel->last_ps_color;
           fprintf(fp, "gsave\n");
@@ -654,7 +654,7 @@ static int f_print_get_unicode_chars (TOPLEVEL *toplevel,
         break;
 
       case (OBJ_TEXT):
-        if (o_current->visibility == VISIBLE) {
+        if (o_is_visible (toplevel, o_current)) {
 
           aux = o_current->text->string;
           while (aux && ((gunichar) (*aux) != 0)) {
diff --git a/libgeda/src/o_basic.c b/libgeda/src/o_basic.c
index 16d48ab..e816a07 100644
--- a/libgeda/src/o_basic.c
+++ b/libgeda/src/o_basic.c
@@ -585,6 +585,21 @@ void o_set_color (TOPLEVEL *toplevel, OBJECT *object, int color)
     o_glist_set_color (toplevel, object->complex->prim_objs, color);
 }
 
+/*! \brief Query visibility of the object.
+ *  \par Function Description
+ *  Attribute getter for the visible field within the object.
+ *
+ *  \param toplevel The TOPLEVEL structure
+ *  \param object   The OBJECT structure to be queried
+ *  \return TRUE when VISIBLE, FALSE otherwise
+ */
+gboolean
+o_is_visible (TOPLEVEL *toplevel, OBJECT *object)
+{
+  g_return_val_if_fail (object != NULL, FALSE);
+  return object->visibility == VISIBLE;
+}
+
 /*! \brief Set visibility of the object.
  *  \par Function Description
  *  Set value of visibility field within the object.
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index 69b638a..58a372e 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -65,8 +65,8 @@ int world_get_single_object_bounds(TOPLEVEL *toplevel, OBJECT *o_current,
       case(OBJ_TEXT):
         /* only do bounding boxes for visible or doing show_hidden_text*/
         /* you might lose some attrs though */
-        if (! (o_current->visibility == VISIBLE ||
-               toplevel->show_hidden_text )) {
+        if (! (o_is_visible (toplevel, o_current) ||
+                toplevel->show_hidden_text)) {
           return 0;
         }
         /* This case falls through intentionally */
@@ -227,7 +227,8 @@ static int o_complex_is_eligible_attribute (TOPLEVEL *toplevel, OBJECT *object)
   }
 
   /* object is invisible and we do not want to promote invisible text */
-  if (object->visibility == INVISIBLE && toplevel->promote_invisible == FALSE)
+  if ((!o_is_visible (toplevel, object)) &&
+      (toplevel->promote_invisible == FALSE))
     return FALSE; /* attribute not eligible for promotion */
 
   /* yup, attribute can be promoted */
diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index b8e5883..aa65a73 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -299,7 +299,8 @@ void o_text_recalc(TOPLEVEL *toplevel, OBJECT *o_current)
 {
   int left, right, top, bottom;
 
-  if (o_current->visibility == INVISIBLE && !toplevel->show_hidden_text) {
+  if ((!o_is_visible (toplevel, o_current)) &&
+      (!toplevel->show_hidden_text)) {
     return;
   }
 

commit c538d2c97885876d695ff45a8457c8d74e872809
Author: Krzysztof Kosciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: setter for object visibility field
    
    Add method o_set_visibility to change value of visibility field.
    If object visibility is changed, mark its cached bounds as invalid.
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
    Reviewed-by: Peter Clifton <pcjc2@xxxxxxxxx>
    Affects-bug: lp-700841
    Affects-bug: lp-701431
    
    (cherry picked from commit 37f3c42bf3d509bde85dec3150bfdca0a3e81551)

diff --git a/libgeda/include/prototype_priv.h b/libgeda/include/prototype_priv.h
index fce2c75..48e1e1b 100644
--- a/libgeda/include/prototype_priv.h
+++ b/libgeda/include/prototype_priv.h
@@ -112,6 +112,7 @@ OBJECT *o_attrib_find_attrib_by_name(const GList *list, char *name, int count);
 /* o_basic.c */
 void o_bounds_invalidate(TOPLEVEL *toplevel, OBJECT *object);
 double o_shortest_distance_full(OBJECT *object, int x, int y, int force_solid);
+void o_set_visibility (TOPLEVEL *toplevel, OBJECT *object, int visibility);
 
 /* o_box_basic.c */
 OBJECT *o_box_read(TOPLEVEL *toplevel, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
diff --git a/libgeda/src/o_basic.c b/libgeda/src/o_basic.c
index d43b609..16d48ab 100644
--- a/libgeda/src/o_basic.c
+++ b/libgeda/src/o_basic.c
@@ -584,3 +584,24 @@ void o_set_color (TOPLEVEL *toplevel, OBJECT *object, int color)
       object->type == OBJ_PLACEHOLDER)
     o_glist_set_color (toplevel, object->complex->prim_objs, color);
 }
+
+/*! \brief Set visibility of the object.
+ *  \par Function Description
+ *  Set value of visibility field within the object.
+ *  If resulting visibility value is changed,
+ *  invalidate the bounds of the object and parent objects.
+ *
+ *  \param toplevel The #TOPLEVEL structure
+ *  \param object   The #OBJECT structure to be modified
+ */
+void
+o_set_visibility (TOPLEVEL *toplevel, OBJECT *object, int visibility)
+{
+  g_return_if_fail (object != NULL);
+  if (visibility == LEAVE_VISIBILITY_ALONE)
+    return;
+  if (object->visibility != visibility) {
+    object->visibility = visibility;
+    o_bounds_invalidate (toplevel, object);
+  }
+}
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index b83a90c..69b638a 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -334,7 +334,7 @@ GList *o_complex_promote_attribs (TOPLEVEL *toplevel, OBJECT *object)
       OBJECT *o_kept = (OBJECT *) iter->data;
       OBJECT *o_copy = o_object_copy (toplevel, o_kept,
                                       toplevel->ADDING_SEL);
-      o_kept->visibility = INVISIBLE;
+      o_set_visibility (toplevel, o_kept, INVISIBLE);
       o_copy->parent = NULL;
       promoted = g_list_prepend (promoted, o_copy);
     }
@@ -383,7 +383,7 @@ static void o_complex_remove_promotable_attribs (TOPLEVEL *toplevel, OBJECT *obj
   for (iter = promotable; iter != NULL; iter = g_list_next (iter)) {
     OBJECT *a_object = iter->data;
     if (toplevel->keep_invisible == TRUE) {   /* Hide promotable attributes */
-      a_object->visibility = INVISIBLE;
+      o_set_visibility (toplevel, a_object, INVISIBLE);
     } else {                                /* Delete promotable attributes */
       object->complex->prim_objs =
         g_list_remove (object->complex->prim_objs, a_object);
diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index 41022e4..b8e5883 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -275,7 +275,7 @@ OBJECT *o_text_new(TOPLEVEL *toplevel,
   new_node->sel_func = select_func;  
 
   new_node->color = color;
-  new_node->visibility = visibility; 
+  o_set_visibility (toplevel, new_node, visibility);
   new_node->show_name_value = show_name_value;
 
   update_disp_string (new_node);

commit 06f09ecaee96c130825f238689aef530657f892f
Author: Krzysztof Kosciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: add recursion in o_bounds_invalidate
    
    Instead of invalidating cached bounds for single object, follow the
    hierarchy and invalidate cached bounds of all parents as well.
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
    Reviewed-by: Peter Clifton <pcjc2@xxxxxxxxx>
    Affects-bug: lp-700841
    
    (cherry picked from commit bb27719f730b078dc250196af40141ff7cac8636)

diff --git a/libgeda/src/o_basic.c b/libgeda/src/o_basic.c
index 635ede4..d43b609 100644
--- a/libgeda/src/o_basic.c
+++ b/libgeda/src/o_basic.c
@@ -548,11 +548,10 @@ double o_shortest_distance_full (OBJECT *object, int x, int y, int force_solid)
 
 /*! \brief Mark an OBJECT's cached bounds as invalid
  *  \par Function Description
- *  Marks the cached bounds of the given OBJECT as having been
- *  invalidated and in need of an update. They will be recalculated
- *  next time the OBJECT's bounds are requested (e.g. via
- *  world_get_single_object_bounds() ).
- *
+ *  Recursively marks the cached bounds of the given OBJECT and its
+ *  parents as having been invalidated and in need of an update. They
+ *  will be recalculated next time the OBJECT's bounds are requested
+ *  (e.g. via world_get_single_object_bounds() ).
  *  \param [in] toplevel
  *  \param [in] obj
  *
@@ -560,7 +559,9 @@ double o_shortest_distance_full (OBJECT *object, int x, int y, int force_solid)
  */
 void o_bounds_invalidate(TOPLEVEL *toplevel, OBJECT *obj)
 {
-  obj->w_bounds_valid = FALSE;
+  do {
+      obj->w_bounds_valid = FALSE;
+  } while ((obj = obj->parent) != NULL);
 }
 
 

commit 6e54d862d31c1cd97ae54eb457c980f8053b4f10
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Update NEWS re: `gnetlist-arg' change.
    
    Adds info on commit 16b3d32fcf84 to NEWS.

diff --git a/NEWS b/NEWS
index 8b7f9c9..41e35bd 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,8 @@ Notable changes in gEDA/gaf 1.6.2
  * On Windows, `gschem' and `gattrib' will no longer launch with a
    command window visible.
 
+ * `gnetlist-arg' is no longer valid in `gsch2pcb' project files.
+
 Several other bugs were fixed, including a major crash bug in
 gnetlist.
 

commit 16b3d32fcf8458389a491aed9437be835131b4b9
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gsch2pcb: Don't allow `gnetlist-arg' in project file.
    
    Closes-bug: lp-700194

diff --git a/utils/src/gsch2pcb.c b/utils/src/gsch2pcb.c
index 1d48899..d320dc0 100644
--- a/utils/src/gsch2pcb.c
+++ b/utils/src/gsch2pcb.c
@@ -1253,9 +1253,6 @@ parse_config(gchar *config, gchar *arg)
 	else if (!strcmp(config, "gnetlist"))
 		extra_gnetlist_list =
 				g_list_append(extra_gnetlist_list, g_strdup(arg));
-	else if (!strcmp(config, "gnetlist-arg"))
-		extra_gnetlist_arg_list =
-				g_list_append(extra_gnetlist_arg_list, g_strdup(arg));
 	else if (!strcmp(config, "empty-footprint"))
 		empty_footprint_name = g_strdup(arg);
 	else
@@ -1370,10 +1367,10 @@ static gchar *usage_string1 =
 "   --gnetlist backend    A convenience run of extra gnetlist -g commands.\n"
 "                         Example:  gnetlist partslist3\n"
 "                         Creates:  myproject.partslist3\n"
-"   --gnetlist-arg arg    Allows additional arguments to be passed to gnetlist.\n"
 " --empty-footprint name  See the project.sample file.\n"
 "\n"
 "options (not recognized in a project file):\n"
+"   --gnetlist-arg arg    Allows additional arguments to be passed to gnetlist.\n"
 "       --fix-elements    If a schematic component footprint is not equal\n"
 "                         to its PCB element Description, update the\n"
 "                         Description instead of replacing the element.\n"
@@ -1432,6 +1429,14 @@ get_args(gint argc, gchar **argv)
 				fix_elements = TRUE;
 				continue;
 				}
+			else if (!strcmp(opt, "gnetlist-arg"))
+				{
+				extra_gnetlist_arg_list =
+					g_list_append(extra_gnetlist_arg_list,
+							g_strdup(arg));
+				i++;
+				continue;
+				}
 			else if (!strcmp(opt, "help") || !strcmp(opt, "h"))
 				usage();
 			else if (   i < argc

commit 8a3a0bb070d1b288fceac2fcdd7b317a8f77a464
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Update FSF address in copyright headers.
    
    The FSF have now moved to 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301 USA.  Our GPL and LPGL copyright headers need to updated to
    reflect this.
    
    Only files remaining with old address are wiki files (although the
    wiki has now been updated) and PostScript files.

diff --git a/autogen.sh b/autogen.sh
index b8502ec..5f9ec34 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 #####################################################################
 # Setup variables
diff --git a/build-tools/desktop-i18n b/build-tools/desktop-i18n
index 113c44b..9ec0c06 100755
--- a/build-tools/desktop-i18n
+++ b/build-tools/desktop-i18n
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 # usage [EXITSTATUS]
 # ------------------
@@ -499,7 +499,7 @@ EOF
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 top_builddir = @top_builddir@
 MKDIR_P = @MKDIR_P@
diff --git a/examples/gTAG/copyleft.sym b/examples/gTAG/copyleft.sym
index c751076..5421d3e 100644
--- a/examples/gTAG/copyleft.sym
+++ b/examples/gTAG/copyleft.sym
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 T 0 300 9 10 1 0 0 0 1
 along with this program; if not, write to the Free Software
 T 0 100 9 10 1 0 0 0 1
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 T 0 2700 9 10 1 0 0 0 1
 (C) 2001 Stefan Petersen (spe@xxxxxxxxxxxxxx)
 T 2300 3400 8 10 0 0 0 0 1
diff --git a/gattrib/include/globals.h b/gattrib/include/globals.h
index c1ffd6c..7d5f515 100644
--- a/gattrib/include/globals.h
+++ b/gattrib/include/globals.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 
diff --git a/gattrib/include/gtksheet_2_2.h b/gattrib/include/gtksheet_2_2.h
index f261c9b..5b90b39 100644
--- a/gattrib/include/gtksheet_2_2.h
+++ b/gattrib/include/gtksheet_2_2.h
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
  */
 
 #ifndef __GTK_SHEET_H__
diff --git a/gattrib/include/i_vars.h b/gattrib/include/i_vars.h
index 3b5bd05..65c3932 100644
--- a/gattrib/include/i_vars.h
+++ b/gattrib/include/i_vars.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*!
diff --git a/gattrib/include/struct.h b/gattrib/include/struct.h
index 904b13a..412baf9 100644
--- a/gattrib/include/struct.h
+++ b/gattrib/include/struct.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /* ----------------------------------------------------------------- */
diff --git a/gattrib/include/x_states.h b/gattrib/include/x_states.h
index 6e992da..121a8b2 100644
--- a/gattrib/include/x_states.h
+++ b/gattrib/include/x_states.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License 
  * along with this library; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef X_STATES_H
diff --git a/gattrib/src/f_export.c b/gattrib/src/f_export.c
index 06f0683..cb1bbbd 100644
--- a/gattrib/src/f_export.c
+++ b/gattrib/src/f_export.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file
diff --git a/gattrib/src/g_rc.c b/gattrib/src/g_rc.c
index f64d93b..cf959c3 100644
--- a/gattrib/src/g_rc.c
+++ b/gattrib/src/g_rc.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 /*! \file
  *
diff --git a/gattrib/src/g_register.c b/gattrib/src/g_register.c
index e09aa6c..e3e2273 100644
--- a/gattrib/src/g_register.c
+++ b/gattrib/src/g_register.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 /*! \file
  * \brief Functions to register Scheme functions
diff --git a/gattrib/src/gattrib.c b/gattrib/src/gattrib.c
index 03626f8..8d9445f 100644
--- a/gattrib/src/gattrib.c
+++ b/gattrib/src/gattrib.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
diff --git a/gattrib/src/globals.c b/gattrib/src/globals.c
index 2f44812..ad99f55 100644
--- a/gattrib/src/globals.c
+++ b/gattrib/src/globals.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file
diff --git a/gattrib/src/gtksheet_2_2.c b/gattrib/src/gtksheet_2_2.c
index f01da10..05710ad 100644
--- a/gattrib/src/gtksheet_2_2.c
+++ b/gattrib/src/gtksheet_2_2.c
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/gattrib/src/i_basic.c b/gattrib/src/i_basic.c
index cbd49f8..39c4c15 100644
--- a/gattrib/src/i_basic.c
+++ b/gattrib/src/i_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file
diff --git a/gattrib/src/i_vars.c b/gattrib/src/i_vars.c
index 14b22dd..c69aad4 100644
--- a/gattrib/src/i_vars.c
+++ b/gattrib/src/i_vars.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file
diff --git a/gattrib/src/parsecmd.c b/gattrib/src/parsecmd.c
index 97caf2f..d19ee6e 100644
--- a/gattrib/src/parsecmd.c
+++ b/gattrib/src/parsecmd.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 /*!
  * \file
diff --git a/gattrib/src/s_attrib.c b/gattrib/src/s_attrib.c
index 4effa6b..f24ed92 100644
--- a/gattrib/src/s_attrib.c
+++ b/gattrib/src/s_attrib.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*!
diff --git a/gattrib/src/s_misc.c b/gattrib/src/s_misc.c
index 012bf65..a669da9 100644
--- a/gattrib/src/s_misc.c
+++ b/gattrib/src/s_misc.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file
diff --git a/gattrib/src/s_object.c b/gattrib/src/s_object.c
index 92031f5..ae63b3a 100644
--- a/gattrib/src/s_object.c
+++ b/gattrib/src/s_object.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*------------------------------------------------------------------*/
diff --git a/gattrib/src/s_rename.c b/gattrib/src/s_rename.c
index a647303..259dba6 100644
--- a/gattrib/src/s_rename.c
+++ b/gattrib/src/s_rename.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License 
  * along with this program; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*!
diff --git a/gattrib/src/s_sheet_data.c b/gattrib/src/s_sheet_data.c
index 32ba957..e7c2dee 100644
--- a/gattrib/src/s_sheet_data.c
+++ b/gattrib/src/s_sheet_data.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*--------------------------------------------------------------*/
diff --git a/gattrib/src/s_string_list.c b/gattrib/src/s_string_list.c
index ede385a..2ba4ee2 100644
--- a/gattrib/src/s_string_list.c
+++ b/gattrib/src/s_string_list.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*------------------------------------------------------------------*/
diff --git a/gattrib/src/s_table.c b/gattrib/src/s_table.c
index 6f419c1..09294ed 100644
--- a/gattrib/src/s_table.c
+++ b/gattrib/src/s_table.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*------------------------------------------------------------------*/
diff --git a/gattrib/src/s_toplevel.c b/gattrib/src/s_toplevel.c
index e8babd9..1727afe 100644
--- a/gattrib/src/s_toplevel.c
+++ b/gattrib/src/s_toplevel.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*------------------------------------------------------------------*/
diff --git a/gattrib/src/s_visibility.c b/gattrib/src/s_visibility.c
index 56b19c4..539340a 100644
--- a/gattrib/src/s_visibility.c
+++ b/gattrib/src/s_visibility.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 /*------------------------------------------------------------------*/
 /*! \file
diff --git a/gattrib/src/x_dialog.c b/gattrib/src/x_dialog.c
index 703f1ea..dd12240 100644
--- a/gattrib/src/x_dialog.c
+++ b/gattrib/src/x_dialog.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*------------------------------------------------------------------*/
diff --git a/gattrib/src/x_fileselect.c b/gattrib/src/x_fileselect.c
index 5b734a9..fec509d 100644
--- a/gattrib/src/x_fileselect.c
+++ b/gattrib/src/x_fileselect.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 /*------------------------------------------------------------------*/
 /*! \file
diff --git a/gattrib/src/x_gtksheet.c b/gattrib/src/x_gtksheet.c
index 56d933e..f49991f 100644
--- a/gattrib/src/x_gtksheet.c
+++ b/gattrib/src/x_gtksheet.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*------------------------------------------------------------------*/
diff --git a/gattrib/src/x_window.c b/gattrib/src/x_window.c
index 521a96a..a50f5d9 100644
--- a/gattrib/src/x_window.c
+++ b/gattrib/src/x_window.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*------------------------------------------------------------------*/
diff --git a/gnetlist/include/globals.h b/gnetlist/include/globals.h
index edf497c..a75a00e 100644
--- a/gnetlist/include/globals.h
+++ b/gnetlist/include/globals.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 extern char *rc_filename;
diff --git a/gnetlist/include/i_vars.h b/gnetlist/include/i_vars.h
index da6dd69..e904c83 100644
--- a/gnetlist/include/i_vars.h
+++ b/gnetlist/include/i_vars.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 extern int default_net_naming_priority;
diff --git a/gnetlist/include/papersizes.h b/gnetlist/include/papersizes.h
index c0b0a16..32b4434 100644
--- a/gnetlist/include/papersizes.h
+++ b/gnetlist/include/papersizes.h
@@ -4,7 +4,7 @@
  *
  * You should have received a copy of the GNU General Public License 
  * along with this program; if not, write to the * Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /* this file is no longer used */
diff --git a/gnetlist/scheme/gnet-partslist-common.scm b/gnetlist/scheme/gnet-partslist-common.scm
index eac539e..d4c235d 100644
--- a/gnetlist/scheme/gnet-partslist-common.scm
+++ b/gnetlist/scheme/gnet-partslist-common.scm
@@ -13,7 +13,7 @@
 ; 
 ; You should have received a copy of the GNU General Public License
 ; along with this program; if not, write to the Free Software
-; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 (define (get-parts-table packages)
   (if (null? packages)
diff --git a/gnetlist/scheme/gnet-partslist1.scm b/gnetlist/scheme/gnet-partslist1.scm
index a8a21cf..a9e02b3 100644
--- a/gnetlist/scheme/gnet-partslist1.scm
+++ b/gnetlist/scheme/gnet-partslist1.scm
@@ -13,7 +13,7 @@
 ; 
 ; You should have received a copy of the GNU General Public License
 ; along with this program; if not, write to the Free Software
-; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 ; The /'s may not work on win32
 (load (string-append gedadata "/scheme/gnet-partslist-common.scm"))
diff --git a/gnetlist/scheme/gnet-partslist2.scm b/gnetlist/scheme/gnet-partslist2.scm
index 10a54f5..6abd02c 100644
--- a/gnetlist/scheme/gnet-partslist2.scm
+++ b/gnetlist/scheme/gnet-partslist2.scm
@@ -13,7 +13,7 @@
 ; 
 ; You should have received a copy of the GNU General Public License
 ; along with this program; if not, write to the Free Software
-; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 ; The /'s may not work on win32
 (load (string-append gedadata "/scheme/gnet-partslist-common.scm"))
diff --git a/gnetlist/scheme/gnet-partslist3.scm b/gnetlist/scheme/gnet-partslist3.scm
index 8b450f9..03f331b 100644
--- a/gnetlist/scheme/gnet-partslist3.scm
+++ b/gnetlist/scheme/gnet-partslist3.scm
@@ -13,7 +13,7 @@
 ; 
 ; You should have received a copy of the GNU General Public License
 ; along with this program; if not, write to the Free Software
-; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 ; The /'s may not work on win32
 (load (string-append gedadata "/scheme/gnet-partslist-common.scm"))
diff --git a/gnetlist/src/g_netlist.c b/gnetlist/src/g_netlist.c
index b3af8fa..90dbdf8 100644
--- a/gnetlist/src/g_netlist.c
+++ b/gnetlist/src/g_netlist.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gnetlist/src/g_rc.c b/gnetlist/src/g_rc.c
index fd22ef4..2185ebc 100644
--- a/gnetlist/src/g_rc.c
+++ b/gnetlist/src/g_rc.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gnetlist/src/g_register.c b/gnetlist/src/g_register.c
index b46215d..3771a26 100644
--- a/gnetlist/src/g_register.c
+++ b/gnetlist/src/g_register.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gnetlist/src/globals.c b/gnetlist/src/globals.c
index 99d1b41..a543285 100644
--- a/gnetlist/src/globals.c
+++ b/gnetlist/src/globals.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gnetlist/src/gnetlist.c b/gnetlist/src/gnetlist.c
index 9b51b7b..9eb2744 100644
--- a/gnetlist/src/gnetlist.c
+++ b/gnetlist/src/gnetlist.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gnetlist/src/i_vars.c b/gnetlist/src/i_vars.c
index 8c9c1c5..3b7e2e3 100644
--- a/gnetlist/src/i_vars.c
+++ b/gnetlist/src/i_vars.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gnetlist/src/parsecmd.c b/gnetlist/src/parsecmd.c
index c7b8592..f58a229 100644
--- a/gnetlist/src/parsecmd.c
+++ b/gnetlist/src/parsecmd.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gnetlist/src/s_cpinlist.c b/gnetlist/src/s_cpinlist.c
index f65a314..734d8ce 100644
--- a/gnetlist/src/s_cpinlist.c
+++ b/gnetlist/src/s_cpinlist.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License 
  * along with this program; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gnetlist/src/s_hierarchy.c b/gnetlist/src/s_hierarchy.c
index 7b8f07a..134b211 100644
--- a/gnetlist/src/s_hierarchy.c
+++ b/gnetlist/src/s_hierarchy.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gnetlist/src/s_misc.c b/gnetlist/src/s_misc.c
index c8ae8c4..402e5a7 100644
--- a/gnetlist/src/s_misc.c
+++ b/gnetlist/src/s_misc.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gnetlist/src/s_net.c b/gnetlist/src/s_net.c
index 85412ae..8aca89f 100644
--- a/gnetlist/src/s_net.c
+++ b/gnetlist/src/s_net.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License 
  * along with this program; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gnetlist/src/s_netattrib.c b/gnetlist/src/s_netattrib.c
index 6dc2d04..957735c 100644
--- a/gnetlist/src/s_netattrib.c
+++ b/gnetlist/src/s_netattrib.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License 
  * along with this program; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gnetlist/src/s_netlist.c b/gnetlist/src/s_netlist.c
index 920513d..ba2c98f 100644
--- a/gnetlist/src/s_netlist.c
+++ b/gnetlist/src/s_netlist.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License 
  * along with this program; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gnetlist/src/s_rename.c b/gnetlist/src/s_rename.c
index 8fae09a..406a8a8 100644
--- a/gnetlist/src/s_rename.c
+++ b/gnetlist/src/s_rename.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License 
  * along with this program; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
  /*
diff --git a/gnetlist/src/s_traverse.c b/gnetlist/src/s_traverse.c
index 7269dc2..42abd42 100644
--- a/gnetlist/src/s_traverse.c
+++ b/gnetlist/src/s_traverse.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gschem/include/gettext.h b/gschem/include/gettext.h
index 673b3bc..73d6bdd 100644
--- a/gschem/include/gettext.h
+++ b/gschem/include/gettext.h
@@ -13,8 +13,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA  */
 
 #ifndef _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1
diff --git a/gschem/include/globals.h b/gschem/include/globals.h
index 8fbeb75..385490f 100644
--- a/gschem/include/globals.h
+++ b/gschem/include/globals.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef H_GSCHEM_GLOBALS_H
diff --git a/gschem/include/gschem_accel_label.h b/gschem/include/gschem_accel_label.h
index 9cf36a1..096d8ad 100644
--- a/gschem/include/gschem_accel_label.h
+++ b/gschem/include/gschem_accel_label.h
@@ -29,10 +29,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
  */
 
 #ifndef __GSCHEM_ACCEL_LABEL_H__
diff --git a/gschem/include/gschem_pango.h b/gschem/include/gschem_pango.h
index ce16193..552e606 100644
--- a/gschem/include/gschem_pango.h
+++ b/gschem/include/gschem_pango.h
@@ -13,10 +13,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
  *
  * This file based on GDK's gdkpango.h (LGPL V2+)
  * Copyright (C) 2000 Red Hat, Inc.
diff --git a/gschem/include/x_states.h b/gschem/include/x_states.h
index e73d4bb..076ebaa 100644
--- a/gschem/include/x_states.h
+++ b/gschem/include/x_states.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License 
  * along with this library; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef X_STATES_H
diff --git a/gschem/scheme/auto-uref.scm b/gschem/scheme/auto-uref.scm
index a94d62e..e5527c7 100644
--- a/gschem/scheme/auto-uref.scm
+++ b/gschem/scheme/auto-uref.scm
@@ -15,7 +15,7 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 (use-modules (ice-9 regex))
 
diff --git a/gschem/scheme/print-NB-attribs.scm b/gschem/scheme/print-NB-attribs.scm
index b1732b1..6288b7d 100644
--- a/gschem/scheme/print-NB-attribs.scm
+++ b/gschem/scheme/print-NB-attribs.scm
@@ -15,7 +15,7 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 (define (print-NB-attribs attribs)
   (for-each 
diff --git a/gschem/src/a_pan.c b/gschem/src/a_pan.c
index 04c2db9..a6c27e2 100644
--- a/gschem/src/a_pan.c
+++ b/gschem/src/a_pan.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/a_zoom.c b/gschem/src/a_zoom.c
index 3bc50d0..ada08c5 100644
--- a/gschem/src/a_zoom.c
+++ b/gschem/src/a_zoom.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/g_funcs.c b/gschem/src/g_funcs.c
index ecfc83a..63a86ab 100644
--- a/gschem/src/g_funcs.c
+++ b/gschem/src/g_funcs.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/g_hook.c b/gschem/src/g_hook.c
index 8686295..04b2b09 100644
--- a/gschem/src/g_hook.c
+++ b/gschem/src/g_hook.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <stdio.h>
diff --git a/gschem/src/g_keys.c b/gschem/src/g_keys.c
index 4bee5d3..d32cc91 100644
--- a/gschem/src/g_keys.c
+++ b/gschem/src/g_keys.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/g_rc.c b/gschem/src/g_rc.c
index cf61190..8806627 100644
--- a/gschem/src/g_rc.c
+++ b/gschem/src/g_rc.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <version.h>
diff --git a/gschem/src/g_register.c b/gschem/src/g_register.c
index 3ae65ed..98a6c4a 100644
--- a/gschem/src/g_register.c
+++ b/gschem/src/g_register.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/globals.c b/gschem/src/globals.c
index e11a110..7ce26f3 100644
--- a/gschem/src/globals.c
+++ b/gschem/src/globals.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 /*! \todo Add global variable documentation!!!
  *
diff --git a/gschem/src/gschem.c b/gschem/src/gschem.c
index 7911b55..3b20732 100644
--- a/gschem/src/gschem.c
+++ b/gschem/src/gschem.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <version.h>
diff --git a/gschem/src/gschem_accel_label.c b/gschem/src/gschem_accel_label.c
index f49a03d..e5ace3e 100644
--- a/gschem/src/gschem_accel_label.c
+++ b/gschem/src/gschem_accel_label.c
@@ -29,10 +29,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
  */
 
 #include "config.h"
diff --git a/gschem/src/gschem_action.c b/gschem/src/gschem_action.c
index 0e6bf01..0e68a09 100644
--- a/gschem/src/gschem_action.c
+++ b/gschem/src/gschem_action.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gschem/src/gschem_cairo.c b/gschem/src/gschem_cairo.c
index c9d05f3..4e35da0 100644
--- a/gschem/src/gschem_cairo.c
+++ b/gschem/src/gschem_cairo.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 
diff --git a/gschem/src/gschem_dialog.c b/gschem/src/gschem_dialog.c
index 79ad04c..1585eab 100644
--- a/gschem/src/gschem_dialog.c
+++ b/gschem/src/gschem_dialog.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gschem/src/gschem_pango.c b/gschem/src/gschem_pango.c
index 52a6644..934b341 100644
--- a/gschem/src/gschem_pango.c
+++ b/gschem/src/gschem_pango.c
@@ -13,10 +13,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
  *
  * This file based on GDK's gdkpango.c (LGPL V2+)
  * Copyright (C) 2000 Red Hat, Inc.
diff --git a/gschem/src/gschem_toplevel.c b/gschem/src/gschem_toplevel.c
index c9f4a58..5a83022 100644
--- a/gschem/src/gschem_toplevel.c
+++ b/gschem/src/gschem_toplevel.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/i_basic.c b/gschem/src/i_basic.c
index 2bdfbde..e2728d8 100644
--- a/gschem/src/i_basic.c
+++ b/gschem/src/i_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/i_callbacks.c b/gschem/src/i_callbacks.c
index 2fb1e4f..03fa09a 100644
--- a/gschem/src/i_callbacks.c
+++ b/gschem/src/i_callbacks.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/i_vars.c b/gschem/src/i_vars.c
index cb48f6f..d14ddd9 100644
--- a/gschem/src/i_vars.c
+++ b/gschem/src/i_vars.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <stdio.h>
diff --git a/gschem/src/m_basic.c b/gschem/src/m_basic.c
index a014042..1897cd0 100644
--- a/gschem/src/m_basic.c
+++ b/gschem/src/m_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_arc.c b/gschem/src/o_arc.c
index 16c5b1a..435b9e3 100644
--- a/gschem/src/o_arc.c
+++ b/gschem/src/o_arc.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <stdio.h>
diff --git a/gschem/src/o_attrib.c b/gschem/src/o_attrib.c
index a4ac6d1..2e18a6d 100644
--- a/gschem/src/o_attrib.c
+++ b/gschem/src/o_attrib.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_basic.c b/gschem/src/o_basic.c
index 1e4f730..488e892 100644
--- a/gschem/src/o_basic.c
+++ b/gschem/src/o_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <stdio.h>
diff --git a/gschem/src/o_box.c b/gschem/src/o_box.c
index 1ea00c1..1722ab5 100644
--- a/gschem/src/o_box.c
+++ b/gschem/src/o_box.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <math.h>
diff --git a/gschem/src/o_buffer.c b/gschem/src/o_buffer.c
index ddf32b1..d35c15f 100644
--- a/gschem/src/o_buffer.c
+++ b/gschem/src/o_buffer.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <stdio.h>
diff --git a/gschem/src/o_bus.c b/gschem/src/o_bus.c
index 5d6c7c1..44f940d 100644
--- a/gschem/src/o_bus.c
+++ b/gschem/src/o_bus.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <stdio.h>
diff --git a/gschem/src/o_circle.c b/gschem/src/o_circle.c
index 0c5cdb4..43867a0 100644
--- a/gschem/src/o_circle.c
+++ b/gschem/src/o_circle.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <stdio.h>
diff --git a/gschem/src/o_complex.c b/gschem/src/o_complex.c
index 826bb8f..34fcdba 100644
--- a/gschem/src/o_complex.c
+++ b/gschem/src/o_complex.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_copy.c b/gschem/src/o_copy.c
index 6e2f63d..3101171 100644
--- a/gschem/src/o_copy.c
+++ b/gschem/src/o_copy.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_cue.c b/gschem/src/o_cue.c
index d1d4ea8..ce24338 100644
--- a/gschem/src/o_cue.c
+++ b/gschem/src/o_cue.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_delete.c b/gschem/src/o_delete.c
index d7d323a..d91c5c1 100644
--- a/gschem/src/o_delete.c
+++ b/gschem/src/o_delete.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_find.c b/gschem/src/o_find.c
index e2e9993..0ddae57 100644
--- a/gschem/src/o_find.c
+++ b/gschem/src/o_find.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_grips.c b/gschem/src/o_grips.c
index 7ccb1be..d759fec 100644
--- a/gschem/src/o_grips.c
+++ b/gschem/src/o_grips.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_line.c b/gschem/src/o_line.c
index 719ae69..2946c3c 100644
--- a/gschem/src/o_line.c
+++ b/gschem/src/o_line.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_misc.c b/gschem/src/o_misc.c
index 011079c..d50c1ec 100644
--- a/gschem/src/o_misc.c
+++ b/gschem/src/o_misc.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index ddb81dd..1a38d88 100644
--- a/gschem/src/o_move.c
+++ b/gschem/src/o_move.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_net.c b/gschem/src/o_net.c
index 14bd87d..b0a2c88 100644
--- a/gschem/src/o_net.c
+++ b/gschem/src/o_net.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_path.c b/gschem/src/o_path.c
index 682bda5..4105e82 100644
--- a/gschem/src/o_path.c
+++ b/gschem/src/o_path.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_picture.c b/gschem/src/o_picture.c
index d738cad..f4dfff0 100644
--- a/gschem/src/o_picture.c
+++ b/gschem/src/o_picture.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <math.h>
diff --git a/gschem/src/o_pin.c b/gschem/src/o_pin.c
index a5b7f80..d901f56 100644
--- a/gschem/src/o_pin.c
+++ b/gschem/src/o_pin.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_place.c b/gschem/src/o_place.c
index 63e168c..c90a85c 100644
--- a/gschem/src/o_place.c
+++ b/gschem/src/o_place.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <stdio.h>
diff --git a/gschem/src/o_select.c b/gschem/src/o_select.c
index 23788c3..35764fe 100644
--- a/gschem/src/o_select.c
+++ b/gschem/src/o_select.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 /*! The code in this file is sometimes not obvious, especially
  * o_select_object (which implements the selection of objects either
diff --git a/gschem/src/o_slot.c b/gschem/src/o_slot.c
index 6c0f712..22ef393 100644
--- a/gschem/src/o_slot.c
+++ b/gschem/src/o_slot.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_text.c b/gschem/src/o_text.c
index 596b81b..70f2671 100644
--- a/gschem/src/o_text.c
+++ b/gschem/src/o_text.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/o_undo.c b/gschem/src/o_undo.c
index b1b1406..1b8f793 100644
--- a/gschem/src/o_undo.c
+++ b/gschem/src/o_undo.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/parsecmd.c b/gschem/src/parsecmd.c
index 8b72d6a..a6fca88 100644
--- a/gschem/src/parsecmd.c
+++ b/gschem/src/parsecmd.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/x_attribedit.c b/gschem/src/x_attribedit.c
index dd98c06..a7c1f1b 100644
--- a/gschem/src/x_attribedit.c
+++ b/gschem/src/x_attribedit.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 /*! \todo STILL NEED to clean up line lengths in aa and tr
  */
diff --git a/gschem/src/x_autonumber.c b/gschem/src/x_autonumber.c
index ebe5f2b..18ce828 100644
--- a/gschem/src/x_autonumber.c
+++ b/gschem/src/x_autonumber.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/gschem/src/x_basic.c b/gschem/src/x_basic.c
index 6a3a78a..af0879f 100644
--- a/gschem/src/x_basic.c
+++ b/gschem/src/x_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/x_clipboard.c b/gschem/src/x_clipboard.c
index b70fe3c..5ff1de1 100644
--- a/gschem/src/x_clipboard.c
+++ b/gschem/src/x_clipboard.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/x_color.c b/gschem/src/x_color.c
index 23e35c2..f4b4c4e 100644
--- a/gschem/src/x_color.c
+++ b/gschem/src/x_color.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/x_compselect.c b/gschem/src/x_compselect.c
index eba6035..13e93f4 100644
--- a/gschem/src/x_compselect.c
+++ b/gschem/src/x_compselect.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/x_dialog.c b/gschem/src/x_dialog.c
index e8efe73..dfe3e0a 100644
--- a/gschem/src/x_dialog.c
+++ b/gschem/src/x_dialog.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 /*! \todo STILL NEED to clean up line lengths in aa and tr */
 #include <config.h>
diff --git a/gschem/src/x_event.c b/gschem/src/x_event.c
index dfb4ffa..0aca709 100644
--- a/gschem/src/x_event.c
+++ b/gschem/src/x_event.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/x_fileselect.c b/gschem/src/x_fileselect.c
index 53d1904..d3711d6 100644
--- a/gschem/src/x_fileselect.c
+++ b/gschem/src/x_fileselect.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/x_grid.c b/gschem/src/x_grid.c
index 0f85e4d..f31bc54 100644
--- a/gschem/src/x_grid.c
+++ b/gschem/src/x_grid.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/x_image.c b/gschem/src/x_image.c
index aa7b845..4a8a1c0 100644
--- a/gschem/src/x_image.c
+++ b/gschem/src/x_image.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/x_log.c b/gschem/src/x_log.c
index 747b7b8..22f4e38 100644
--- a/gschem/src/x_log.c
+++ b/gschem/src/x_log.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/x_menus.c b/gschem/src/x_menus.c
index 7dc3d04..cbdd18a 100644
--- a/gschem/src/x_menus.c
+++ b/gschem/src/x_menus.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "config.h"
 
diff --git a/gschem/src/x_multiattrib.c b/gschem/src/x_multiattrib.c
index 5863d39..d79cdd0 100644
--- a/gschem/src/x_multiattrib.c
+++ b/gschem/src/x_multiattrib.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/x_pagesel.c b/gschem/src/x_pagesel.c
index 29dfc34..969e5e5 100644
--- a/gschem/src/x_pagesel.c
+++ b/gschem/src/x_pagesel.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/x_preview.c b/gschem/src/x_preview.c
index 271b545..06c6389 100644
--- a/gschem/src/x_preview.c
+++ b/gschem/src/x_preview.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/x_print.c b/gschem/src/x_print.c
index 3de2205..39ab5bd 100644
--- a/gschem/src/x_print.c
+++ b/gschem/src/x_print.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/x_script.c b/gschem/src/x_script.c
index 61e0c83..9deef86 100644
--- a/gschem/src/x_script.c
+++ b/gschem/src/x_script.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 /*! \todo CLEAN up line length in this file */
 #include <config.h>
diff --git a/gschem/src/x_stroke.c b/gschem/src/x_stroke.c
index 0259619..1e87273 100644
--- a/gschem/src/x_stroke.c
+++ b/gschem/src/x_stroke.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index 5488bf4..d180f95 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/gschem/tests/multiline2.sch b/gschem/tests/multiline2.sch
index 65b2f44..6bee4c5 100644
--- a/gschem/tests/multiline2.sch
+++ b/gschem/tests/multiline2.sch
@@ -4,7 +4,7 @@ T 13400 49000 9 4 1 0 0 0 173
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -316,7 +316,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/gsymcheck/include/i_vars.h b/gsymcheck/include/i_vars.h
index 6484352..0c2d729 100644
--- a/gsymcheck/include/i_vars.h
+++ b/gsymcheck/include/i_vars.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 
diff --git a/gsymcheck/include/papersizes.h b/gsymcheck/include/papersizes.h
index a910dd0..4fc120f 100644
--- a/gsymcheck/include/papersizes.h
+++ b/gsymcheck/include/papersizes.h
@@ -4,7 +4,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
  */
 
 /* this file is no longer used */
diff --git a/gsymcheck/src/i_vars.c b/gsymcheck/src/i_vars.c
index ddd8105..b2d9285 100644
--- a/gsymcheck/src/i_vars.c
+++ b/gsymcheck/src/i_vars.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/libgeda/include/gettext_priv.h b/libgeda/include/gettext_priv.h
index 5a3876e..e099d02 100644
--- a/libgeda/include/gettext_priv.h
+++ b/libgeda/include/gettext_priv.h
@@ -12,9 +12,9 @@
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1
diff --git a/libgeda/include/libgeda/papersizes.h b/libgeda/include/libgeda/papersizes.h
index e214ca7..d6d15d9 100644
--- a/libgeda/include/libgeda/papersizes.h
+++ b/libgeda/include/libgeda/papersizes.h
@@ -4,7 +4,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
  */
 
 /* this file is no longer used */
diff --git a/libgeda/src/a_basic.c b/libgeda/src/a_basic.c
index d4ec258..fd6615b 100644
--- a/libgeda/src/a_basic.c
+++ b/libgeda/src/a_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file a_basic.c
diff --git a/libgeda/src/f_basic.c b/libgeda/src/f_basic.c
index 12c0c69..1dd6089 100644
--- a/libgeda/src/f_basic.c
+++ b/libgeda/src/f_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file f_basic.c
diff --git a/libgeda/src/f_print.c b/libgeda/src/f_print.c
index 5bb9d3d..8afa46a 100644
--- a/libgeda/src/f_print.c
+++ b/libgeda/src/f_print.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file f_print.c
diff --git a/libgeda/src/g_basic.c b/libgeda/src/g_basic.c
index e4d2083..54881a3 100644
--- a/libgeda/src/g_basic.c
+++ b/libgeda/src/g_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/g_rc.c b/libgeda/src/g_rc.c
index d901128..b1319e4 100644
--- a/libgeda/src/g_rc.c
+++ b/libgeda/src/g_rc.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/g_register.c b/libgeda/src/g_register.c
index b69b9d5..7f7e9bd 100644
--- a/libgeda/src/g_register.c
+++ b/libgeda/src/g_register.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/libgeda/src/g_smob.c b/libgeda/src/g_smob.c
index 58ca68e..8dec95e 100644
--- a/libgeda/src/g_smob.c
+++ b/libgeda/src/g_smob.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/gdk-pixbuf-hacks.c b/libgeda/src/gdk-pixbuf-hacks.c
index 62b5df9..b0b08d4 100644
--- a/libgeda/src/gdk-pixbuf-hacks.c
+++ b/libgeda/src/gdk-pixbuf-hacks.c
@@ -13,10 +13,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details. 
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
  */
 
 /* Taken from gtkam's sources */
diff --git a/libgeda/src/geda_list.c b/libgeda/src/geda_list.c
index 0f93161..c144327 100644
--- a/libgeda/src/geda_list.c
+++ b/libgeda/src/geda_list.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file geda_list.c
diff --git a/libgeda/src/i_vars.c b/libgeda/src/i_vars.c
index c1c6897..f1f87da 100644
--- a/libgeda/src/i_vars.c
+++ b/libgeda/src/i_vars.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <stdio.h>
diff --git a/libgeda/src/libgeda.c b/libgeda/src/libgeda.c
index ea11b92..3bb3d12 100644
--- a/libgeda/src/libgeda.c
+++ b/libgeda/src/libgeda.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/m_basic.c b/libgeda/src/m_basic.c
index d00380f..998554b 100644
--- a/libgeda/src/m_basic.c
+++ b/libgeda/src/m_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/m_bounds.c b/libgeda/src/m_bounds.c
index 81bc5af..93d033e 100644
--- a/libgeda/src/m_bounds.c
+++ b/libgeda/src/m_bounds.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <libgeda_priv.h>
diff --git a/libgeda/src/m_box.c b/libgeda/src/m_box.c
index a0845d0..16dffbf 100644
--- a/libgeda/src/m_box.c
+++ b/libgeda/src/m_box.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file m_box.c
diff --git a/libgeda/src/m_circle.c b/libgeda/src/m_circle.c
index 5ead8b9..4fc7923 100644
--- a/libgeda/src/m_circle.c
+++ b/libgeda/src/m_circle.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file m_geometry.c
diff --git a/libgeda/src/m_hatch.c b/libgeda/src/m_hatch.c
index e42d4f1..4e270a3 100644
--- a/libgeda/src/m_hatch.c
+++ b/libgeda/src/m_hatch.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <math.h>
diff --git a/libgeda/src/m_line.c b/libgeda/src/m_line.c
index bea514a..73c098f 100644
--- a/libgeda/src/m_line.c
+++ b/libgeda/src/m_line.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file m_geometry.c
diff --git a/libgeda/src/m_polygon.c b/libgeda/src/m_polygon.c
index 8d100d4..ee2c3c6 100644
--- a/libgeda/src/m_polygon.c
+++ b/libgeda/src/m_polygon.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <math.h>
diff --git a/libgeda/src/m_transform.c b/libgeda/src/m_transform.c
index 96e8a48..9da18e3 100644
--- a/libgeda/src/m_transform.c
+++ b/libgeda/src/m_transform.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 #include <math.h>
diff --git a/libgeda/src/o_arc_basic.c b/libgeda/src/o_arc_basic.c
index baeb169..95275a1 100644
--- a/libgeda/src/o_arc_basic.c
+++ b/libgeda/src/o_arc_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file o_arc_basic.c
diff --git a/libgeda/src/o_attrib.c b/libgeda/src/o_attrib.c
index 12a36ac..4a69d29 100644
--- a/libgeda/src/o_attrib.c
+++ b/libgeda/src/o_attrib.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file o_attrib.c
diff --git a/libgeda/src/o_basic.c b/libgeda/src/o_basic.c
index c8a4e6c..635ede4 100644
--- a/libgeda/src/o_basic.c
+++ b/libgeda/src/o_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file o_basic.c
diff --git a/libgeda/src/o_box_basic.c b/libgeda/src/o_box_basic.c
index 3260864..5faa5fd 100644
--- a/libgeda/src/o_box_basic.c
+++ b/libgeda/src/o_box_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file o_box_basic.c
diff --git a/libgeda/src/o_bus_basic.c b/libgeda/src/o_bus_basic.c
index 2421c89..71fe9f3 100644
--- a/libgeda/src/o_bus_basic.c
+++ b/libgeda/src/o_bus_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file o_bus_basic.c 
diff --git a/libgeda/src/o_circle_basic.c b/libgeda/src/o_circle_basic.c
index 9da6077..7c271d9 100644
--- a/libgeda/src/o_circle_basic.c
+++ b/libgeda/src/o_circle_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file o_circle_basic.c
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index 2a091cc..b83a90c 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file o_complex_basic.c
diff --git a/libgeda/src/o_embed.c b/libgeda/src/o_embed.c
index cb3699d..d3dfb4a 100644
--- a/libgeda/src/o_embed.c
+++ b/libgeda/src/o_embed.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file o_embed.c
diff --git a/libgeda/src/o_line_basic.c b/libgeda/src/o_line_basic.c
index cdc1a17..4c050b2 100644
--- a/libgeda/src/o_line_basic.c
+++ b/libgeda/src/o_line_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file o_line_basic.c
diff --git a/libgeda/src/o_list.c b/libgeda/src/o_list.c
index 9eec71c..0620f35 100644
--- a/libgeda/src/o_list.c
+++ b/libgeda/src/o_list.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/o_net_basic.c b/libgeda/src/o_net_basic.c
index c2c5af1..f36f98b 100644
--- a/libgeda/src/o_net_basic.c
+++ b/libgeda/src/o_net_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/o_path_basic.c b/libgeda/src/o_path_basic.c
index ed502c1..6cf1363 100644
--- a/libgeda/src/o_path_basic.c
+++ b/libgeda/src/o_path_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/o_picture.c b/libgeda/src/o_picture.c
index aae9ba1..957eab2 100644
--- a/libgeda/src/o_picture.c
+++ b/libgeda/src/o_picture.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file o_picture.c
diff --git a/libgeda/src/o_pin_basic.c b/libgeda/src/o_pin_basic.c
index b0c83d2..824f5e0 100644
--- a/libgeda/src/o_pin_basic.c
+++ b/libgeda/src/o_pin_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/o_selection.c b/libgeda/src/o_selection.c
index 8e8f9c9..578d7c0 100644
--- a/libgeda/src/o_selection.c
+++ b/libgeda/src/o_selection.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index 29f66e5..41022e4 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file o_text_basic.c
diff --git a/libgeda/src/s_attrib.c b/libgeda/src/s_attrib.c
index beab243..b281bfa 100644
--- a/libgeda/src/s_attrib.c
+++ b/libgeda/src/s_attrib.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/s_basic.c b/libgeda/src/s_basic.c
index 69f8e42..9ae4219 100644
--- a/libgeda/src/s_basic.c
+++ b/libgeda/src/s_basic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/s_clib.c b/libgeda/src/s_clib.c
index b06f13e..b23f53f 100644
--- a/libgeda/src/s_clib.c
+++ b/libgeda/src/s_clib.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file s_clib.c
diff --git a/libgeda/src/s_color.c b/libgeda/src/s_color.c
index b8b1186..731173e 100644
--- a/libgeda/src/s_color.c
+++ b/libgeda/src/s_color.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/s_conn.c b/libgeda/src/s_conn.c
index 4985071..823f7dc 100644
--- a/libgeda/src/s_conn.c
+++ b/libgeda/src/s_conn.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/s_cue.c b/libgeda/src/s_cue.c
index ac78b42..b50c679 100644
--- a/libgeda/src/s_cue.c
+++ b/libgeda/src/s_cue.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/s_hierarchy.c b/libgeda/src/s_hierarchy.c
index 584fc58..e2a5efb 100644
--- a/libgeda/src/s_hierarchy.c
+++ b/libgeda/src/s_hierarchy.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/s_log.c b/libgeda/src/s_log.c
index d1e4933..c99cea8 100644
--- a/libgeda/src/s_log.c
+++ b/libgeda/src/s_log.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/s_menu.c b/libgeda/src/s_menu.c
index 74599db..23862af 100644
--- a/libgeda/src/s_menu.c
+++ b/libgeda/src/s_menu.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/s_page.c b/libgeda/src/s_page.c
index 0306da1..cb4acf8 100644
--- a/libgeda/src/s_page.c
+++ b/libgeda/src/s_page.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file s_page.c
diff --git a/libgeda/src/s_papersizes.c b/libgeda/src/s_papersizes.c
index 92f440b..af1acb0 100644
--- a/libgeda/src/s_papersizes.c
+++ b/libgeda/src/s_papersizes.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/s_path.c b/libgeda/src/s_path.c
index c2df0c5..794ff75 100644
--- a/libgeda/src/s_path.c
+++ b/libgeda/src/s_path.c
@@ -25,8 +25,8 @@
  *
  *  You should have received a copy of the GNU Library General Public
  *  License along with this program; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
+ *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
  *
  */
 
diff --git a/libgeda/src/s_slib.c b/libgeda/src/s_slib.c
index 87e019c..5db771e 100644
--- a/libgeda/src/s_slib.c
+++ b/libgeda/src/s_slib.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 /*! slib stands for source (project/schematic/hdl/model source) library */
 
diff --git a/libgeda/src/s_slot.c b/libgeda/src/s_slot.c
index e47b76f..f371fac 100644
--- a/libgeda/src/s_slot.c
+++ b/libgeda/src/s_slot.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*! \file s_slot.c
diff --git a/libgeda/src/s_stretch.c b/libgeda/src/s_stretch.c
index 395f3fb..5608548 100644
--- a/libgeda/src/s_stretch.c
+++ b/libgeda/src/s_stretch.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/s_textbuffer.c b/libgeda/src/s_textbuffer.c
index 21f8aca..785921e 100644
--- a/libgeda/src/s_textbuffer.c
+++ b/libgeda/src/s_textbuffer.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/libgeda/src/s_tile.c b/libgeda/src/s_tile.c
index 5b7094f..ebbd849 100644
--- a/libgeda/src/s_tile.c
+++ b/libgeda/src/s_tile.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/s_toplevel.c b/libgeda/src/s_toplevel.c
index e237c4c..56f750d 100644
--- a/libgeda/src/s_toplevel.c
+++ b/libgeda/src/s_toplevel.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/s_undo.c b/libgeda/src/s_undo.c
index 44b94bf..444933f 100644
--- a/libgeda/src/s_undo.c
+++ b/libgeda/src/s_undo.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/libgeda/src/u_basic.c b/libgeda/src/u_basic.c
index e32d30c..b16cb6f 100644
--- a/libgeda/src/u_basic.c
+++ b/libgeda/src/u_basic.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <config.h>
 
diff --git a/m4/geda-assert.m4 b/m4/geda-assert.m4
index 9c7adb2..972fe07 100644
--- a/m4/geda-assert.m4
+++ b/m4/geda-assert.m4
@@ -16,7 +16,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Check if assertions should be disabled.
 AC_DEFUN([AX_OPTION_ASSERT],
diff --git a/m4/geda-awk.m4 b/m4/geda-awk.m4
index b5ac48e..885d273 100644
--- a/m4/geda-awk.m4
+++ b/m4/geda-awk.m4
@@ -17,7 +17,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 AC_DEFUN([AX_PROG_AWK],
 [
diff --git a/m4/geda-data-dirs.m4 b/m4/geda-data-dirs.m4
index 551814a..640c3ef 100644
--- a/m4/geda-data-dirs.m4
+++ b/m4/geda-data-dirs.m4
@@ -16,7 +16,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Check where gEDA data and configuration should be stored.
 AC_DEFUN([AX_DATA_DIRS],
diff --git a/m4/geda-desktop-i18n.m4 b/m4/geda-desktop-i18n.m4
index c48d4fd..18f36a0 100644
--- a/m4/geda-desktop-i18n.m4
+++ b/m4/geda-desktop-i18n.m4
@@ -16,7 +16,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 AC_DEFUN([AX_DESKTOP_I18N],
 [
diff --git a/m4/geda-desktop.m4 b/m4/geda-desktop.m4
index 00b34ad..8ca0104 100644
--- a/m4/geda-desktop.m4
+++ b/m4/geda-desktop.m4
@@ -16,7 +16,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Check where KDE data should be installed (needed for KDE 3)
 AC_DEFUN([AX_OPTION_KDE3_DATA],
diff --git a/m4/geda-doxygen.m4 b/m4/geda-doxygen.m4
index 034341d..7cb4118 100644
--- a/m4/geda-doxygen.m4
+++ b/m4/geda-doxygen.m4
@@ -16,7 +16,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Check if doxygen documentation is requested, and if so, find doxygen program.
 AC_DEFUN([AX_OPTION_DOXYGEN],
diff --git a/m4/geda-gattrib.m4 b/m4/geda-gattrib.m4
index 4f035ed..c9b08d3 100644
--- a/m4/geda-gattrib.m4
+++ b/m4/geda-gattrib.m4
@@ -16,7 +16,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Check if gattrib should be disabled
 AC_DEFUN([AX_OPTION_GATTRIB],
diff --git a/m4/geda-gcc-flags.m4 b/m4/geda-gcc-flags.m4
index 6884533..76ad5aa 100644
--- a/m4/geda-gcc-flags.m4
+++ b/m4/geda-gcc-flags.m4
@@ -16,7 +16,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Adds the argument to GCC_CFLAGS if the compiler is GCC.
 AC_DEFUN([AX_GCC_FLAGS],
diff --git a/m4/geda-git-version.m4 b/m4/geda-git-version.m4
index ad16213..bdf3a1e 100644
--- a/m4/geda-git-version.m4
+++ b/m4/geda-git-version.m4
@@ -16,7 +16,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 # AX_GIT_VERSION DATE-VERSION
 # Check for a git repository. If present, sanity check the latest tag
diff --git a/m4/geda-git.m4 b/m4/geda-git.m4
index 3d4e1af..4b04349 100644
--- a/m4/geda-git.m4
+++ b/m4/geda-git.m4
@@ -16,7 +16,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Check if git is available, and which git to use.
 AC_DEFUN([AX_PROG_GIT],
diff --git a/m4/geda-groff.m4 b/m4/geda-groff.m4
index a0c7881..f2bed22 100644
--- a/m4/geda-groff.m4
+++ b/m4/geda-groff.m4
@@ -16,7 +16,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 AC_DEFUN([AX_PROG_GROFF],
 [
diff --git a/m4/geda-guile.m4 b/m4/geda-guile.m4
index 96abf18..1bc4b11 100644
--- a/m4/geda-guile.m4
+++ b/m4/geda-guile.m4
@@ -16,7 +16,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 AC_DEFUN([AX_CHECK_GUILE],
 [
diff --git a/m4/geda-libgeda.m4 b/m4/geda-libgeda.m4
index 45846ca..c373baf 100644
--- a/m4/geda-libgeda.m4
+++ b/m4/geda-libgeda.m4
@@ -16,7 +16,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Work out the gettext domain that libgeda should use
 AC_DEFUN([AX_LIBGEDA],
diff --git a/m4/geda-stroke.m4 b/m4/geda-stroke.m4
index cadaffa..90b9dd1 100644
--- a/m4/geda-stroke.m4
+++ b/m4/geda-stroke.m4
@@ -16,7 +16,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Check whether we should use libstroke, and if so if libraries are
 # available.
diff --git a/m4/geda-windows.m4 b/m4/geda-windows.m4
index 1e9b45f..4658d3c 100644
--- a/m4/geda-windows.m4
+++ b/m4/geda-windows.m4
@@ -16,7 +16,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 # The Windows platform has a native gcc port (MinGW) and a
 # POSIX compliant one (Cygwin). Both need specific flags to
diff --git a/m4/pcb-data-dirs.m4 b/m4/pcb-data-dirs.m4
index 49faf17..ac7aa44 100644
--- a/m4/pcb-data-dirs.m4
+++ b/m4/pcb-data-dirs.m4
@@ -16,7 +16,7 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Check where to look for PCB footprints.
 # FIXME All of this should be done at runtime.
diff --git a/utils/gschlas/globals.c b/utils/gschlas/globals.c
index c823e20..0b65381 100644
--- a/utils/gschlas/globals.c
+++ b/utils/gschlas/globals.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/utils/gschlas/i_vars.c b/utils/gschlas/i_vars.c
index 9c0ae37..9b6a1dd 100644
--- a/utils/gschlas/i_vars.c
+++ b/utils/gschlas/i_vars.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/utils/gschlas/parsecmd.c b/utils/gschlas/parsecmd.c
index 2163e59..f65730e 100644
--- a/utils/gschlas/parsecmd.c
+++ b/utils/gschlas/parsecmd.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <config.h>
diff --git a/utils/include/globals.h b/utils/include/globals.h
index 414538d..568369b 100644
--- a/utils/include/globals.h
+++ b/utils/include/globals.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 extern char *rc_filename;
diff --git a/utils/include/i_vars.h b/utils/include/i_vars.h
index 39bb53b..79eddd0 100644
--- a/utils/include/i_vars.h
+++ b/utils/include/i_vars.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 extern int default_force_boundingbox;
diff --git a/utils/include/papersizes.h b/utils/include/papersizes.h
index f55b644..e8e1c05 100644
--- a/utils/include/papersizes.h
+++ b/utils/include/papersizes.h
@@ -4,7 +4,7 @@
  *
  * You should have received a copy of the GNU General Public License 
  * along with this program; if not, write to the * Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /* this file is no longer used */
diff --git a/utils/scripts/garchive.py b/utils/scripts/garchive.py
index 58446a3..7306fa1 100644
--- a/utils/scripts/garchive.py
+++ b/utils/scripts/garchive.py
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #-------------------------------------------------------------------
 
 """
diff --git a/utils/scripts/gschupdate b/utils/scripts/gschupdate
index 18bf40b..d791c0a 100755
--- a/utils/scripts/gschupdate
+++ b/utils/scripts/gschupdate
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
 #
diff --git a/utils/scripts/gsymupdate b/utils/scripts/gsymupdate
index 63c4691..163835a 100755
--- a/utils/scripts/gsymupdate
+++ b/utils/scripts/gsymupdate
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
 #
diff --git a/utils/src/convert_sym.c b/utils/src/convert_sym.c
index fa61810..eacb830 100644
--- a/utils/src/convert_sym.c
+++ b/utils/src/convert_sym.c
@@ -31,7 +31,7 @@
  *   
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  * 	$Id$	 
  */
diff --git a/utils/src/geda_sym_format.h b/utils/src/geda_sym_format.h
index 135ec16..0221eff 100644
--- a/utils/src/geda_sym_format.h
+++ b/utils/src/geda_sym_format.h
@@ -16,7 +16,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
     or
     visit the URL http://www.fsf.org/
 
diff --git a/utils/src/grenum.c b/utils/src/grenum.c
index 086aef2..2b7ef87 100644
--- a/utils/src/grenum.c
+++ b/utils/src/grenum.c
@@ -15,7 +15,7 @@
  *
  *	You should have received a copy of the GNU General Public License
  *	along with this program; if not, write to the Free Software
- *	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  * Levente.Kovacs@xxxxxxxxxxxx
  *
diff --git a/utils/src/gsch2pcb.c b/utils/src/gsch2pcb.c
index 4d3a825..1d48899 100644
--- a/utils/src/gsch2pcb.c
+++ b/utils/src/gsch2pcb.c
@@ -16,7 +16,7 @@
 |  COPYRIGHT file in the top level directory of this distribution.
 | 
 |  To get a copy of the GNU General Puplic License, write to the Free Software
-|  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+|  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
 
diff --git a/utils/src/olib.l b/utils/src/olib.l
index 9a24376..22d669e 100644
--- a/utils/src/olib.l
+++ b/utils/src/olib.l
@@ -16,7 +16,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
     or
     visit the URL http://www.fsf.org/
 
diff --git a/utils/src/smash_megafile.c b/utils/src/smash_megafile.c
index d2910bd..385476d 100644
--- a/utils/src/smash_megafile.c
+++ b/utils/src/smash_megafile.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  *  $Id$
  *

commit 47390a485d7c44d8fde27a879f494e4dd90a92c6
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Update NEWS for 1.6.2.

diff --git a/NEWS b/NEWS
index 5acfd81..8b7f9c9 100644
--- a/NEWS
+++ b/NEWS
@@ -2,11 +2,25 @@
  'gschem and Friends' Electronic Design Suite
 ==============================================
 
-Copyright (C) 1998-2010 gEDA Developers
+Copyright (C) 1998-2011 gEDA Developers
 
 This file documents important user-visible changes in gEDA/gaf.  For
 more information, please consult the `ChangeLog' file.
 
+Notable changes in gEDA/gaf 1.6.2
+=================================
+
+ * PNG export from `gschem' will now be cropped correctly.
+
+ * The `partlist' backends for `gnetlist' now handle hierarchical
+   refdes correctly.
+
+ * On Windows, `gschem' and `gattrib' will no longer launch with a
+   command window visible.
+
+Several other bugs were fixed, including a major crash bug in
+gnetlist.
+
 Notable changes in gEDA/gaf 1.6.1
 =================================
 

commit beba4a7399109038329be6c40a9516244cda30c5
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Update README to reflect move from SF.net to Launchpad for bugs.
    
    Cherry picked from commit e045f84435ed3e07d7a54a41015bf145335c5094.

diff --git a/README b/README
index 7112ba4..2af142d 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
  'gschem and Friends' Electronic Design Suite
 ==============================================
 
-Copyright (C) 1998-2009 gEDA Developers
+Copyright (C) 1998-2011 gEDA Developers
 
 Introduction
 ============
@@ -197,9 +197,12 @@ There are several ways to get help with installing and using gEDA:
    `geda-user' mailing list.
    <http://www.gpleda.org/mailinglists.html>
 
+ - Alternatively, you can add your question to the gEDA Answers page
+   on Launchpad. <https://answers.launchpad.net/geda>
+
  - If you have discovered a bug, have a feature request, or have
-   written a patch to gEDA, please create an item on the gEDA issue
-   tracker.  <http://sourceforge.net/tracker/?group_id=161080>
+   written a patch to gEDA, please create an item on the gEDA Bugs
+   page on Launchpad. <http://bugs.launchpad.net/geda>
 
 License
 =======
@@ -210,7 +213,7 @@ the `COPYING' file for the full text of the license.
 
 The programs and associated files are:
 
-  Copyright (C) 1998-2009 by Ales Hvezda and the respective original
+  Copyright (C) 1998-2011 by Ales Hvezda and the respective original
   authors.
 
 See the `AUTHORS' file for a more extensive list of contributors to

commit e75242de61fd66316694936c3b547d15b93affdd
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    build-sys: Check for pdflatex if doxygen is enabled. [3108442]
    (cherry picked from commit e045f84435ed3e07d7a54a41015bf145335c5094)

diff --git a/m4/geda-doxygen.m4 b/m4/geda-doxygen.m4
index 9e4a1d4..034341d 100644
--- a/m4/geda-doxygen.m4
+++ b/m4/geda-doxygen.m4
@@ -1,8 +1,8 @@
 # geda-doxygen.m4                                       -*-Autoconf-*-
-# serial 1.0
+# serial 2
 
 dnl Optional Doxygen API documentation support
-dnl Copyright (C) 2009  Peter Brett <peter@xxxxxxxxxxxxx>
+dnl Copyright (C) 2009-2011  Peter Brett <peter@xxxxxxxxxxxxx>
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -52,6 +52,14 @@ neither Inkscape nor ImageMagick were found. Ensure one of these is
 installed and in your path, or configure without --enable-doxygen.])
     fi
 
+    # We need pdflatex to create PDF format API docs.
+    AC_CHECK_PROG([PDFLATEX], [pdflatex], [pdflatex], [no])
+    if test "X$PDFLATEX" = "Xno"; then
+      AC_MSG_ERROR([API documentation generation was requested, but pdflatex was not
+found.  Ensure it is installed and in your path, or configure without
+--enable-doxygen.])
+    fi
+
   else
     AC_MSG_RESULT([no])
   fi

commit 9ae03d499783cbbc42dfd5180d0abfa88b8ed8f0
Author: Wojciech Kazubski <wk0@xxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gschem: Don't crop the png output [3100660] [3100680]
    
    Gschem sometimes crops the image exported to bitmap file (png,
    bmp... but not eps). This appears in certain range of picture
    proportions, landscape but close to square.
    
    This patch alters the algorithm that adjusts the image proportions to
    remove this problem.

diff --git a/gschem/src/x_image.c b/gschem/src/x_image.c
index d2153ca..aa7b845 100644
--- a/gschem/src/x_image.c
+++ b/gschem/src/x_image.c
@@ -349,7 +349,7 @@ void x_image_lowlevel(GSCHEM_TOPLEVEL *w_current, const char* filename,
 
   /* Preserve proportions */
   prop = (float)width / height;
-  if(page_width > page_height) {
+  if (((float)page_width / page_height) > prop) {
     page_height = (page_width / prop);
   }else{
     page_width = (page_height * prop);

commit 8d708818425dea37690d739a5e9eaf26eb9cf46c
Author: Patrick Bernaud <patrickb@xxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: Check attribute string before requesting name/value [3032626]

diff --git a/libgeda/src/g_smob.c b/libgeda/src/g_smob.c
index f3bff22..58ca68e 100644
--- a/libgeda/src/g_smob.c
+++ b/libgeda/src/g_smob.c
@@ -128,8 +128,8 @@ SCM g_get_attrib_name_value(SCM attrib_smob)
   attribute = (struct st_attrib_smob *)SCM_CDR(attrib_smob);
 
   if (attribute != NULL &&
-      attribute->attribute != NULL) {
-    o_attrib_get_name_value (attribute->attribute, &name, &value );
+      attribute->attribute != NULL &&
+      o_attrib_get_name_value (attribute->attribute, &name, &value)) {
     returned = scm_cons (scm_makfrom0str (name),
                          scm_makfrom0str (value));
     g_free(name);
@@ -576,8 +576,8 @@ SCM g_get_attrib_value_by_attrib_name(SCM object_smob, SCM scm_attrib_name)
     a_iter = object->object->attribs;
     while (a_iter != NULL) {
       a_current = a_iter->data;
-      if (a_current != NULL) {
-        o_attrib_get_name_value (a_current, &name, &value );
+      if (a_current != NULL &&
+          o_attrib_get_name_value (a_current, &name, &value)) {
         if (strcmp(name, attrib_name) == 0)
           returned = scm_cons (scm_makfrom0str (value), returned);
         g_free (name);

commit 91e46719dcf1722db86c527eebd3f32b696ce06b
Author: أحÙ?د اÙ?Ù?Ø­Ù?Ù?دÙ? (Ahmed El-Mahmoudy) <aelmahmoudy@xxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: Fix bashism in sch2eaglepos.sh [2999951]
    
    Note that even with #!/bin/bash the original code gave the error that 3 is an
    invalid file descriptor.

diff --git a/gnetlist/scripts/sch2eaglepos.sh b/gnetlist/scripts/sch2eaglepos.sh
index df835eb..5f098a7 100755
--- a/gnetlist/scripts/sch2eaglepos.sh
+++ b/gnetlist/scripts/sch2eaglepos.sh
@@ -43,16 +43,16 @@ fi
 tmpf=${tmpdir}/tmpf
 grep -B1 refdes= "$FNAME" |sed 's/=/ /' | cut -d" " -f2,3 |grep -v '^--' >${tmpf}
 
-3<$tmpf
-while read -u 3; do
+
+while read; do
     # the directory on the client to backup
     X=`echo $REPLY | cut -d' ' -f1`
     Y=`echo $REPLY | cut -d' ' -f2`
-    read -u 3;
+    read;
     PART="$REPLY"
     X=`echo "scale=5; ($X - $XOFFSET) / $XSCALE" |bc`
     Y=`echo "scale=5; ($Y - $YOFFSET) / $YSCALE" |bc`
     echo "MOVE '$PART' ($X $Y);"
-done
+done < $tmpf
 rm -fr "${tmpdir}"
 

commit dd6edbc063472ab92f77bac39d9da38536c45274
Author: أحÙ?د اÙ?Ù?Ø­Ù?Ù?دÙ? (Ahmed El-Mahmoudy) <aelmahmoudy@xxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    utils: Don't use string exceptions in Python code. [3014181]
    
    utils/scripts/garchive.py uses string exceptions which have been deprecated in
    Python 2.5, and has been removed in Python 2.6. The attached patch fixes this
    issue.

diff --git a/utils/scripts/garchive.py b/utils/scripts/garchive.py
index 15d97e5..58446a3 100644
--- a/utils/scripts/garchive.py
+++ b/utils/scripts/garchive.py
@@ -275,15 +275,15 @@ class CmdLineArgs:
 
             if Option == '-a':
                 if self.ProgramMode == "extract":          # sanity check
-                    raise "Incompatible command line args"
+                    raise SyntaxError("Incompatible command line args")
 
             if Option == '-e':
                 if self.ProgramMode == "archive":          # sanity check
-                    raise "Incompatible command line args"
+                    raise SyntaxError("Incompatible command line args")
 
             if Option == '-f':
                 if self.ProgramMode == "extract":          # sanity check
-                    raise "Incompatible command line args"
+                    raise SyntaxError("Incompatible command line args")
                 try:
                     os.stat(Value)
                 except OSError:
@@ -294,7 +294,7 @@ class CmdLineArgs:
 
             if Option == '-o':
                 if self.ProgramMode == "extract":          # sanity check
-                    raise "incompatible command line args"
+                    raise SyntaxError("Incompatible command line args")
                 if CheckFilename(Value):
                     self.OutputFileName = Value            #strcopy?
                 else:
@@ -904,7 +904,7 @@ elif Args.ProgramMode == "extract":
     Extract(Args)
     sys.exit(0)
 else:
-    raise "Unknown program mode found."
+    raise RuntimeError("Unknown program mode found.")
 
 #  That's it -- very simple!!
 

commit b31c5728f430bd5e223b557cca9eeace74a563f1
Author: Richard Barlow <richardbarlow@xxxxxxxxxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: Handle hierarchy refdes correctly in partslist*. [3044478]
    
    When producing a part list with the partslist[1-3] backend the refdes
    values output to the file do not contain the prepended refdeses of the
    parent component.
    
    E.g.
    
    Master schematic with symbol 'S1' (representing sub-schematic) and a
    resistor 'R1' Sub-schematic containing resistor 'R1'
    
    The geda backend produces a netlist containing two resistors 'R1' and
    'S1/R1', they're unique and everything is fine and dandy.  The
    partslist[1-3] backends contain two components with the refdes 'R1'
    which then causes problems when processing this file further.
    
    This is caused by the partslist[1-3] backends adding the value of the
    refdes attribute to the file rather than the value returned by the
    'packages' function.
    
    The supplied patch alters the backends to use the value from the
    packages function directly, rather than looking up the refdes
    attribute of the component.

diff --git a/gnetlist/scheme/gnet-partslist-common.scm b/gnetlist/scheme/gnet-partslist-common.scm
index 943b28e..eac539e 100644
--- a/gnetlist/scheme/gnet-partslist-common.scm
+++ b/gnetlist/scheme/gnet-partslist-common.scm
@@ -21,7 +21,7 @@
       (let ((package (car packages)))
 	(if (string=? (get-device package) "include")
 	    (get-parts-table (cdr packages))
-	    (cons (list (gnetlist:get-package-attribute package "refdes")
+	    (cons (list package
 			(get-device package)
 			(get-value package)  
 			(gnetlist:get-package-attribute package "footprint")) ;; sdb change

commit 2dc5ea4877955e55d57e59de3e2eaa0098171037
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Use @builddir@ instead of $(builddir) because versions of automake
    before 1.10 didn't define it.  Should fix build problems noted by
    Stuart Brorson and John Griessen.

diff --git a/gnetlist/scheme/Makefile.am b/gnetlist/scheme/Makefile.am
index efc8682..dcbc582 100644
--- a/gnetlist/scheme/Makefile.am
+++ b/gnetlist/scheme/Makefile.am
@@ -37,17 +37,17 @@ gnet-gsch2pcb.scm: $(srcdir)/gnet-gsch2pcb.scm.in
 		$(srcdir)/gnet-gsch2pcb.scm.in > $@
 
 all-local:
-	if test "$(srcdir)" != "$(builddir)" ; then \
+	if test "$(srcdir)" != "@builddir@" ; then \
 		echo "copying scheme files" ; \
-		cp -f $(srcdir)/*.scm $(builddir) ; \
+		cp -f $(srcdir)/*.scm @builddir@/ ; \
 	else \
 		echo "source directory = build directory" ; \
 	fi
 
 clean-local:
-	if test "$(srcdir)" != "$(builddir)" ; then \
+	if test "$(srcdir)" != "@builddir@" ; then \
 		echo "cleaning scheme files" ; \
-		rm -f $(builddir)/*.scm ; \
+		rm -f @builddir@/*.scm ; \
 	else \
 		echo "source directory = build directory" ; \
 	fi

commit 0a3f632252785b4f1f1678686722bc1257d2a540
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    build-sys: Build desktop-i18n locale data correctly with DESTDIR set.
    
    When doing an out-of-tree build with DESTDIR set, desktop-i18n's
    temporary locale data tree was getting put in the wrong place.  Fix
    this by clearing DESTDIR and forcing prefix and localedir to the
    correct values.
    
    Fix suggested & tested by: Dan McMahill <dan@xxxxxxxxxxxx>
    Bug reported & fix tested by: Charles Lepple <clepple@xxxxxxxxx>

diff --git a/build-tools/desktop-i18n b/build-tools/desktop-i18n
index e3c44d4..113c44b 100755
--- a/build-tools/desktop-i18n
+++ b/build-tools/desktop-i18n
@@ -1,7 +1,8 @@
 #!/bin/sh
 #                                                   -*-Shell-script-*-
 # Helper script for translating desktop integration data
-# Copyright (C) 2009  Peter Brett <peter@xxxxxxxxxxxxx>
+# Copyright (C) 2009-2010  Peter Brett <peter@xxxxxxxxxxxxx>
+# Copyright (C) 2010       Dan McMahill <dan@xxxxxxxxxxxx>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -483,7 +484,8 @@ EOF
 # DESKTOP_I18N_RULES  (Do not edit or remove this line)
 #####################################################################
 # Makefile rules needed by the desktop-i18n tool.
-# Copyright (C) 2009  Peter Brett <peter@xxxxxxxxxxxxx>
+# Copyright (C) 2009-2010  Peter Brett <peter@xxxxxxxxxxxxx>
+# Copyright (C) 2010       Dan McMahill <dan@xxxxxxxxxxxx>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -511,7 +513,10 @@ DESKTOP_I18N_LOCALE_DIR = @DESKTOP_I18N_LOCALE_DIR@
 all: stamp-i18n
 stamp-i18n: \$(DESKTOP_I18N_LOCALE_DIR) stamp-po Makefile
 	@echo timestamp > stamp-i18nT && mv stamp-i18nT stamp-i18n
-	\$(MAKE) prefix=\$(DESKTOP_I18N_LOCALE_DIR) install && \
+	\$(MAKE) \
+	  prefix=\$(DESKTOP_I18N_LOCALE_DIR) \
+	  localedir=\$(DESKTOP_I18N_LOCALE_DIR)/share/locale \
+	  DESTDIR= install && \
 	cp \$(srcdir)/LINGUAS \$(DESKTOP_I18N_LOCALE_DIR)/\$(DOMAIN).LINGUAS \
 	|| rm stamp-i18n
 	@echo timestamp > stamp-i18nT && mv stamp-i18nT stamp-i18n

commit bafbcd605c7beaacfdaf9a46801553be5b0c97ad
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gschem: Exit any current event state before switching pages
    
    If we don't do this, state from an operation on one page can cause
    corruption and genereral chaos. This was reproducable by moving
    some objects (em), then switching pages with a key-binding.

diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index 8ab13e8..5488bf4 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -799,6 +799,8 @@ x_window_set_current_page (GSCHEM_TOPLEVEL *w_current, PAGE *page)
   g_return_if_fail (toplevel != NULL);
   g_return_if_fail (page != NULL);
 
+  o_redraw_cleanstates (w_current);
+
   s_page_goto (toplevel, page);
 
   i_update_menus (w_current);

commit 4491d031d5f02a43ec72443a3be6668c9cdc58b6
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Fix hiding the command prompt window on Win32 builds with -mwindows
    
    There was a mistake in gschem and gattrib's Makefile.am, where it
    included the non-existant MINGW_GUI_CFLAGS rather than pulling in
    MINGW_GUI_LDFLAGS where the required -mwindows was set.
    
    Cherry-picked from: e5f32954a1fb23534309d6fa06d887859afbc664
    and subsequent fix: 66e54fd03f75f70d9fcf101d6ed3cad1bb354b13

diff --git a/gattrib/src/Makefile.am b/gattrib/src/Makefile.am
index 623b639..275571c 100644
--- a/gattrib/src/Makefile.am
+++ b/gattrib/src/Makefile.am
@@ -34,10 +34,10 @@ gattrib_SOURCES = \
 gattrib_CPPFLAGS = -I$(top_srcdir)/libgeda/include \
 	-I$(srcdir)/../include -I$(top_srcdir) -I$(includedir)
 gattrib_CFLAGS = $(GCC_CFLAGS) $(GLIB_CFLAGS) \
-	$(MINGW_CFLAGS) $(MINGW_GUI_CFLAGS) \
+	$(MINGW_CFLAGS) \
 	$(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(GUILE_CFLAGS)
 gattrib_LDFLAGS = $(GLIB_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) \
-	$(GUILE_LIBS)
+	$(GUILE_LIBS) $(MINGW_GUI_LDFLAGS)
 gattrib_LDADD = $(top_builddir)/libgeda/src/libgeda.la
 
 MOSTLYCLEANFILES = *.log *.ps core FILE *~ #*# 
diff --git a/gschem/src/Makefile.am b/gschem/src/Makefile.am
index 2cd0d90..d3d6681 100644
--- a/gschem/src/Makefile.am
+++ b/gschem/src/Makefile.am
@@ -70,10 +70,10 @@ gschem_SOURCES = \
 gschem_CPPFLAGS = -I$(top_srcdir)/libgeda/include  -I$(srcdir)/../include \
 	-I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/intl
 gschem_CFLAGS = $(GCC_CFLAGS) $(LIBSTROKE_CFLAGS) \
-	$(MINGW_CFLAGS) $(MINGW_GUI_CFLAGS) \
+	$(MINGW_CFLAGS) \
 	$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(GUILE_CFLAGS)
 gschem_LDFLAGS = $(LIBSTROKE_LDFLAGS) $(GLIB_LIBS) $(GTK_LIBS) \
-	$(GTHREAD_LIBS) $(GUILE_LIBS)
+	$(GTHREAD_LIBS) $(GUILE_LIBS) $(MINGW_GUI_LDFLAGS)
 gschem_LDADD = $(top_builddir)/libgeda/src/libgeda.la @LIBINTL@
 
 localedir = @datadir@/locale



_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs