From 9ebfc492936b30b4095ae458278e63c51caf3f67 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sat, 26 Sep 2009 22:52:01 -0400 Subject: [PATCH] Reorganized glabels_2_2 branch so that it is the top-level glabels directory, instead of having a glabels2 subdirectory. --- glabels2/AUTHORS => AUTHORS | 0 glabels2/COPYING => COPYING | 0 glabels2/COPYING-DOCS => COPYING-DOCS | 0 glabels2/COPYING-LIBGLABELS => COPYING-LIBGLABELS | 0 .../COPYING.README_FIRST => COPYING.README_FIRST | 0 glabels2/ChangeLog => ChangeLog | 0 glabels2/INSTALL => INSTALL | 0 glabels2/Makefile.am => Makefile.am | 0 glabels2/NEWS => NEWS | 0 glabels2/README => README | 0 glabels2/TODO => TODO | 0 glabels2/autogen.sh => autogen.sh | 0 {glabels2/barcode-0.98 => barcode-0.98}/COPYING | 0 {glabels2/barcode-0.98 => barcode-0.98}/ChangeLog | 0 {glabels2/barcode-0.98 => barcode-0.98}/INSTALL | 0 {glabels2/barcode-0.98 => barcode-0.98}/Makefile.am | 0 .../barcode-0.98 => barcode-0.98}/Makefile.in.dist | 0 {glabels2/barcode-0.98 => barcode-0.98}/README | 0 .../barcode-0.98 => barcode-0.98}/README.glabels | 0 {glabels2/barcode-0.98 => barcode-0.98}/TODO | 0 {glabels2/barcode-0.98 => barcode-0.98}/barcode.h | 0 .../barcode-0.98 => barcode-0.98}/barcode.spec | 0 .../bookland/bookland.py | 0 {glabels2/barcode-0.98 => barcode-0.98}/cmdline.c | 0 {glabels2/barcode-0.98 => barcode-0.98}/cmdline.h | 0 {glabels2/barcode-0.98 => barcode-0.98}/codabar.c | 0 {glabels2/barcode-0.98 => barcode-0.98}/code128.c | 0 {glabels2/barcode-0.98 => barcode-0.98}/code39.c | 0 {glabels2/barcode-0.98 => barcode-0.98}/code93.c | 0 .../barcode-0.98 => barcode-0.98}/compat/getopt.c | 0 .../barcode-0.98 => barcode-0.98}/compat/getopt.h | 0 {glabels2/barcode-0.98 => barcode-0.98}/configure | 0 .../barcode-0.98 => barcode-0.98}/configure.in.dist | 0 .../contrib/barcode-SVG.tar.gz | Bin .../contrib/barcode-SVG.tar.gz.README | 0 .../contrib/barcode-for-delphi.tar.gz | Bin .../contrib/barcode-for-delphi.tar.gz.README | 0 .../contrib/barcodeps-0.1.tgz | Bin .../contrib/barcodeps-0.1.tgz.README | 0 .../contrib/grab-0.0.4.tar.gz | Bin .../contrib/grab-0.0.4.tar.gz.README | 0 .../debian/README.debian | 0 .../barcode-0.98 => barcode-0.98}/debian/changelog | 0 .../barcode-0.98 => barcode-0.98}/debian/control | 0 .../barcode-0.98 => barcode-0.98}/debian/copyright | 0 {glabels2/barcode-0.98 => barcode-0.98}/debian/dirs | 0 {glabels2/barcode-0.98 => barcode-0.98}/debian/info | 0 .../barcode-0.98 => barcode-0.98}/debian/rules | 0 .../barcode-0.98 => barcode-0.98}/doc/Makefile.in | 0 {glabels2/barcode-0.98 => barcode-0.98}/doc/README | 0 .../barcode-0.98 => barcode-0.98}/doc/barcode.info | 0 .../barcode-0.98 => barcode-0.98}/doc/barcode.pdf | Bin .../barcode-0.98 => barcode-0.98}/doc/barcode.ps | 0 .../doc/barcodedoc.txt | 0 .../barcode-0.98 => barcode-0.98}/doc/doc.barcode | 0 .../barcode-0.98 => barcode-0.98}/doc/infofilter | 0 .../barcode-0.98 => barcode-0.98}/doc/manpager | 0 {glabels2/barcode-0.98 => barcode-0.98}/doc/mktxt | 0 .../barcode-0.98 => barcode-0.98}/doc/texi2html | 0 {glabels2/barcode-0.98 => barcode-0.98}/ean.c | 0 {glabels2/barcode-0.98 => barcode-0.98}/i25.c | 0 {glabels2/barcode-0.98 => barcode-0.98}/install-sh | 0 {glabels2/barcode-0.98 => barcode-0.98}/library.c | 0 {glabels2/barcode-0.98 => barcode-0.98}/main.c | 0 {glabels2/barcode-0.98 => barcode-0.98}/missing | 0 .../barcode-0.98 => barcode-0.98}/mkinstalldirs | 0 {glabels2/barcode-0.98 => barcode-0.98}/msi.c | 0 {glabels2/barcode-0.98 => barcode-0.98}/pcl.c | 0 {glabels2/barcode-0.98 => barcode-0.98}/plessey.c | 0 {glabels2/barcode-0.98 => barcode-0.98}/ps.c | 0 {glabels2/barcode-0.98 => barcode-0.98}/sample.c | 0 glabels2/configure.in => configure.in | 0 {glabels2/data => data}/Makefile.am | 0 {glabels2/data => data}/desktop/Makefile.am | 0 {glabels2/data => data}/desktop/glabels.desktop.in | 0 {glabels2/data => data}/dtd/Makefile.am | 0 {glabels2/data => data}/dtd/glabels-2.2.dtd | 0 {glabels2/data => data}/glade/Makefile.am | 0 .../glade/merge-properties-dialog.glade | 0 .../data => data}/glade/new-label-dialog.glade | 0 {glabels2/data => data}/glade/object-editor.glade | 0 {glabels2/data => data}/glade/prefs-dialog.glade | 0 .../data => data}/glade/print-custom-widget.glade | 0 {glabels2/data => data}/glade/property-bar.glade | 0 .../data => data}/glade/template-designer.glade | 0 .../data => data}/glade/wdgt-media-select.glade | 0 .../data => data}/glade/wdgt-rotate-label.glade | 0 {glabels2/data => data}/man/Makefile.am | 0 {glabels2/data => data}/man/glabels.1 | 0 {glabels2/data => data}/mime/Makefile.am | 0 {glabels2/data => data}/mime/glabels.applications | 0 {glabels2/data => data}/mime/glabels.keys.in | 0 {glabels2/data => data}/mime/glabels.mime | 0 {glabels2/data => data}/mime/glabels.xml.in | 0 {glabels2/data => data}/pixmaps/Makefile.am | 0 {glabels2/data => data}/pixmaps/ex-1layout.png | Bin {glabels2/data => data}/pixmaps/ex-2layouts.png | Bin {glabels2/data => data}/pixmaps/ex-cd-size.png | Bin {glabels2/data => data}/pixmaps/ex-rect-size.png | Bin {glabels2/data => data}/pixmaps/ex-round-size.png | Bin .../data => data}/pixmaps/glabels-about-logo.png | Bin .../pixmaps/glabels-application-x-glabels.png | Bin {glabels2/data => data}/pixmaps/glabels-splash.png | Bin {glabels2/data => data}/pixmaps/glabels.png | Bin {glabels2/data => data}/templates/Makefile.am | 0 .../data => data}/templates/avery-iso-templates.xml | 0 .../templates/avery-other-templates.xml | 0 .../data => data}/templates/avery-us-templates.xml | 0 .../templates/brother-other-templates.xml | 0 {glabels2/data => data}/templates/categories.xml | 0 .../templates/dymo-other-templates.xml | 0 .../data => data}/templates/misc-iso-templates.xml | 0 .../templates/misc-other-templates.xml | 0 .../data => data}/templates/misc-us-templates.xml | 0 {glabels2/data => data}/templates/paper-sizes.xml | 0 .../templates/zweckform-iso-templates.xml | 0 {glabels2/docs => docs}/Makefile.am | 0 {glabels2/docs => docs}/libglabels/Makefile.am | 0 .../libglabels/libglabels-decl-list.txt | 0 .../docs => docs}/libglabels/libglabels-docs.sgml | 0 .../libglabels/libglabels-overrides.txt | 0 .../libglabels/libglabels-sections.txt | 0 .../libglabels/libglabels-undocumented.txt | 0 {glabels2/docs => docs}/libglabels/libglabels.types | 0 .../docs => docs}/libglabels/tmpl/category.sgml | 0 {glabels2/docs => docs}/libglabels/tmpl/db.sgml | 0 {glabels2/docs => docs}/libglabels/tmpl/enums.sgml | 0 .../libglabels/tmpl/libglabels-unused.sgml | 0 .../docs => docs}/libglabels/tmpl/libglabels.sgml | 0 {glabels2/docs => docs}/libglabels/tmpl/paper.sgml | 0 {glabels2/docs => docs}/libglabels/tmpl/str.sgml | 0 .../docs => docs}/libglabels/tmpl/template.sgml | 0 .../docs => docs}/libglabels/tmpl/xml-category.sgml | 0 .../docs => docs}/libglabels/tmpl/xml-paper.sgml | 0 .../docs => docs}/libglabels/tmpl/xml-template.sgml | 0 {glabels2/docs => docs}/libglabels/tmpl/xml.sgml | 0 glabels2/glabels.spec.in => glabels.spec.in | 0 glabels2/gtk-doc.make => gtk-doc.make | 0 {glabels2/help => help}/C/Makefile.am | 0 .../help => help}/C/figures/glabels-template-cd.png | Bin .../C/figures/glabels-template-label.png | Bin .../C/figures/glabels-template-layout.png | Bin .../help => help}/C/figures/main-window-empty.png | Bin {glabels2/help => help}/C/figures/merge-ex1-1.png | Bin {glabels2/help => help}/C/figures/merge-ex1-2.png | Bin {glabels2/help => help}/C/figures/merge-ex1-3.png | Bin {glabels2/help => help}/C/figures/merge-ex1-4.png | Bin {glabels2/help => help}/C/figures/merge-ex2-1.png | Bin {glabels2/help => help}/C/figures/merge-ex2-2.png | Bin {glabels2/help => help}/C/figures/merge-ex2-3.png | Bin {glabels2/help => help}/C/figures/merge-ex2-4.png | Bin .../C/figures/object-editor-sidebar.png | Bin {glabels2/help => help}/C/figures/print-copies.png | Bin {glabels2/help => help}/C/figures/print-merge.png | Bin {glabels2/help => help}/C/glabels-C.omf | 0 {glabels2/help => help}/C/glabels.xml | 0 {glabels2/help => help}/C/legal.xml | 0 {glabels2/help => help}/Makefile.am | 0 {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/BUGS | 0 .../iec16022-0.2.1 => iec16022-0.2.1}/CHANGELOG | 0 {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/CREDITS | 0 {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/INSTALL | 0 {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/LICENSE | 0 .../iec16022-0.2.1 => iec16022-0.2.1}/Makefile.am | 0 .../iec16022-0.2.1 => iec16022-0.2.1}/Makefile.dist | 0 {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/README | 0 .../README.glabels | 0 {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/TODO | 0 .../iec16022-0.2.1 => iec16022-0.2.1}/iec16022.1 | 0 .../iec16022-0.2.1 => iec16022-0.2.1}/iec16022.c | 0 .../iec16022ecc200.c | 0 .../iec16022ecc200.h | 0 {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/image.c | 0 {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/image.h | 0 .../iec16022-0.2.1 => iec16022-0.2.1}/reedsol.c | 0 .../iec16022-0.2.1 => iec16022-0.2.1}/reedsol.h | 0 .../test/testsuite-example.bin | 0 .../test/testsuite-example.eps | 0 .../test/testsuite-example.hex | 0 .../test/testsuite-example.png | Bin .../test/testsuite-example.text | 0 .../test/testsuite.sh | 0 {glabels2/libglabels => libglabels}/Makefile.am | 0 {glabels2/libglabels => libglabels}/category.c | 0 {glabels2/libglabels => libglabels}/category.h | 0 {glabels2/libglabels => libglabels}/db.c | 0 {glabels2/libglabels => libglabels}/db.h | 0 {glabels2/libglabels => libglabels}/enums.h | 0 .../libglabels => libglabels}/libglabels-private.h | 0 {glabels2/libglabels => libglabels}/libglabels.h | 0 .../libglabels => libglabels}/libglabels.pc.in | 0 {glabels2/libglabels => libglabels}/paper.c | 0 {glabels2/libglabels => libglabels}/paper.h | 0 {glabels2/libglabels => libglabels}/str.c | 0 {glabels2/libglabels => libglabels}/str.h | 0 {glabels2/libglabels => libglabels}/template.c | 0 {glabels2/libglabels => libglabels}/template.h | 0 {glabels2/libglabels => libglabels}/xml-category.c | 0 {glabels2/libglabels => libglabels}/xml-category.h | 0 {glabels2/libglabels => libglabels}/xml-paper.c | 0 {glabels2/libglabels => libglabels}/xml-paper.h | 0 {glabels2/libglabels => libglabels}/xml-template.c | 0 {glabels2/libglabels => libglabels}/xml-template.h | 0 {glabels2/libglabels => libglabels}/xml.c | 0 {glabels2/libglabels => libglabels}/xml.h | 0 {glabels2/po => po}/POTFILES.in | 0 {glabels2/po => po}/cs.po | 0 {glabels2/po => po}/de.po | 0 {glabels2/po => po}/eo.po | 0 {glabels2/po => po}/es.po | 0 {glabels2/po => po}/fr.po | 0 {glabels2/po => po}/it.po | 0 {glabels2/po => po}/ja.po | 0 {glabels2/po => po}/ko.po | 0 {glabels2/po => po}/pl.po | 0 {glabels2/po => po}/pt_BR.po | 0 {glabels2/po => po}/ru.po | 0 {glabels2/po => po}/zh_TW.Big5.po | 0 {glabels2/src => src}/Makefile.am | 0 {glabels2/src => src}/base64.c | 0 {glabels2/src => src}/base64.h | 0 {glabels2/src => src}/bc-gnubarcode.c | 0 {glabels2/src => src}/bc-gnubarcode.h | 0 {glabels2/src => src}/bc-iec16022.c | 0 {glabels2/src => src}/bc-iec16022.h | 0 {glabels2/src => src}/bc-postnet.c | 0 {glabels2/src => src}/bc-postnet.h | 0 {glabels2/src => src}/bc.c | 0 {glabels2/src => src}/bc.h | 0 {glabels2/src => src}/cairo-ellipse-path.c | 0 {glabels2/src => src}/cairo-ellipse-path.h | 0 {glabels2/src => src}/cairo-label-path.c | 0 {glabels2/src => src}/cairo-label-path.h | 0 {glabels2/src => src}/cairo-markup-path.c | 0 {glabels2/src => src}/cairo-markup-path.h | 0 {glabels2/src => src}/color.c | 0 {glabels2/src => src}/color.h | 0 {glabels2/src => src}/critical-error-handler.c | 0 {glabels2/src => src}/critical-error-handler.h | 0 {glabels2/src => src}/debug.c | 0 {glabels2/src => src}/debug.h | 0 {glabels2/src => src}/file.c | 0 {glabels2/src => src}/file.h | 0 {glabels2/src => src}/glabels-batch.c | 0 {glabels2/src => src}/glabels.c | 0 {glabels2/src => src}/hig.h | 0 {glabels2/src => src}/label-barcode.c | 0 {glabels2/src => src}/label-barcode.h | 0 {glabels2/src => src}/label-box.c | 0 {glabels2/src => src}/label-box.h | 0 {glabels2/src => src}/label-ellipse.c | 0 {glabels2/src => src}/label-ellipse.h | 0 {glabels2/src => src}/label-image.c | 0 {glabels2/src => src}/label-image.h | 0 {glabels2/src => src}/label-line.c | 0 {glabels2/src => src}/label-line.h | 0 {glabels2/src => src}/label-object.c | 0 {glabels2/src => src}/label-object.h | 0 {glabels2/src => src}/label-text.c | 0 {glabels2/src => src}/label-text.h | 0 {glabels2/src => src}/label.c | 0 {glabels2/src => src}/label.h | 0 {glabels2/src => src}/marshal.list | 0 {glabels2/src => src}/merge-evolution.c | 0 {glabels2/src => src}/merge-evolution.h | 0 {glabels2/src => src}/merge-init.c | 0 {glabels2/src => src}/merge-init.h | 0 {glabels2/src => src}/merge-properties-dialog.c | 0 {glabels2/src => src}/merge-properties-dialog.h | 0 {glabels2/src => src}/merge-text.c | 0 {glabels2/src => src}/merge-text.h | 0 {glabels2/src => src}/merge-vcard.c | 0 {glabels2/src => src}/merge-vcard.h | 0 {glabels2/src => src}/merge.c | 0 {glabels2/src => src}/merge.h | 0 {glabels2/src => src}/mini-preview-pixbuf-cache.c | 0 {glabels2/src => src}/mini-preview-pixbuf-cache.h | 0 {glabels2/src => src}/mini-preview-pixbuf.c | 0 {glabels2/src => src}/mini-preview-pixbuf.h | 0 {glabels2/src => src}/mygal/Makefile.am | 0 {glabels2/src => src}/mygal/color-group.c | 0 {glabels2/src => src}/mygal/color-group.h | 0 {glabels2/src => src}/mygal/color-palette.c | 0 {glabels2/src => src}/mygal/color-palette.h | 0 {glabels2/src => src}/mygal/e-colors.c | 0 {glabels2/src => src}/mygal/e-colors.h | 0 {glabels2/src => src}/mygal/e-marshal.list | 0 {glabels2/src => src}/mygal/e-util.h | 0 {glabels2/src => src}/mygal/mygal-combo-box.c | 0 {glabels2/src => src}/mygal/mygal-combo-box.h | 0 {glabels2/src => src}/mygal/widget-color-combo.c | 0 {glabels2/src => src}/mygal/widget-color-combo.h | 0 {glabels2/src => src}/new-label-dialog.c | 0 {glabels2/src => src}/new-label-dialog.h | 0 {glabels2/src => src}/object-editor-bc-page.c | 0 {glabels2/src => src}/object-editor-data-page.c | 0 {glabels2/src => src}/object-editor-edit-page.c | 0 {glabels2/src => src}/object-editor-fill-page.c | 0 {glabels2/src => src}/object-editor-image-page.c | 0 {glabels2/src => src}/object-editor-line-page.c | 0 {glabels2/src => src}/object-editor-lsize-page.c | 0 {glabels2/src => src}/object-editor-position-page.c | 0 {glabels2/src => src}/object-editor-private.h | 0 {glabels2/src => src}/object-editor-shadow-page.c | 0 {glabels2/src => src}/object-editor-size-page.c | 0 {glabels2/src => src}/object-editor-text-page.c | 0 {glabels2/src => src}/object-editor.c | 0 {glabels2/src => src}/object-editor.h | 0 {glabels2/src => src}/pixbuf-cache.c | 0 {glabels2/src => src}/pixbuf-cache.h | 0 {glabels2/src => src}/pixmaps/Makefile.am | 0 {glabels2/src => src}/pixmaps/checkerboard.xpm | 0 {glabels2/src => src}/pixmaps/collate.xpm | 0 {glabels2/src => src}/pixmaps/cursor_barcode.xbm | 0 .../src => src}/pixmaps/cursor_barcode_mask.xbm | 0 {glabels2/src => src}/pixmaps/cursor_box.xbm | 0 {glabels2/src => src}/pixmaps/cursor_box_mask.xbm | 0 {glabels2/src => src}/pixmaps/cursor_ellipse.xbm | 0 .../src => src}/pixmaps/cursor_ellipse_mask.xbm | 0 {glabels2/src => src}/pixmaps/cursor_image.xbm | 0 {glabels2/src => src}/pixmaps/cursor_image_mask.xbm | 0 {glabels2/src => src}/pixmaps/cursor_line.xbm | 0 {glabels2/src => src}/pixmaps/cursor_line_mask.xbm | 0 {glabels2/src => src}/pixmaps/cursor_text.xbm | 0 {glabels2/src => src}/pixmaps/cursor_text_mask.xbm | 0 {glabels2/src => src}/pixmaps/nocollate.xpm | 0 {glabels2/src => src}/prefs-dialog.c | 0 {glabels2/src => src}/prefs-dialog.h | 0 {glabels2/src => src}/prefs-model.c | 0 {glabels2/src => src}/prefs-model.h | 0 {glabels2/src => src}/prefs.c | 0 {glabels2/src => src}/prefs.h | 0 {glabels2/src => src}/print-op.c | 0 {glabels2/src => src}/print-op.h | 0 {glabels2/src => src}/print.c | 0 {glabels2/src => src}/print.h | 0 {glabels2/src => src}/recent.c | 0 {glabels2/src => src}/recent.h | 0 {glabels2/src => src}/stock-pixmaps/Makefile.am | 0 .../stock-pixmaps/stock_align_bottom_16.png | Bin .../stock-pixmaps/stock_align_hcenter_16.png | Bin .../stock-pixmaps/stock_align_left_16.png | Bin .../stock-pixmaps/stock_align_right_16.png | Bin .../stock-pixmaps/stock_align_top_16.png | Bin .../stock-pixmaps/stock_align_vcenter_16.png | Bin .../src => src}/stock-pixmaps/stock_arrow_16.png | Bin .../src => src}/stock-pixmaps/stock_arrow_24.png | Bin .../src => src}/stock-pixmaps/stock_barcode_16.png | Bin .../src => src}/stock-pixmaps/stock_barcode_24.png | Bin .../src => src}/stock-pixmaps/stock_box_16.png | Bin .../src => src}/stock-pixmaps/stock_box_24.png | Bin .../stock-pixmaps/stock_bucket_fill_16.png | Bin .../stock-pixmaps/stock_bucket_fill_24.png | Bin .../stock-pixmaps/stock_center_horiz_16.png | Bin .../stock-pixmaps/stock_center_vert_16.png | Bin .../src => src}/stock-pixmaps/stock_ellipse_16.png | Bin .../src => src}/stock-pixmaps/stock_ellipse_24.png | Bin .../stock-pixmaps/stock_flip_horiz_16.png | Bin .../stock-pixmaps/stock_flip_vert_16.png | Bin .../src => src}/stock-pixmaps/stock_hchain_24.png | Bin .../stock-pixmaps/stock_hchain_broken_24.png | Bin .../src => src}/stock-pixmaps/stock_image_16.png | Bin .../src => src}/stock-pixmaps/stock_image_24.png | Bin .../src => src}/stock-pixmaps/stock_line_16.png | Bin .../src => src}/stock-pixmaps/stock_line_24.png | Bin .../src => src}/stock-pixmaps/stock_merge_16.png | Bin .../src => src}/stock-pixmaps/stock_merge_24.png | Bin .../stock-pixmaps/stock_order_bottom_16.png | Bin .../stock-pixmaps/stock_order_top_16.png | Bin .../src => src}/stock-pixmaps/stock_pencil_16.png | Bin .../src => src}/stock-pixmaps/stock_pencil_24.png | Bin .../stock-pixmaps/stock_properties_16.png | Bin .../stock-pixmaps/stock_properties_24.png | Bin .../stock-pixmaps/stock_rotate_left_16.png | Bin .../stock-pixmaps/stock_rotate_right_16.png | Bin .../src => src}/stock-pixmaps/stock_text_16.png | Bin .../src => src}/stock-pixmaps/stock_text_24.png | Bin .../src => src}/stock-pixmaps/stock_vchain_24.png | Bin .../stock-pixmaps/stock_vchain_broken_24.png | Bin {glabels2/src => src}/stock.c | 0 {glabels2/src => src}/stock.h | 0 {glabels2/src => src}/template-designer.c | 0 {glabels2/src => src}/template-designer.h | 0 {glabels2/src => src}/text-node.c | 0 {glabels2/src => src}/text-node.h | 0 {glabels2/src => src}/ui-commands.c | 0 {glabels2/src => src}/ui-commands.h | 0 {glabels2/src => src}/ui-property-bar.c | 0 {glabels2/src => src}/ui-property-bar.h | 0 {glabels2/src => src}/ui-sidebar.c | 0 {glabels2/src => src}/ui-sidebar.h | 0 {glabels2/src => src}/ui-util.c | 0 {glabels2/src => src}/ui-util.h | 0 {glabels2/src => src}/ui.c | 0 {glabels2/src => src}/ui.h | 0 {glabels2/src => src}/util.c | 0 {glabels2/src => src}/util.h | 0 {glabels2/src => src}/view-barcode.c | 0 {glabels2/src => src}/view-barcode.h | 0 {glabels2/src => src}/view-box.c | 0 {glabels2/src => src}/view-box.h | 0 {glabels2/src => src}/view-ellipse.c | 0 {glabels2/src => src}/view-ellipse.h | 0 {glabels2/src => src}/view-image.c | 0 {glabels2/src => src}/view-image.h | 0 {glabels2/src => src}/view-line.c | 0 {glabels2/src => src}/view-line.h | 0 {glabels2/src => src}/view-object.c | 0 {glabels2/src => src}/view-object.h | 0 {glabels2/src => src}/view-text.c | 0 {glabels2/src => src}/view-text.h | 0 {glabels2/src => src}/view.c | 0 {glabels2/src => src}/view.h | 0 {glabels2/src => src}/warning-handler.c | 0 {glabels2/src => src}/warning-handler.h | 0 {glabels2/src => src}/wdgt-chain-button.c | 0 {glabels2/src => src}/wdgt-chain-button.h | 0 {glabels2/src => src}/wdgt-media-select.c | 0 {glabels2/src => src}/wdgt-media-select.h | 0 {glabels2/src => src}/wdgt-mini-preview.c | 0 {glabels2/src => src}/wdgt-mini-preview.h | 0 {glabels2/src => src}/wdgt-print-copies.c | 0 {glabels2/src => src}/wdgt-print-copies.h | 0 {glabels2/src => src}/wdgt-print-merge.c | 0 {glabels2/src => src}/wdgt-print-merge.h | 0 {glabels2/src => src}/wdgt-rotate-label.c | 0 {glabels2/src => src}/wdgt-rotate-label.h | 0 {glabels2/src => src}/window.c | 0 {glabels2/src => src}/window.h | 0 {glabels2/src => src}/xml-label-04.c | 0 {glabels2/src => src}/xml-label-04.h | 0 {glabels2/src => src}/xml-label.c | 0 {glabels2/src => src}/xml-label.h | 0 433 files changed, 0 insertions(+), 0 deletions(-) rename glabels2/AUTHORS => AUTHORS (100%) rename glabels2/COPYING => COPYING (100%) rename glabels2/COPYING-DOCS => COPYING-DOCS (100%) rename glabels2/COPYING-LIBGLABELS => COPYING-LIBGLABELS (100%) rename glabels2/COPYING.README_FIRST => COPYING.README_FIRST (100%) rename glabels2/ChangeLog => ChangeLog (100%) rename glabels2/INSTALL => INSTALL (100%) rename glabels2/Makefile.am => Makefile.am (100%) rename glabels2/NEWS => NEWS (100%) rename glabels2/README => README (100%) rename glabels2/TODO => TODO (100%) rename glabels2/autogen.sh => autogen.sh (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/COPYING (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/ChangeLog (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/INSTALL (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/Makefile.am (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/Makefile.in.dist (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/README (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/README.glabels (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/TODO (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/barcode.h (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/barcode.spec (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/bookland/bookland.py (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/cmdline.c (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/cmdline.h (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/codabar.c (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/code128.c (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/code39.c (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/code93.c (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/compat/getopt.c (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/compat/getopt.h (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/configure (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/configure.in.dist (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/contrib/barcode-SVG.tar.gz (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/contrib/barcode-SVG.tar.gz.README (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/contrib/barcode-for-delphi.tar.gz (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/contrib/barcode-for-delphi.tar.gz.README (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/contrib/barcodeps-0.1.tgz (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/contrib/barcodeps-0.1.tgz.README (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/contrib/grab-0.0.4.tar.gz (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/contrib/grab-0.0.4.tar.gz.README (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/debian/README.debian (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/debian/changelog (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/debian/control (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/debian/copyright (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/debian/dirs (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/debian/info (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/debian/rules (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/doc/Makefile.in (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/doc/README (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/doc/barcode.info (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/doc/barcode.pdf (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/doc/barcode.ps (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/doc/barcodedoc.txt (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/doc/doc.barcode (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/doc/infofilter (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/doc/manpager (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/doc/mktxt (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/doc/texi2html (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/ean.c (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/i25.c (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/install-sh (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/library.c (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/main.c (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/missing (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/mkinstalldirs (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/msi.c (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/pcl.c (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/plessey.c (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/ps.c (100%) rename {glabels2/barcode-0.98 => barcode-0.98}/sample.c (100%) rename glabels2/configure.in => configure.in (100%) rename {glabels2/data => data}/Makefile.am (100%) rename {glabels2/data => data}/desktop/Makefile.am (100%) rename {glabels2/data => data}/desktop/glabels.desktop.in (100%) rename {glabels2/data => data}/dtd/Makefile.am (100%) rename {glabels2/data => data}/dtd/glabels-2.2.dtd (100%) rename {glabels2/data => data}/glade/Makefile.am (100%) rename {glabels2/data => data}/glade/merge-properties-dialog.glade (100%) rename {glabels2/data => data}/glade/new-label-dialog.glade (100%) rename {glabels2/data => data}/glade/object-editor.glade (100%) rename {glabels2/data => data}/glade/prefs-dialog.glade (100%) rename {glabels2/data => data}/glade/print-custom-widget.glade (100%) rename {glabels2/data => data}/glade/property-bar.glade (100%) rename {glabels2/data => data}/glade/template-designer.glade (100%) rename {glabels2/data => data}/glade/wdgt-media-select.glade (100%) rename {glabels2/data => data}/glade/wdgt-rotate-label.glade (100%) rename {glabels2/data => data}/man/Makefile.am (100%) rename {glabels2/data => data}/man/glabels.1 (100%) rename {glabels2/data => data}/mime/Makefile.am (100%) rename {glabels2/data => data}/mime/glabels.applications (100%) rename {glabels2/data => data}/mime/glabels.keys.in (100%) rename {glabels2/data => data}/mime/glabels.mime (100%) rename {glabels2/data => data}/mime/glabels.xml.in (100%) rename {glabels2/data => data}/pixmaps/Makefile.am (100%) rename {glabels2/data => data}/pixmaps/ex-1layout.png (100%) rename {glabels2/data => data}/pixmaps/ex-2layouts.png (100%) rename {glabels2/data => data}/pixmaps/ex-cd-size.png (100%) rename {glabels2/data => data}/pixmaps/ex-rect-size.png (100%) rename {glabels2/data => data}/pixmaps/ex-round-size.png (100%) rename {glabels2/data => data}/pixmaps/glabels-about-logo.png (100%) rename {glabels2/data => data}/pixmaps/glabels-application-x-glabels.png (100%) rename {glabels2/data => data}/pixmaps/glabels-splash.png (100%) rename {glabels2/data => data}/pixmaps/glabels.png (100%) rename {glabels2/data => data}/templates/Makefile.am (100%) rename {glabels2/data => data}/templates/avery-iso-templates.xml (100%) rename {glabels2/data => data}/templates/avery-other-templates.xml (100%) rename {glabels2/data => data}/templates/avery-us-templates.xml (100%) rename {glabels2/data => data}/templates/brother-other-templates.xml (100%) rename {glabels2/data => data}/templates/categories.xml (100%) rename {glabels2/data => data}/templates/dymo-other-templates.xml (100%) rename {glabels2/data => data}/templates/misc-iso-templates.xml (100%) rename {glabels2/data => data}/templates/misc-other-templates.xml (100%) rename {glabels2/data => data}/templates/misc-us-templates.xml (100%) rename {glabels2/data => data}/templates/paper-sizes.xml (100%) rename {glabels2/data => data}/templates/zweckform-iso-templates.xml (100%) rename {glabels2/docs => docs}/Makefile.am (100%) rename {glabels2/docs => docs}/libglabels/Makefile.am (100%) rename {glabels2/docs => docs}/libglabels/libglabels-decl-list.txt (100%) rename {glabels2/docs => docs}/libglabels/libglabels-docs.sgml (100%) rename {glabels2/docs => docs}/libglabels/libglabels-overrides.txt (100%) rename {glabels2/docs => docs}/libglabels/libglabels-sections.txt (100%) rename {glabels2/docs => docs}/libglabels/libglabels-undocumented.txt (100%) rename {glabels2/docs => docs}/libglabels/libglabels.types (100%) rename {glabels2/docs => docs}/libglabels/tmpl/category.sgml (100%) rename {glabels2/docs => docs}/libglabels/tmpl/db.sgml (100%) rename {glabels2/docs => docs}/libglabels/tmpl/enums.sgml (100%) rename {glabels2/docs => docs}/libglabels/tmpl/libglabels-unused.sgml (100%) rename {glabels2/docs => docs}/libglabels/tmpl/libglabels.sgml (100%) rename {glabels2/docs => docs}/libglabels/tmpl/paper.sgml (100%) rename {glabels2/docs => docs}/libglabels/tmpl/str.sgml (100%) rename {glabels2/docs => docs}/libglabels/tmpl/template.sgml (100%) rename {glabels2/docs => docs}/libglabels/tmpl/xml-category.sgml (100%) rename {glabels2/docs => docs}/libglabels/tmpl/xml-paper.sgml (100%) rename {glabels2/docs => docs}/libglabels/tmpl/xml-template.sgml (100%) rename {glabels2/docs => docs}/libglabels/tmpl/xml.sgml (100%) rename glabels2/glabels.spec.in => glabels.spec.in (100%) rename glabels2/gtk-doc.make => gtk-doc.make (100%) rename {glabels2/help => help}/C/Makefile.am (100%) rename {glabels2/help => help}/C/figures/glabels-template-cd.png (100%) rename {glabels2/help => help}/C/figures/glabels-template-label.png (100%) rename {glabels2/help => help}/C/figures/glabels-template-layout.png (100%) rename {glabels2/help => help}/C/figures/main-window-empty.png (100%) rename {glabels2/help => help}/C/figures/merge-ex1-1.png (100%) rename {glabels2/help => help}/C/figures/merge-ex1-2.png (100%) rename {glabels2/help => help}/C/figures/merge-ex1-3.png (100%) rename {glabels2/help => help}/C/figures/merge-ex1-4.png (100%) rename {glabels2/help => help}/C/figures/merge-ex2-1.png (100%) rename {glabels2/help => help}/C/figures/merge-ex2-2.png (100%) rename {glabels2/help => help}/C/figures/merge-ex2-3.png (100%) rename {glabels2/help => help}/C/figures/merge-ex2-4.png (100%) rename {glabels2/help => help}/C/figures/object-editor-sidebar.png (100%) rename {glabels2/help => help}/C/figures/print-copies.png (100%) rename {glabels2/help => help}/C/figures/print-merge.png (100%) rename {glabels2/help => help}/C/glabels-C.omf (100%) rename {glabels2/help => help}/C/glabels.xml (100%) rename {glabels2/help => help}/C/legal.xml (100%) rename {glabels2/help => help}/Makefile.am (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/BUGS (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/CHANGELOG (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/CREDITS (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/INSTALL (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/LICENSE (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/Makefile.am (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/Makefile.dist (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/README (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/README.glabels (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/TODO (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/iec16022.1 (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/iec16022.c (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/iec16022ecc200.c (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/iec16022ecc200.h (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/image.c (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/image.h (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/reedsol.c (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/reedsol.h (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/test/testsuite-example.bin (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/test/testsuite-example.eps (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/test/testsuite-example.hex (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/test/testsuite-example.png (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/test/testsuite-example.text (100%) rename {glabels2/iec16022-0.2.1 => iec16022-0.2.1}/test/testsuite.sh (100%) rename {glabels2/libglabels => libglabels}/Makefile.am (100%) rename {glabels2/libglabels => libglabels}/category.c (100%) rename {glabels2/libglabels => libglabels}/category.h (100%) rename {glabels2/libglabels => libglabels}/db.c (100%) rename {glabels2/libglabels => libglabels}/db.h (100%) rename {glabels2/libglabels => libglabels}/enums.h (100%) rename {glabels2/libglabels => libglabels}/libglabels-private.h (100%) rename {glabels2/libglabels => libglabels}/libglabels.h (100%) rename {glabels2/libglabels => libglabels}/libglabels.pc.in (100%) rename {glabels2/libglabels => libglabels}/paper.c (100%) rename {glabels2/libglabels => libglabels}/paper.h (100%) rename {glabels2/libglabels => libglabels}/str.c (100%) rename {glabels2/libglabels => libglabels}/str.h (100%) rename {glabels2/libglabels => libglabels}/template.c (100%) rename {glabels2/libglabels => libglabels}/template.h (100%) rename {glabels2/libglabels => libglabels}/xml-category.c (100%) rename {glabels2/libglabels => libglabels}/xml-category.h (100%) rename {glabels2/libglabels => libglabels}/xml-paper.c (100%) rename {glabels2/libglabels => libglabels}/xml-paper.h (100%) rename {glabels2/libglabels => libglabels}/xml-template.c (100%) rename {glabels2/libglabels => libglabels}/xml-template.h (100%) rename {glabels2/libglabels => libglabels}/xml.c (100%) rename {glabels2/libglabels => libglabels}/xml.h (100%) rename {glabels2/po => po}/POTFILES.in (100%) rename {glabels2/po => po}/cs.po (100%) rename {glabels2/po => po}/de.po (100%) rename {glabels2/po => po}/eo.po (100%) rename {glabels2/po => po}/es.po (100%) rename {glabels2/po => po}/fr.po (100%) rename {glabels2/po => po}/it.po (100%) rename {glabels2/po => po}/ja.po (100%) rename {glabels2/po => po}/ko.po (100%) rename {glabels2/po => po}/pl.po (100%) rename {glabels2/po => po}/pt_BR.po (100%) rename {glabels2/po => po}/ru.po (100%) rename {glabels2/po => po}/zh_TW.Big5.po (100%) rename {glabels2/src => src}/Makefile.am (100%) rename {glabels2/src => src}/base64.c (100%) rename {glabels2/src => src}/base64.h (100%) rename {glabels2/src => src}/bc-gnubarcode.c (100%) rename {glabels2/src => src}/bc-gnubarcode.h (100%) rename {glabels2/src => src}/bc-iec16022.c (100%) rename {glabels2/src => src}/bc-iec16022.h (100%) rename {glabels2/src => src}/bc-postnet.c (100%) rename {glabels2/src => src}/bc-postnet.h (100%) rename {glabels2/src => src}/bc.c (100%) rename {glabels2/src => src}/bc.h (100%) rename {glabels2/src => src}/cairo-ellipse-path.c (100%) rename {glabels2/src => src}/cairo-ellipse-path.h (100%) rename {glabels2/src => src}/cairo-label-path.c (100%) rename {glabels2/src => src}/cairo-label-path.h (100%) rename {glabels2/src => src}/cairo-markup-path.c (100%) rename {glabels2/src => src}/cairo-markup-path.h (100%) rename {glabels2/src => src}/color.c (100%) rename {glabels2/src => src}/color.h (100%) rename {glabels2/src => src}/critical-error-handler.c (100%) rename {glabels2/src => src}/critical-error-handler.h (100%) rename {glabels2/src => src}/debug.c (100%) rename {glabels2/src => src}/debug.h (100%) rename {glabels2/src => src}/file.c (100%) rename {glabels2/src => src}/file.h (100%) rename {glabels2/src => src}/glabels-batch.c (100%) rename {glabels2/src => src}/glabels.c (100%) rename {glabels2/src => src}/hig.h (100%) rename {glabels2/src => src}/label-barcode.c (100%) rename {glabels2/src => src}/label-barcode.h (100%) rename {glabels2/src => src}/label-box.c (100%) rename {glabels2/src => src}/label-box.h (100%) rename {glabels2/src => src}/label-ellipse.c (100%) rename {glabels2/src => src}/label-ellipse.h (100%) rename {glabels2/src => src}/label-image.c (100%) rename {glabels2/src => src}/label-image.h (100%) rename {glabels2/src => src}/label-line.c (100%) rename {glabels2/src => src}/label-line.h (100%) rename {glabels2/src => src}/label-object.c (100%) rename {glabels2/src => src}/label-object.h (100%) rename {glabels2/src => src}/label-text.c (100%) rename {glabels2/src => src}/label-text.h (100%) rename {glabels2/src => src}/label.c (100%) rename {glabels2/src => src}/label.h (100%) rename {glabels2/src => src}/marshal.list (100%) rename {glabels2/src => src}/merge-evolution.c (100%) rename {glabels2/src => src}/merge-evolution.h (100%) rename {glabels2/src => src}/merge-init.c (100%) rename {glabels2/src => src}/merge-init.h (100%) rename {glabels2/src => src}/merge-properties-dialog.c (100%) rename {glabels2/src => src}/merge-properties-dialog.h (100%) rename {glabels2/src => src}/merge-text.c (100%) rename {glabels2/src => src}/merge-text.h (100%) rename {glabels2/src => src}/merge-vcard.c (100%) rename {glabels2/src => src}/merge-vcard.h (100%) rename {glabels2/src => src}/merge.c (100%) rename {glabels2/src => src}/merge.h (100%) rename {glabels2/src => src}/mini-preview-pixbuf-cache.c (100%) rename {glabels2/src => src}/mini-preview-pixbuf-cache.h (100%) rename {glabels2/src => src}/mini-preview-pixbuf.c (100%) rename {glabels2/src => src}/mini-preview-pixbuf.h (100%) rename {glabels2/src => src}/mygal/Makefile.am (100%) rename {glabels2/src => src}/mygal/color-group.c (100%) rename {glabels2/src => src}/mygal/color-group.h (100%) rename {glabels2/src => src}/mygal/color-palette.c (100%) rename {glabels2/src => src}/mygal/color-palette.h (100%) rename {glabels2/src => src}/mygal/e-colors.c (100%) rename {glabels2/src => src}/mygal/e-colors.h (100%) rename {glabels2/src => src}/mygal/e-marshal.list (100%) rename {glabels2/src => src}/mygal/e-util.h (100%) rename {glabels2/src => src}/mygal/mygal-combo-box.c (100%) rename {glabels2/src => src}/mygal/mygal-combo-box.h (100%) rename {glabels2/src => src}/mygal/widget-color-combo.c (100%) rename {glabels2/src => src}/mygal/widget-color-combo.h (100%) rename {glabels2/src => src}/new-label-dialog.c (100%) rename {glabels2/src => src}/new-label-dialog.h (100%) rename {glabels2/src => src}/object-editor-bc-page.c (100%) rename {glabels2/src => src}/object-editor-data-page.c (100%) rename {glabels2/src => src}/object-editor-edit-page.c (100%) rename {glabels2/src => src}/object-editor-fill-page.c (100%) rename {glabels2/src => src}/object-editor-image-page.c (100%) rename {glabels2/src => src}/object-editor-line-page.c (100%) rename {glabels2/src => src}/object-editor-lsize-page.c (100%) rename {glabels2/src => src}/object-editor-position-page.c (100%) rename {glabels2/src => src}/object-editor-private.h (100%) rename {glabels2/src => src}/object-editor-shadow-page.c (100%) rename {glabels2/src => src}/object-editor-size-page.c (100%) rename {glabels2/src => src}/object-editor-text-page.c (100%) rename {glabels2/src => src}/object-editor.c (100%) rename {glabels2/src => src}/object-editor.h (100%) rename {glabels2/src => src}/pixbuf-cache.c (100%) rename {glabels2/src => src}/pixbuf-cache.h (100%) rename {glabels2/src => src}/pixmaps/Makefile.am (100%) rename {glabels2/src => src}/pixmaps/checkerboard.xpm (100%) rename {glabels2/src => src}/pixmaps/collate.xpm (100%) rename {glabels2/src => src}/pixmaps/cursor_barcode.xbm (100%) rename {glabels2/src => src}/pixmaps/cursor_barcode_mask.xbm (100%) rename {glabels2/src => src}/pixmaps/cursor_box.xbm (100%) rename {glabels2/src => src}/pixmaps/cursor_box_mask.xbm (100%) rename {glabels2/src => src}/pixmaps/cursor_ellipse.xbm (100%) rename {glabels2/src => src}/pixmaps/cursor_ellipse_mask.xbm (100%) rename {glabels2/src => src}/pixmaps/cursor_image.xbm (100%) rename {glabels2/src => src}/pixmaps/cursor_image_mask.xbm (100%) rename {glabels2/src => src}/pixmaps/cursor_line.xbm (100%) rename {glabels2/src => src}/pixmaps/cursor_line_mask.xbm (100%) rename {glabels2/src => src}/pixmaps/cursor_text.xbm (100%) rename {glabels2/src => src}/pixmaps/cursor_text_mask.xbm (100%) rename {glabels2/src => src}/pixmaps/nocollate.xpm (100%) rename {glabels2/src => src}/prefs-dialog.c (100%) rename {glabels2/src => src}/prefs-dialog.h (100%) rename {glabels2/src => src}/prefs-model.c (100%) rename {glabels2/src => src}/prefs-model.h (100%) rename {glabels2/src => src}/prefs.c (100%) rename {glabels2/src => src}/prefs.h (100%) rename {glabels2/src => src}/print-op.c (100%) rename {glabels2/src => src}/print-op.h (100%) rename {glabels2/src => src}/print.c (100%) rename {glabels2/src => src}/print.h (100%) rename {glabels2/src => src}/recent.c (100%) rename {glabels2/src => src}/recent.h (100%) rename {glabels2/src => src}/stock-pixmaps/Makefile.am (100%) rename {glabels2/src => src}/stock-pixmaps/stock_align_bottom_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_align_hcenter_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_align_left_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_align_right_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_align_top_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_align_vcenter_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_arrow_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_arrow_24.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_barcode_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_barcode_24.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_box_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_box_24.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_bucket_fill_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_bucket_fill_24.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_center_horiz_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_center_vert_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_ellipse_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_ellipse_24.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_flip_horiz_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_flip_vert_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_hchain_24.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_hchain_broken_24.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_image_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_image_24.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_line_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_line_24.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_merge_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_merge_24.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_order_bottom_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_order_top_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_pencil_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_pencil_24.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_properties_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_properties_24.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_rotate_left_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_rotate_right_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_text_16.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_text_24.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_vchain_24.png (100%) rename {glabels2/src => src}/stock-pixmaps/stock_vchain_broken_24.png (100%) rename {glabels2/src => src}/stock.c (100%) rename {glabels2/src => src}/stock.h (100%) rename {glabels2/src => src}/template-designer.c (100%) rename {glabels2/src => src}/template-designer.h (100%) rename {glabels2/src => src}/text-node.c (100%) rename {glabels2/src => src}/text-node.h (100%) rename {glabels2/src => src}/ui-commands.c (100%) rename {glabels2/src => src}/ui-commands.h (100%) rename {glabels2/src => src}/ui-property-bar.c (100%) rename {glabels2/src => src}/ui-property-bar.h (100%) rename {glabels2/src => src}/ui-sidebar.c (100%) rename {glabels2/src => src}/ui-sidebar.h (100%) rename {glabels2/src => src}/ui-util.c (100%) rename {glabels2/src => src}/ui-util.h (100%) rename {glabels2/src => src}/ui.c (100%) rename {glabels2/src => src}/ui.h (100%) rename {glabels2/src => src}/util.c (100%) rename {glabels2/src => src}/util.h (100%) rename {glabels2/src => src}/view-barcode.c (100%) rename {glabels2/src => src}/view-barcode.h (100%) rename {glabels2/src => src}/view-box.c (100%) rename {glabels2/src => src}/view-box.h (100%) rename {glabels2/src => src}/view-ellipse.c (100%) rename {glabels2/src => src}/view-ellipse.h (100%) rename {glabels2/src => src}/view-image.c (100%) rename {glabels2/src => src}/view-image.h (100%) rename {glabels2/src => src}/view-line.c (100%) rename {glabels2/src => src}/view-line.h (100%) rename {glabels2/src => src}/view-object.c (100%) rename {glabels2/src => src}/view-object.h (100%) rename {glabels2/src => src}/view-text.c (100%) rename {glabels2/src => src}/view-text.h (100%) rename {glabels2/src => src}/view.c (100%) rename {glabels2/src => src}/view.h (100%) rename {glabels2/src => src}/warning-handler.c (100%) rename {glabels2/src => src}/warning-handler.h (100%) rename {glabels2/src => src}/wdgt-chain-button.c (100%) rename {glabels2/src => src}/wdgt-chain-button.h (100%) rename {glabels2/src => src}/wdgt-media-select.c (100%) rename {glabels2/src => src}/wdgt-media-select.h (100%) rename {glabels2/src => src}/wdgt-mini-preview.c (100%) rename {glabels2/src => src}/wdgt-mini-preview.h (100%) rename {glabels2/src => src}/wdgt-print-copies.c (100%) rename {glabels2/src => src}/wdgt-print-copies.h (100%) rename {glabels2/src => src}/wdgt-print-merge.c (100%) rename {glabels2/src => src}/wdgt-print-merge.h (100%) rename {glabels2/src => src}/wdgt-rotate-label.c (100%) rename {glabels2/src => src}/wdgt-rotate-label.h (100%) rename {glabels2/src => src}/window.c (100%) rename {glabels2/src => src}/window.h (100%) rename {glabels2/src => src}/xml-label-04.c (100%) rename {glabels2/src => src}/xml-label-04.h (100%) rename {glabels2/src => src}/xml-label.c (100%) rename {glabels2/src => src}/xml-label.h (100%) diff --git a/glabels2/AUTHORS b/AUTHORS similarity index 100% rename from glabels2/AUTHORS rename to AUTHORS diff --git a/glabels2/COPYING b/COPYING similarity index 100% rename from glabels2/COPYING rename to COPYING diff --git a/glabels2/COPYING-DOCS b/COPYING-DOCS similarity index 100% rename from glabels2/COPYING-DOCS rename to COPYING-DOCS diff --git a/glabels2/COPYING-LIBGLABELS b/COPYING-LIBGLABELS similarity index 100% rename from glabels2/COPYING-LIBGLABELS rename to COPYING-LIBGLABELS diff --git a/glabels2/COPYING.README_FIRST b/COPYING.README_FIRST similarity index 100% rename from glabels2/COPYING.README_FIRST rename to COPYING.README_FIRST diff --git a/glabels2/ChangeLog b/ChangeLog similarity index 100% rename from glabels2/ChangeLog rename to ChangeLog diff --git a/glabels2/INSTALL b/INSTALL similarity index 100% rename from glabels2/INSTALL rename to INSTALL diff --git a/glabels2/Makefile.am b/Makefile.am similarity index 100% rename from glabels2/Makefile.am rename to Makefile.am diff --git a/glabels2/NEWS b/NEWS similarity index 100% rename from glabels2/NEWS rename to NEWS diff --git a/glabels2/README b/README similarity index 100% rename from glabels2/README rename to README diff --git a/glabels2/TODO b/TODO similarity index 100% rename from glabels2/TODO rename to TODO diff --git a/glabels2/autogen.sh b/autogen.sh similarity index 100% rename from glabels2/autogen.sh rename to autogen.sh diff --git a/glabels2/barcode-0.98/COPYING b/barcode-0.98/COPYING similarity index 100% rename from glabels2/barcode-0.98/COPYING rename to barcode-0.98/COPYING diff --git a/glabels2/barcode-0.98/ChangeLog b/barcode-0.98/ChangeLog similarity index 100% rename from glabels2/barcode-0.98/ChangeLog rename to barcode-0.98/ChangeLog diff --git a/glabels2/barcode-0.98/INSTALL b/barcode-0.98/INSTALL similarity index 100% rename from glabels2/barcode-0.98/INSTALL rename to barcode-0.98/INSTALL diff --git a/glabels2/barcode-0.98/Makefile.am b/barcode-0.98/Makefile.am similarity index 100% rename from glabels2/barcode-0.98/Makefile.am rename to barcode-0.98/Makefile.am diff --git a/glabels2/barcode-0.98/Makefile.in.dist b/barcode-0.98/Makefile.in.dist similarity index 100% rename from glabels2/barcode-0.98/Makefile.in.dist rename to barcode-0.98/Makefile.in.dist diff --git a/glabels2/barcode-0.98/README b/barcode-0.98/README similarity index 100% rename from glabels2/barcode-0.98/README rename to barcode-0.98/README diff --git a/glabels2/barcode-0.98/README.glabels b/barcode-0.98/README.glabels similarity index 100% rename from glabels2/barcode-0.98/README.glabels rename to barcode-0.98/README.glabels diff --git a/glabels2/barcode-0.98/TODO b/barcode-0.98/TODO similarity index 100% rename from glabels2/barcode-0.98/TODO rename to barcode-0.98/TODO diff --git a/glabels2/barcode-0.98/barcode.h b/barcode-0.98/barcode.h similarity index 100% rename from glabels2/barcode-0.98/barcode.h rename to barcode-0.98/barcode.h diff --git a/glabels2/barcode-0.98/barcode.spec b/barcode-0.98/barcode.spec similarity index 100% rename from glabels2/barcode-0.98/barcode.spec rename to barcode-0.98/barcode.spec diff --git a/glabels2/barcode-0.98/bookland/bookland.py b/barcode-0.98/bookland/bookland.py similarity index 100% rename from glabels2/barcode-0.98/bookland/bookland.py rename to barcode-0.98/bookland/bookland.py diff --git a/glabels2/barcode-0.98/cmdline.c b/barcode-0.98/cmdline.c similarity index 100% rename from glabels2/barcode-0.98/cmdline.c rename to barcode-0.98/cmdline.c diff --git a/glabels2/barcode-0.98/cmdline.h b/barcode-0.98/cmdline.h similarity index 100% rename from glabels2/barcode-0.98/cmdline.h rename to barcode-0.98/cmdline.h diff --git a/glabels2/barcode-0.98/codabar.c b/barcode-0.98/codabar.c similarity index 100% rename from glabels2/barcode-0.98/codabar.c rename to barcode-0.98/codabar.c diff --git a/glabels2/barcode-0.98/code128.c b/barcode-0.98/code128.c similarity index 100% rename from glabels2/barcode-0.98/code128.c rename to barcode-0.98/code128.c diff --git a/glabels2/barcode-0.98/code39.c b/barcode-0.98/code39.c similarity index 100% rename from glabels2/barcode-0.98/code39.c rename to barcode-0.98/code39.c diff --git a/glabels2/barcode-0.98/code93.c b/barcode-0.98/code93.c similarity index 100% rename from glabels2/barcode-0.98/code93.c rename to barcode-0.98/code93.c diff --git a/glabels2/barcode-0.98/compat/getopt.c b/barcode-0.98/compat/getopt.c similarity index 100% rename from glabels2/barcode-0.98/compat/getopt.c rename to barcode-0.98/compat/getopt.c diff --git a/glabels2/barcode-0.98/compat/getopt.h b/barcode-0.98/compat/getopt.h similarity index 100% rename from glabels2/barcode-0.98/compat/getopt.h rename to barcode-0.98/compat/getopt.h diff --git a/glabels2/barcode-0.98/configure b/barcode-0.98/configure similarity index 100% rename from glabels2/barcode-0.98/configure rename to barcode-0.98/configure diff --git a/glabels2/barcode-0.98/configure.in.dist b/barcode-0.98/configure.in.dist similarity index 100% rename from glabels2/barcode-0.98/configure.in.dist rename to barcode-0.98/configure.in.dist diff --git a/glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz b/barcode-0.98/contrib/barcode-SVG.tar.gz similarity index 100% rename from glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz rename to barcode-0.98/contrib/barcode-SVG.tar.gz diff --git a/glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz.README b/barcode-0.98/contrib/barcode-SVG.tar.gz.README similarity index 100% rename from glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz.README rename to barcode-0.98/contrib/barcode-SVG.tar.gz.README diff --git a/glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz b/barcode-0.98/contrib/barcode-for-delphi.tar.gz similarity index 100% rename from glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz rename to barcode-0.98/contrib/barcode-for-delphi.tar.gz diff --git a/glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README b/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README similarity index 100% rename from glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README rename to barcode-0.98/contrib/barcode-for-delphi.tar.gz.README diff --git a/glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz b/barcode-0.98/contrib/barcodeps-0.1.tgz similarity index 100% rename from glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz rename to barcode-0.98/contrib/barcodeps-0.1.tgz diff --git a/glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz.README b/barcode-0.98/contrib/barcodeps-0.1.tgz.README similarity index 100% rename from glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz.README rename to barcode-0.98/contrib/barcodeps-0.1.tgz.README diff --git a/glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz b/barcode-0.98/contrib/grab-0.0.4.tar.gz similarity index 100% rename from glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz rename to barcode-0.98/contrib/grab-0.0.4.tar.gz diff --git a/glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz.README b/barcode-0.98/contrib/grab-0.0.4.tar.gz.README similarity index 100% rename from glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz.README rename to barcode-0.98/contrib/grab-0.0.4.tar.gz.README diff --git a/glabels2/barcode-0.98/debian/README.debian b/barcode-0.98/debian/README.debian similarity index 100% rename from glabels2/barcode-0.98/debian/README.debian rename to barcode-0.98/debian/README.debian diff --git a/glabels2/barcode-0.98/debian/changelog b/barcode-0.98/debian/changelog similarity index 100% rename from glabels2/barcode-0.98/debian/changelog rename to barcode-0.98/debian/changelog diff --git a/glabels2/barcode-0.98/debian/control b/barcode-0.98/debian/control similarity index 100% rename from glabels2/barcode-0.98/debian/control rename to barcode-0.98/debian/control diff --git a/glabels2/barcode-0.98/debian/copyright b/barcode-0.98/debian/copyright similarity index 100% rename from glabels2/barcode-0.98/debian/copyright rename to barcode-0.98/debian/copyright diff --git a/glabels2/barcode-0.98/debian/dirs b/barcode-0.98/debian/dirs similarity index 100% rename from glabels2/barcode-0.98/debian/dirs rename to barcode-0.98/debian/dirs diff --git a/glabels2/barcode-0.98/debian/info b/barcode-0.98/debian/info similarity index 100% rename from glabels2/barcode-0.98/debian/info rename to barcode-0.98/debian/info diff --git a/glabels2/barcode-0.98/debian/rules b/barcode-0.98/debian/rules similarity index 100% rename from glabels2/barcode-0.98/debian/rules rename to barcode-0.98/debian/rules diff --git a/glabels2/barcode-0.98/doc/Makefile.in b/barcode-0.98/doc/Makefile.in similarity index 100% rename from glabels2/barcode-0.98/doc/Makefile.in rename to barcode-0.98/doc/Makefile.in diff --git a/glabels2/barcode-0.98/doc/README b/barcode-0.98/doc/README similarity index 100% rename from glabels2/barcode-0.98/doc/README rename to barcode-0.98/doc/README diff --git a/glabels2/barcode-0.98/doc/barcode.info b/barcode-0.98/doc/barcode.info similarity index 100% rename from glabels2/barcode-0.98/doc/barcode.info rename to barcode-0.98/doc/barcode.info diff --git a/glabels2/barcode-0.98/doc/barcode.pdf b/barcode-0.98/doc/barcode.pdf similarity index 100% rename from glabels2/barcode-0.98/doc/barcode.pdf rename to barcode-0.98/doc/barcode.pdf diff --git a/glabels2/barcode-0.98/doc/barcode.ps b/barcode-0.98/doc/barcode.ps similarity index 100% rename from glabels2/barcode-0.98/doc/barcode.ps rename to barcode-0.98/doc/barcode.ps diff --git a/glabels2/barcode-0.98/doc/barcodedoc.txt b/barcode-0.98/doc/barcodedoc.txt similarity index 100% rename from glabels2/barcode-0.98/doc/barcodedoc.txt rename to barcode-0.98/doc/barcodedoc.txt diff --git a/glabels2/barcode-0.98/doc/doc.barcode b/barcode-0.98/doc/doc.barcode similarity index 100% rename from glabels2/barcode-0.98/doc/doc.barcode rename to barcode-0.98/doc/doc.barcode diff --git a/glabels2/barcode-0.98/doc/infofilter b/barcode-0.98/doc/infofilter similarity index 100% rename from glabels2/barcode-0.98/doc/infofilter rename to barcode-0.98/doc/infofilter diff --git a/glabels2/barcode-0.98/doc/manpager b/barcode-0.98/doc/manpager similarity index 100% rename from glabels2/barcode-0.98/doc/manpager rename to barcode-0.98/doc/manpager diff --git a/glabels2/barcode-0.98/doc/mktxt b/barcode-0.98/doc/mktxt similarity index 100% rename from glabels2/barcode-0.98/doc/mktxt rename to barcode-0.98/doc/mktxt diff --git a/glabels2/barcode-0.98/doc/texi2html b/barcode-0.98/doc/texi2html similarity index 100% rename from glabels2/barcode-0.98/doc/texi2html rename to barcode-0.98/doc/texi2html diff --git a/glabels2/barcode-0.98/ean.c b/barcode-0.98/ean.c similarity index 100% rename from glabels2/barcode-0.98/ean.c rename to barcode-0.98/ean.c diff --git a/glabels2/barcode-0.98/i25.c b/barcode-0.98/i25.c similarity index 100% rename from glabels2/barcode-0.98/i25.c rename to barcode-0.98/i25.c diff --git a/glabels2/barcode-0.98/install-sh b/barcode-0.98/install-sh similarity index 100% rename from glabels2/barcode-0.98/install-sh rename to barcode-0.98/install-sh diff --git a/glabels2/barcode-0.98/library.c b/barcode-0.98/library.c similarity index 100% rename from glabels2/barcode-0.98/library.c rename to barcode-0.98/library.c diff --git a/glabels2/barcode-0.98/main.c b/barcode-0.98/main.c similarity index 100% rename from glabels2/barcode-0.98/main.c rename to barcode-0.98/main.c diff --git a/glabels2/barcode-0.98/missing b/barcode-0.98/missing similarity index 100% rename from glabels2/barcode-0.98/missing rename to barcode-0.98/missing diff --git a/glabels2/barcode-0.98/mkinstalldirs b/barcode-0.98/mkinstalldirs similarity index 100% rename from glabels2/barcode-0.98/mkinstalldirs rename to barcode-0.98/mkinstalldirs diff --git a/glabels2/barcode-0.98/msi.c b/barcode-0.98/msi.c similarity index 100% rename from glabels2/barcode-0.98/msi.c rename to barcode-0.98/msi.c diff --git a/glabels2/barcode-0.98/pcl.c b/barcode-0.98/pcl.c similarity index 100% rename from glabels2/barcode-0.98/pcl.c rename to barcode-0.98/pcl.c diff --git a/glabels2/barcode-0.98/plessey.c b/barcode-0.98/plessey.c similarity index 100% rename from glabels2/barcode-0.98/plessey.c rename to barcode-0.98/plessey.c diff --git a/glabels2/barcode-0.98/ps.c b/barcode-0.98/ps.c similarity index 100% rename from glabels2/barcode-0.98/ps.c rename to barcode-0.98/ps.c diff --git a/glabels2/barcode-0.98/sample.c b/barcode-0.98/sample.c similarity index 100% rename from glabels2/barcode-0.98/sample.c rename to barcode-0.98/sample.c diff --git a/glabels2/configure.in b/configure.in similarity index 100% rename from glabels2/configure.in rename to configure.in diff --git a/glabels2/data/Makefile.am b/data/Makefile.am similarity index 100% rename from glabels2/data/Makefile.am rename to data/Makefile.am diff --git a/glabels2/data/desktop/Makefile.am b/data/desktop/Makefile.am similarity index 100% rename from glabels2/data/desktop/Makefile.am rename to data/desktop/Makefile.am diff --git a/glabels2/data/desktop/glabels.desktop.in b/data/desktop/glabels.desktop.in similarity index 100% rename from glabels2/data/desktop/glabels.desktop.in rename to data/desktop/glabels.desktop.in diff --git a/glabels2/data/dtd/Makefile.am b/data/dtd/Makefile.am similarity index 100% rename from glabels2/data/dtd/Makefile.am rename to data/dtd/Makefile.am diff --git a/glabels2/data/dtd/glabels-2.2.dtd b/data/dtd/glabels-2.2.dtd similarity index 100% rename from glabels2/data/dtd/glabels-2.2.dtd rename to data/dtd/glabels-2.2.dtd diff --git a/glabels2/data/glade/Makefile.am b/data/glade/Makefile.am similarity index 100% rename from glabels2/data/glade/Makefile.am rename to data/glade/Makefile.am diff --git a/glabels2/data/glade/merge-properties-dialog.glade b/data/glade/merge-properties-dialog.glade similarity index 100% rename from glabels2/data/glade/merge-properties-dialog.glade rename to data/glade/merge-properties-dialog.glade diff --git a/glabels2/data/glade/new-label-dialog.glade b/data/glade/new-label-dialog.glade similarity index 100% rename from glabels2/data/glade/new-label-dialog.glade rename to data/glade/new-label-dialog.glade diff --git a/glabels2/data/glade/object-editor.glade b/data/glade/object-editor.glade similarity index 100% rename from glabels2/data/glade/object-editor.glade rename to data/glade/object-editor.glade diff --git a/glabels2/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade similarity index 100% rename from glabels2/data/glade/prefs-dialog.glade rename to data/glade/prefs-dialog.glade diff --git a/glabels2/data/glade/print-custom-widget.glade b/data/glade/print-custom-widget.glade similarity index 100% rename from glabels2/data/glade/print-custom-widget.glade rename to data/glade/print-custom-widget.glade diff --git a/glabels2/data/glade/property-bar.glade b/data/glade/property-bar.glade similarity index 100% rename from glabels2/data/glade/property-bar.glade rename to data/glade/property-bar.glade diff --git a/glabels2/data/glade/template-designer.glade b/data/glade/template-designer.glade similarity index 100% rename from glabels2/data/glade/template-designer.glade rename to data/glade/template-designer.glade diff --git a/glabels2/data/glade/wdgt-media-select.glade b/data/glade/wdgt-media-select.glade similarity index 100% rename from glabels2/data/glade/wdgt-media-select.glade rename to data/glade/wdgt-media-select.glade diff --git a/glabels2/data/glade/wdgt-rotate-label.glade b/data/glade/wdgt-rotate-label.glade similarity index 100% rename from glabels2/data/glade/wdgt-rotate-label.glade rename to data/glade/wdgt-rotate-label.glade diff --git a/glabels2/data/man/Makefile.am b/data/man/Makefile.am similarity index 100% rename from glabels2/data/man/Makefile.am rename to data/man/Makefile.am diff --git a/glabels2/data/man/glabels.1 b/data/man/glabels.1 similarity index 100% rename from glabels2/data/man/glabels.1 rename to data/man/glabels.1 diff --git a/glabels2/data/mime/Makefile.am b/data/mime/Makefile.am similarity index 100% rename from glabels2/data/mime/Makefile.am rename to data/mime/Makefile.am diff --git a/glabels2/data/mime/glabels.applications b/data/mime/glabels.applications similarity index 100% rename from glabels2/data/mime/glabels.applications rename to data/mime/glabels.applications diff --git a/glabels2/data/mime/glabels.keys.in b/data/mime/glabels.keys.in similarity index 100% rename from glabels2/data/mime/glabels.keys.in rename to data/mime/glabels.keys.in diff --git a/glabels2/data/mime/glabels.mime b/data/mime/glabels.mime similarity index 100% rename from glabels2/data/mime/glabels.mime rename to data/mime/glabels.mime diff --git a/glabels2/data/mime/glabels.xml.in b/data/mime/glabels.xml.in similarity index 100% rename from glabels2/data/mime/glabels.xml.in rename to data/mime/glabels.xml.in diff --git a/glabels2/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am similarity index 100% rename from glabels2/data/pixmaps/Makefile.am rename to data/pixmaps/Makefile.am diff --git a/glabels2/data/pixmaps/ex-1layout.png b/data/pixmaps/ex-1layout.png similarity index 100% rename from glabels2/data/pixmaps/ex-1layout.png rename to data/pixmaps/ex-1layout.png diff --git a/glabels2/data/pixmaps/ex-2layouts.png b/data/pixmaps/ex-2layouts.png similarity index 100% rename from glabels2/data/pixmaps/ex-2layouts.png rename to data/pixmaps/ex-2layouts.png diff --git a/glabels2/data/pixmaps/ex-cd-size.png b/data/pixmaps/ex-cd-size.png similarity index 100% rename from glabels2/data/pixmaps/ex-cd-size.png rename to data/pixmaps/ex-cd-size.png diff --git a/glabels2/data/pixmaps/ex-rect-size.png b/data/pixmaps/ex-rect-size.png similarity index 100% rename from glabels2/data/pixmaps/ex-rect-size.png rename to data/pixmaps/ex-rect-size.png diff --git a/glabels2/data/pixmaps/ex-round-size.png b/data/pixmaps/ex-round-size.png similarity index 100% rename from glabels2/data/pixmaps/ex-round-size.png rename to data/pixmaps/ex-round-size.png diff --git a/glabels2/data/pixmaps/glabels-about-logo.png b/data/pixmaps/glabels-about-logo.png similarity index 100% rename from glabels2/data/pixmaps/glabels-about-logo.png rename to data/pixmaps/glabels-about-logo.png diff --git a/glabels2/data/pixmaps/glabels-application-x-glabels.png b/data/pixmaps/glabels-application-x-glabels.png similarity index 100% rename from glabels2/data/pixmaps/glabels-application-x-glabels.png rename to data/pixmaps/glabels-application-x-glabels.png diff --git a/glabels2/data/pixmaps/glabels-splash.png b/data/pixmaps/glabels-splash.png similarity index 100% rename from glabels2/data/pixmaps/glabels-splash.png rename to data/pixmaps/glabels-splash.png diff --git a/glabels2/data/pixmaps/glabels.png b/data/pixmaps/glabels.png similarity index 100% rename from glabels2/data/pixmaps/glabels.png rename to data/pixmaps/glabels.png diff --git a/glabels2/data/templates/Makefile.am b/data/templates/Makefile.am similarity index 100% rename from glabels2/data/templates/Makefile.am rename to data/templates/Makefile.am diff --git a/glabels2/data/templates/avery-iso-templates.xml b/data/templates/avery-iso-templates.xml similarity index 100% rename from glabels2/data/templates/avery-iso-templates.xml rename to data/templates/avery-iso-templates.xml diff --git a/glabels2/data/templates/avery-other-templates.xml b/data/templates/avery-other-templates.xml similarity index 100% rename from glabels2/data/templates/avery-other-templates.xml rename to data/templates/avery-other-templates.xml diff --git a/glabels2/data/templates/avery-us-templates.xml b/data/templates/avery-us-templates.xml similarity index 100% rename from glabels2/data/templates/avery-us-templates.xml rename to data/templates/avery-us-templates.xml diff --git a/glabels2/data/templates/brother-other-templates.xml b/data/templates/brother-other-templates.xml similarity index 100% rename from glabels2/data/templates/brother-other-templates.xml rename to data/templates/brother-other-templates.xml diff --git a/glabels2/data/templates/categories.xml b/data/templates/categories.xml similarity index 100% rename from glabels2/data/templates/categories.xml rename to data/templates/categories.xml diff --git a/glabels2/data/templates/dymo-other-templates.xml b/data/templates/dymo-other-templates.xml similarity index 100% rename from glabels2/data/templates/dymo-other-templates.xml rename to data/templates/dymo-other-templates.xml diff --git a/glabels2/data/templates/misc-iso-templates.xml b/data/templates/misc-iso-templates.xml similarity index 100% rename from glabels2/data/templates/misc-iso-templates.xml rename to data/templates/misc-iso-templates.xml diff --git a/glabels2/data/templates/misc-other-templates.xml b/data/templates/misc-other-templates.xml similarity index 100% rename from glabels2/data/templates/misc-other-templates.xml rename to data/templates/misc-other-templates.xml diff --git a/glabels2/data/templates/misc-us-templates.xml b/data/templates/misc-us-templates.xml similarity index 100% rename from glabels2/data/templates/misc-us-templates.xml rename to data/templates/misc-us-templates.xml diff --git a/glabels2/data/templates/paper-sizes.xml b/data/templates/paper-sizes.xml similarity index 100% rename from glabels2/data/templates/paper-sizes.xml rename to data/templates/paper-sizes.xml diff --git a/glabels2/data/templates/zweckform-iso-templates.xml b/data/templates/zweckform-iso-templates.xml similarity index 100% rename from glabels2/data/templates/zweckform-iso-templates.xml rename to data/templates/zweckform-iso-templates.xml diff --git a/glabels2/docs/Makefile.am b/docs/Makefile.am similarity index 100% rename from glabels2/docs/Makefile.am rename to docs/Makefile.am diff --git a/glabels2/docs/libglabels/Makefile.am b/docs/libglabels/Makefile.am similarity index 100% rename from glabels2/docs/libglabels/Makefile.am rename to docs/libglabels/Makefile.am diff --git a/glabels2/docs/libglabels/libglabels-decl-list.txt b/docs/libglabels/libglabels-decl-list.txt similarity index 100% rename from glabels2/docs/libglabels/libglabels-decl-list.txt rename to docs/libglabels/libglabels-decl-list.txt diff --git a/glabels2/docs/libglabels/libglabels-docs.sgml b/docs/libglabels/libglabels-docs.sgml similarity index 100% rename from glabels2/docs/libglabels/libglabels-docs.sgml rename to docs/libglabels/libglabels-docs.sgml diff --git a/glabels2/docs/libglabels/libglabels-overrides.txt b/docs/libglabels/libglabels-overrides.txt similarity index 100% rename from glabels2/docs/libglabels/libglabels-overrides.txt rename to docs/libglabels/libglabels-overrides.txt diff --git a/glabels2/docs/libglabels/libglabels-sections.txt b/docs/libglabels/libglabels-sections.txt similarity index 100% rename from glabels2/docs/libglabels/libglabels-sections.txt rename to docs/libglabels/libglabels-sections.txt diff --git a/glabels2/docs/libglabels/libglabels-undocumented.txt b/docs/libglabels/libglabels-undocumented.txt similarity index 100% rename from glabels2/docs/libglabels/libglabels-undocumented.txt rename to docs/libglabels/libglabels-undocumented.txt diff --git a/glabels2/docs/libglabels/libglabels.types b/docs/libglabels/libglabels.types similarity index 100% rename from glabels2/docs/libglabels/libglabels.types rename to docs/libglabels/libglabels.types diff --git a/glabels2/docs/libglabels/tmpl/category.sgml b/docs/libglabels/tmpl/category.sgml similarity index 100% rename from glabels2/docs/libglabels/tmpl/category.sgml rename to docs/libglabels/tmpl/category.sgml diff --git a/glabels2/docs/libglabels/tmpl/db.sgml b/docs/libglabels/tmpl/db.sgml similarity index 100% rename from glabels2/docs/libglabels/tmpl/db.sgml rename to docs/libglabels/tmpl/db.sgml diff --git a/glabels2/docs/libglabels/tmpl/enums.sgml b/docs/libglabels/tmpl/enums.sgml similarity index 100% rename from glabels2/docs/libglabels/tmpl/enums.sgml rename to docs/libglabels/tmpl/enums.sgml diff --git a/glabels2/docs/libglabels/tmpl/libglabels-unused.sgml b/docs/libglabels/tmpl/libglabels-unused.sgml similarity index 100% rename from glabels2/docs/libglabels/tmpl/libglabels-unused.sgml rename to docs/libglabels/tmpl/libglabels-unused.sgml diff --git a/glabels2/docs/libglabels/tmpl/libglabels.sgml b/docs/libglabels/tmpl/libglabels.sgml similarity index 100% rename from glabels2/docs/libglabels/tmpl/libglabels.sgml rename to docs/libglabels/tmpl/libglabels.sgml diff --git a/glabels2/docs/libglabels/tmpl/paper.sgml b/docs/libglabels/tmpl/paper.sgml similarity index 100% rename from glabels2/docs/libglabels/tmpl/paper.sgml rename to docs/libglabels/tmpl/paper.sgml diff --git a/glabels2/docs/libglabels/tmpl/str.sgml b/docs/libglabels/tmpl/str.sgml similarity index 100% rename from glabels2/docs/libglabels/tmpl/str.sgml rename to docs/libglabels/tmpl/str.sgml diff --git a/glabels2/docs/libglabels/tmpl/template.sgml b/docs/libglabels/tmpl/template.sgml similarity index 100% rename from glabels2/docs/libglabels/tmpl/template.sgml rename to docs/libglabels/tmpl/template.sgml diff --git a/glabels2/docs/libglabels/tmpl/xml-category.sgml b/docs/libglabels/tmpl/xml-category.sgml similarity index 100% rename from glabels2/docs/libglabels/tmpl/xml-category.sgml rename to docs/libglabels/tmpl/xml-category.sgml diff --git a/glabels2/docs/libglabels/tmpl/xml-paper.sgml b/docs/libglabels/tmpl/xml-paper.sgml similarity index 100% rename from glabels2/docs/libglabels/tmpl/xml-paper.sgml rename to docs/libglabels/tmpl/xml-paper.sgml diff --git a/glabels2/docs/libglabels/tmpl/xml-template.sgml b/docs/libglabels/tmpl/xml-template.sgml similarity index 100% rename from glabels2/docs/libglabels/tmpl/xml-template.sgml rename to docs/libglabels/tmpl/xml-template.sgml diff --git a/glabels2/docs/libglabels/tmpl/xml.sgml b/docs/libglabels/tmpl/xml.sgml similarity index 100% rename from glabels2/docs/libglabels/tmpl/xml.sgml rename to docs/libglabels/tmpl/xml.sgml diff --git a/glabels2/glabels.spec.in b/glabels.spec.in similarity index 100% rename from glabels2/glabels.spec.in rename to glabels.spec.in diff --git a/glabels2/gtk-doc.make b/gtk-doc.make similarity index 100% rename from glabels2/gtk-doc.make rename to gtk-doc.make diff --git a/glabels2/help/C/Makefile.am b/help/C/Makefile.am similarity index 100% rename from glabels2/help/C/Makefile.am rename to help/C/Makefile.am diff --git a/glabels2/help/C/figures/glabels-template-cd.png b/help/C/figures/glabels-template-cd.png similarity index 100% rename from glabels2/help/C/figures/glabels-template-cd.png rename to help/C/figures/glabels-template-cd.png diff --git a/glabels2/help/C/figures/glabels-template-label.png b/help/C/figures/glabels-template-label.png similarity index 100% rename from glabels2/help/C/figures/glabels-template-label.png rename to help/C/figures/glabels-template-label.png diff --git a/glabels2/help/C/figures/glabels-template-layout.png b/help/C/figures/glabels-template-layout.png similarity index 100% rename from glabels2/help/C/figures/glabels-template-layout.png rename to help/C/figures/glabels-template-layout.png diff --git a/glabels2/help/C/figures/main-window-empty.png b/help/C/figures/main-window-empty.png similarity index 100% rename from glabels2/help/C/figures/main-window-empty.png rename to help/C/figures/main-window-empty.png diff --git a/glabels2/help/C/figures/merge-ex1-1.png b/help/C/figures/merge-ex1-1.png similarity index 100% rename from glabels2/help/C/figures/merge-ex1-1.png rename to help/C/figures/merge-ex1-1.png diff --git a/glabels2/help/C/figures/merge-ex1-2.png b/help/C/figures/merge-ex1-2.png similarity index 100% rename from glabels2/help/C/figures/merge-ex1-2.png rename to help/C/figures/merge-ex1-2.png diff --git a/glabels2/help/C/figures/merge-ex1-3.png b/help/C/figures/merge-ex1-3.png similarity index 100% rename from glabels2/help/C/figures/merge-ex1-3.png rename to help/C/figures/merge-ex1-3.png diff --git a/glabels2/help/C/figures/merge-ex1-4.png b/help/C/figures/merge-ex1-4.png similarity index 100% rename from glabels2/help/C/figures/merge-ex1-4.png rename to help/C/figures/merge-ex1-4.png diff --git a/glabels2/help/C/figures/merge-ex2-1.png b/help/C/figures/merge-ex2-1.png similarity index 100% rename from glabels2/help/C/figures/merge-ex2-1.png rename to help/C/figures/merge-ex2-1.png diff --git a/glabels2/help/C/figures/merge-ex2-2.png b/help/C/figures/merge-ex2-2.png similarity index 100% rename from glabels2/help/C/figures/merge-ex2-2.png rename to help/C/figures/merge-ex2-2.png diff --git a/glabels2/help/C/figures/merge-ex2-3.png b/help/C/figures/merge-ex2-3.png similarity index 100% rename from glabels2/help/C/figures/merge-ex2-3.png rename to help/C/figures/merge-ex2-3.png diff --git a/glabels2/help/C/figures/merge-ex2-4.png b/help/C/figures/merge-ex2-4.png similarity index 100% rename from glabels2/help/C/figures/merge-ex2-4.png rename to help/C/figures/merge-ex2-4.png diff --git a/glabels2/help/C/figures/object-editor-sidebar.png b/help/C/figures/object-editor-sidebar.png similarity index 100% rename from glabels2/help/C/figures/object-editor-sidebar.png rename to help/C/figures/object-editor-sidebar.png diff --git a/glabels2/help/C/figures/print-copies.png b/help/C/figures/print-copies.png similarity index 100% rename from glabels2/help/C/figures/print-copies.png rename to help/C/figures/print-copies.png diff --git a/glabels2/help/C/figures/print-merge.png b/help/C/figures/print-merge.png similarity index 100% rename from glabels2/help/C/figures/print-merge.png rename to help/C/figures/print-merge.png diff --git a/glabels2/help/C/glabels-C.omf b/help/C/glabels-C.omf similarity index 100% rename from glabels2/help/C/glabels-C.omf rename to help/C/glabels-C.omf diff --git a/glabels2/help/C/glabels.xml b/help/C/glabels.xml similarity index 100% rename from glabels2/help/C/glabels.xml rename to help/C/glabels.xml diff --git a/glabels2/help/C/legal.xml b/help/C/legal.xml similarity index 100% rename from glabels2/help/C/legal.xml rename to help/C/legal.xml diff --git a/glabels2/help/Makefile.am b/help/Makefile.am similarity index 100% rename from glabels2/help/Makefile.am rename to help/Makefile.am diff --git a/glabels2/iec16022-0.2.1/BUGS b/iec16022-0.2.1/BUGS similarity index 100% rename from glabels2/iec16022-0.2.1/BUGS rename to iec16022-0.2.1/BUGS diff --git a/glabels2/iec16022-0.2.1/CHANGELOG b/iec16022-0.2.1/CHANGELOG similarity index 100% rename from glabels2/iec16022-0.2.1/CHANGELOG rename to iec16022-0.2.1/CHANGELOG diff --git a/glabels2/iec16022-0.2.1/CREDITS b/iec16022-0.2.1/CREDITS similarity index 100% rename from glabels2/iec16022-0.2.1/CREDITS rename to iec16022-0.2.1/CREDITS diff --git a/glabels2/iec16022-0.2.1/INSTALL b/iec16022-0.2.1/INSTALL similarity index 100% rename from glabels2/iec16022-0.2.1/INSTALL rename to iec16022-0.2.1/INSTALL diff --git a/glabels2/iec16022-0.2.1/LICENSE b/iec16022-0.2.1/LICENSE similarity index 100% rename from glabels2/iec16022-0.2.1/LICENSE rename to iec16022-0.2.1/LICENSE diff --git a/glabels2/iec16022-0.2.1/Makefile.am b/iec16022-0.2.1/Makefile.am similarity index 100% rename from glabels2/iec16022-0.2.1/Makefile.am rename to iec16022-0.2.1/Makefile.am diff --git a/glabels2/iec16022-0.2.1/Makefile.dist b/iec16022-0.2.1/Makefile.dist similarity index 100% rename from glabels2/iec16022-0.2.1/Makefile.dist rename to iec16022-0.2.1/Makefile.dist diff --git a/glabels2/iec16022-0.2.1/README b/iec16022-0.2.1/README similarity index 100% rename from glabels2/iec16022-0.2.1/README rename to iec16022-0.2.1/README diff --git a/glabels2/iec16022-0.2.1/README.glabels b/iec16022-0.2.1/README.glabels similarity index 100% rename from glabels2/iec16022-0.2.1/README.glabels rename to iec16022-0.2.1/README.glabels diff --git a/glabels2/iec16022-0.2.1/TODO b/iec16022-0.2.1/TODO similarity index 100% rename from glabels2/iec16022-0.2.1/TODO rename to iec16022-0.2.1/TODO diff --git a/glabels2/iec16022-0.2.1/iec16022.1 b/iec16022-0.2.1/iec16022.1 similarity index 100% rename from glabels2/iec16022-0.2.1/iec16022.1 rename to iec16022-0.2.1/iec16022.1 diff --git a/glabels2/iec16022-0.2.1/iec16022.c b/iec16022-0.2.1/iec16022.c similarity index 100% rename from glabels2/iec16022-0.2.1/iec16022.c rename to iec16022-0.2.1/iec16022.c diff --git a/glabels2/iec16022-0.2.1/iec16022ecc200.c b/iec16022-0.2.1/iec16022ecc200.c similarity index 100% rename from glabels2/iec16022-0.2.1/iec16022ecc200.c rename to iec16022-0.2.1/iec16022ecc200.c diff --git a/glabels2/iec16022-0.2.1/iec16022ecc200.h b/iec16022-0.2.1/iec16022ecc200.h similarity index 100% rename from glabels2/iec16022-0.2.1/iec16022ecc200.h rename to iec16022-0.2.1/iec16022ecc200.h diff --git a/glabels2/iec16022-0.2.1/image.c b/iec16022-0.2.1/image.c similarity index 100% rename from glabels2/iec16022-0.2.1/image.c rename to iec16022-0.2.1/image.c diff --git a/glabels2/iec16022-0.2.1/image.h b/iec16022-0.2.1/image.h similarity index 100% rename from glabels2/iec16022-0.2.1/image.h rename to iec16022-0.2.1/image.h diff --git a/glabels2/iec16022-0.2.1/reedsol.c b/iec16022-0.2.1/reedsol.c similarity index 100% rename from glabels2/iec16022-0.2.1/reedsol.c rename to iec16022-0.2.1/reedsol.c diff --git a/glabels2/iec16022-0.2.1/reedsol.h b/iec16022-0.2.1/reedsol.h similarity index 100% rename from glabels2/iec16022-0.2.1/reedsol.h rename to iec16022-0.2.1/reedsol.h diff --git a/glabels2/iec16022-0.2.1/test/testsuite-example.bin b/iec16022-0.2.1/test/testsuite-example.bin similarity index 100% rename from glabels2/iec16022-0.2.1/test/testsuite-example.bin rename to iec16022-0.2.1/test/testsuite-example.bin diff --git a/glabels2/iec16022-0.2.1/test/testsuite-example.eps b/iec16022-0.2.1/test/testsuite-example.eps similarity index 100% rename from glabels2/iec16022-0.2.1/test/testsuite-example.eps rename to iec16022-0.2.1/test/testsuite-example.eps diff --git a/glabels2/iec16022-0.2.1/test/testsuite-example.hex b/iec16022-0.2.1/test/testsuite-example.hex similarity index 100% rename from glabels2/iec16022-0.2.1/test/testsuite-example.hex rename to iec16022-0.2.1/test/testsuite-example.hex diff --git a/glabels2/iec16022-0.2.1/test/testsuite-example.png b/iec16022-0.2.1/test/testsuite-example.png similarity index 100% rename from glabels2/iec16022-0.2.1/test/testsuite-example.png rename to iec16022-0.2.1/test/testsuite-example.png diff --git a/glabels2/iec16022-0.2.1/test/testsuite-example.text b/iec16022-0.2.1/test/testsuite-example.text similarity index 100% rename from glabels2/iec16022-0.2.1/test/testsuite-example.text rename to iec16022-0.2.1/test/testsuite-example.text diff --git a/glabels2/iec16022-0.2.1/test/testsuite.sh b/iec16022-0.2.1/test/testsuite.sh similarity index 100% rename from glabels2/iec16022-0.2.1/test/testsuite.sh rename to iec16022-0.2.1/test/testsuite.sh diff --git a/glabels2/libglabels/Makefile.am b/libglabels/Makefile.am similarity index 100% rename from glabels2/libglabels/Makefile.am rename to libglabels/Makefile.am diff --git a/glabels2/libglabels/category.c b/libglabels/category.c similarity index 100% rename from glabels2/libglabels/category.c rename to libglabels/category.c diff --git a/glabels2/libglabels/category.h b/libglabels/category.h similarity index 100% rename from glabels2/libglabels/category.h rename to libglabels/category.h diff --git a/glabels2/libglabels/db.c b/libglabels/db.c similarity index 100% rename from glabels2/libglabels/db.c rename to libglabels/db.c diff --git a/glabels2/libglabels/db.h b/libglabels/db.h similarity index 100% rename from glabels2/libglabels/db.h rename to libglabels/db.h diff --git a/glabels2/libglabels/enums.h b/libglabels/enums.h similarity index 100% rename from glabels2/libglabels/enums.h rename to libglabels/enums.h diff --git a/glabels2/libglabels/libglabels-private.h b/libglabels/libglabels-private.h similarity index 100% rename from glabels2/libglabels/libglabels-private.h rename to libglabels/libglabels-private.h diff --git a/glabels2/libglabels/libglabels.h b/libglabels/libglabels.h similarity index 100% rename from glabels2/libglabels/libglabels.h rename to libglabels/libglabels.h diff --git a/glabels2/libglabels/libglabels.pc.in b/libglabels/libglabels.pc.in similarity index 100% rename from glabels2/libglabels/libglabels.pc.in rename to libglabels/libglabels.pc.in diff --git a/glabels2/libglabels/paper.c b/libglabels/paper.c similarity index 100% rename from glabels2/libglabels/paper.c rename to libglabels/paper.c diff --git a/glabels2/libglabels/paper.h b/libglabels/paper.h similarity index 100% rename from glabels2/libglabels/paper.h rename to libglabels/paper.h diff --git a/glabels2/libglabels/str.c b/libglabels/str.c similarity index 100% rename from glabels2/libglabels/str.c rename to libglabels/str.c diff --git a/glabels2/libglabels/str.h b/libglabels/str.h similarity index 100% rename from glabels2/libglabels/str.h rename to libglabels/str.h diff --git a/glabels2/libglabels/template.c b/libglabels/template.c similarity index 100% rename from glabels2/libglabels/template.c rename to libglabels/template.c diff --git a/glabels2/libglabels/template.h b/libglabels/template.h similarity index 100% rename from glabels2/libglabels/template.h rename to libglabels/template.h diff --git a/glabels2/libglabels/xml-category.c b/libglabels/xml-category.c similarity index 100% rename from glabels2/libglabels/xml-category.c rename to libglabels/xml-category.c diff --git a/glabels2/libglabels/xml-category.h b/libglabels/xml-category.h similarity index 100% rename from glabels2/libglabels/xml-category.h rename to libglabels/xml-category.h diff --git a/glabels2/libglabels/xml-paper.c b/libglabels/xml-paper.c similarity index 100% rename from glabels2/libglabels/xml-paper.c rename to libglabels/xml-paper.c diff --git a/glabels2/libglabels/xml-paper.h b/libglabels/xml-paper.h similarity index 100% rename from glabels2/libglabels/xml-paper.h rename to libglabels/xml-paper.h diff --git a/glabels2/libglabels/xml-template.c b/libglabels/xml-template.c similarity index 100% rename from glabels2/libglabels/xml-template.c rename to libglabels/xml-template.c diff --git a/glabels2/libglabels/xml-template.h b/libglabels/xml-template.h similarity index 100% rename from glabels2/libglabels/xml-template.h rename to libglabels/xml-template.h diff --git a/glabels2/libglabels/xml.c b/libglabels/xml.c similarity index 100% rename from glabels2/libglabels/xml.c rename to libglabels/xml.c diff --git a/glabels2/libglabels/xml.h b/libglabels/xml.h similarity index 100% rename from glabels2/libglabels/xml.h rename to libglabels/xml.h diff --git a/glabels2/po/POTFILES.in b/po/POTFILES.in similarity index 100% rename from glabels2/po/POTFILES.in rename to po/POTFILES.in diff --git a/glabels2/po/cs.po b/po/cs.po similarity index 100% rename from glabels2/po/cs.po rename to po/cs.po diff --git a/glabels2/po/de.po b/po/de.po similarity index 100% rename from glabels2/po/de.po rename to po/de.po diff --git a/glabels2/po/eo.po b/po/eo.po similarity index 100% rename from glabels2/po/eo.po rename to po/eo.po diff --git a/glabels2/po/es.po b/po/es.po similarity index 100% rename from glabels2/po/es.po rename to po/es.po diff --git a/glabels2/po/fr.po b/po/fr.po similarity index 100% rename from glabels2/po/fr.po rename to po/fr.po diff --git a/glabels2/po/it.po b/po/it.po similarity index 100% rename from glabels2/po/it.po rename to po/it.po diff --git a/glabels2/po/ja.po b/po/ja.po similarity index 100% rename from glabels2/po/ja.po rename to po/ja.po diff --git a/glabels2/po/ko.po b/po/ko.po similarity index 100% rename from glabels2/po/ko.po rename to po/ko.po diff --git a/glabels2/po/pl.po b/po/pl.po similarity index 100% rename from glabels2/po/pl.po rename to po/pl.po diff --git a/glabels2/po/pt_BR.po b/po/pt_BR.po similarity index 100% rename from glabels2/po/pt_BR.po rename to po/pt_BR.po diff --git a/glabels2/po/ru.po b/po/ru.po similarity index 100% rename from glabels2/po/ru.po rename to po/ru.po diff --git a/glabels2/po/zh_TW.Big5.po b/po/zh_TW.Big5.po similarity index 100% rename from glabels2/po/zh_TW.Big5.po rename to po/zh_TW.Big5.po diff --git a/glabels2/src/Makefile.am b/src/Makefile.am similarity index 100% rename from glabels2/src/Makefile.am rename to src/Makefile.am diff --git a/glabels2/src/base64.c b/src/base64.c similarity index 100% rename from glabels2/src/base64.c rename to src/base64.c diff --git a/glabels2/src/base64.h b/src/base64.h similarity index 100% rename from glabels2/src/base64.h rename to src/base64.h diff --git a/glabels2/src/bc-gnubarcode.c b/src/bc-gnubarcode.c similarity index 100% rename from glabels2/src/bc-gnubarcode.c rename to src/bc-gnubarcode.c diff --git a/glabels2/src/bc-gnubarcode.h b/src/bc-gnubarcode.h similarity index 100% rename from glabels2/src/bc-gnubarcode.h rename to src/bc-gnubarcode.h diff --git a/glabels2/src/bc-iec16022.c b/src/bc-iec16022.c similarity index 100% rename from glabels2/src/bc-iec16022.c rename to src/bc-iec16022.c diff --git a/glabels2/src/bc-iec16022.h b/src/bc-iec16022.h similarity index 100% rename from glabels2/src/bc-iec16022.h rename to src/bc-iec16022.h diff --git a/glabels2/src/bc-postnet.c b/src/bc-postnet.c similarity index 100% rename from glabels2/src/bc-postnet.c rename to src/bc-postnet.c diff --git a/glabels2/src/bc-postnet.h b/src/bc-postnet.h similarity index 100% rename from glabels2/src/bc-postnet.h rename to src/bc-postnet.h diff --git a/glabels2/src/bc.c b/src/bc.c similarity index 100% rename from glabels2/src/bc.c rename to src/bc.c diff --git a/glabels2/src/bc.h b/src/bc.h similarity index 100% rename from glabels2/src/bc.h rename to src/bc.h diff --git a/glabels2/src/cairo-ellipse-path.c b/src/cairo-ellipse-path.c similarity index 100% rename from glabels2/src/cairo-ellipse-path.c rename to src/cairo-ellipse-path.c diff --git a/glabels2/src/cairo-ellipse-path.h b/src/cairo-ellipse-path.h similarity index 100% rename from glabels2/src/cairo-ellipse-path.h rename to src/cairo-ellipse-path.h diff --git a/glabels2/src/cairo-label-path.c b/src/cairo-label-path.c similarity index 100% rename from glabels2/src/cairo-label-path.c rename to src/cairo-label-path.c diff --git a/glabels2/src/cairo-label-path.h b/src/cairo-label-path.h similarity index 100% rename from glabels2/src/cairo-label-path.h rename to src/cairo-label-path.h diff --git a/glabels2/src/cairo-markup-path.c b/src/cairo-markup-path.c similarity index 100% rename from glabels2/src/cairo-markup-path.c rename to src/cairo-markup-path.c diff --git a/glabels2/src/cairo-markup-path.h b/src/cairo-markup-path.h similarity index 100% rename from glabels2/src/cairo-markup-path.h rename to src/cairo-markup-path.h diff --git a/glabels2/src/color.c b/src/color.c similarity index 100% rename from glabels2/src/color.c rename to src/color.c diff --git a/glabels2/src/color.h b/src/color.h similarity index 100% rename from glabels2/src/color.h rename to src/color.h diff --git a/glabels2/src/critical-error-handler.c b/src/critical-error-handler.c similarity index 100% rename from glabels2/src/critical-error-handler.c rename to src/critical-error-handler.c diff --git a/glabels2/src/critical-error-handler.h b/src/critical-error-handler.h similarity index 100% rename from glabels2/src/critical-error-handler.h rename to src/critical-error-handler.h diff --git a/glabels2/src/debug.c b/src/debug.c similarity index 100% rename from glabels2/src/debug.c rename to src/debug.c diff --git a/glabels2/src/debug.h b/src/debug.h similarity index 100% rename from glabels2/src/debug.h rename to src/debug.h diff --git a/glabels2/src/file.c b/src/file.c similarity index 100% rename from glabels2/src/file.c rename to src/file.c diff --git a/glabels2/src/file.h b/src/file.h similarity index 100% rename from glabels2/src/file.h rename to src/file.h diff --git a/glabels2/src/glabels-batch.c b/src/glabels-batch.c similarity index 100% rename from glabels2/src/glabels-batch.c rename to src/glabels-batch.c diff --git a/glabels2/src/glabels.c b/src/glabels.c similarity index 100% rename from glabels2/src/glabels.c rename to src/glabels.c diff --git a/glabels2/src/hig.h b/src/hig.h similarity index 100% rename from glabels2/src/hig.h rename to src/hig.h diff --git a/glabels2/src/label-barcode.c b/src/label-barcode.c similarity index 100% rename from glabels2/src/label-barcode.c rename to src/label-barcode.c diff --git a/glabels2/src/label-barcode.h b/src/label-barcode.h similarity index 100% rename from glabels2/src/label-barcode.h rename to src/label-barcode.h diff --git a/glabels2/src/label-box.c b/src/label-box.c similarity index 100% rename from glabels2/src/label-box.c rename to src/label-box.c diff --git a/glabels2/src/label-box.h b/src/label-box.h similarity index 100% rename from glabels2/src/label-box.h rename to src/label-box.h diff --git a/glabels2/src/label-ellipse.c b/src/label-ellipse.c similarity index 100% rename from glabels2/src/label-ellipse.c rename to src/label-ellipse.c diff --git a/glabels2/src/label-ellipse.h b/src/label-ellipse.h similarity index 100% rename from glabels2/src/label-ellipse.h rename to src/label-ellipse.h diff --git a/glabels2/src/label-image.c b/src/label-image.c similarity index 100% rename from glabels2/src/label-image.c rename to src/label-image.c diff --git a/glabels2/src/label-image.h b/src/label-image.h similarity index 100% rename from glabels2/src/label-image.h rename to src/label-image.h diff --git a/glabels2/src/label-line.c b/src/label-line.c similarity index 100% rename from glabels2/src/label-line.c rename to src/label-line.c diff --git a/glabels2/src/label-line.h b/src/label-line.h similarity index 100% rename from glabels2/src/label-line.h rename to src/label-line.h diff --git a/glabels2/src/label-object.c b/src/label-object.c similarity index 100% rename from glabels2/src/label-object.c rename to src/label-object.c diff --git a/glabels2/src/label-object.h b/src/label-object.h similarity index 100% rename from glabels2/src/label-object.h rename to src/label-object.h diff --git a/glabels2/src/label-text.c b/src/label-text.c similarity index 100% rename from glabels2/src/label-text.c rename to src/label-text.c diff --git a/glabels2/src/label-text.h b/src/label-text.h similarity index 100% rename from glabels2/src/label-text.h rename to src/label-text.h diff --git a/glabels2/src/label.c b/src/label.c similarity index 100% rename from glabels2/src/label.c rename to src/label.c diff --git a/glabels2/src/label.h b/src/label.h similarity index 100% rename from glabels2/src/label.h rename to src/label.h diff --git a/glabels2/src/marshal.list b/src/marshal.list similarity index 100% rename from glabels2/src/marshal.list rename to src/marshal.list diff --git a/glabels2/src/merge-evolution.c b/src/merge-evolution.c similarity index 100% rename from glabels2/src/merge-evolution.c rename to src/merge-evolution.c diff --git a/glabels2/src/merge-evolution.h b/src/merge-evolution.h similarity index 100% rename from glabels2/src/merge-evolution.h rename to src/merge-evolution.h diff --git a/glabels2/src/merge-init.c b/src/merge-init.c similarity index 100% rename from glabels2/src/merge-init.c rename to src/merge-init.c diff --git a/glabels2/src/merge-init.h b/src/merge-init.h similarity index 100% rename from glabels2/src/merge-init.h rename to src/merge-init.h diff --git a/glabels2/src/merge-properties-dialog.c b/src/merge-properties-dialog.c similarity index 100% rename from glabels2/src/merge-properties-dialog.c rename to src/merge-properties-dialog.c diff --git a/glabels2/src/merge-properties-dialog.h b/src/merge-properties-dialog.h similarity index 100% rename from glabels2/src/merge-properties-dialog.h rename to src/merge-properties-dialog.h diff --git a/glabels2/src/merge-text.c b/src/merge-text.c similarity index 100% rename from glabels2/src/merge-text.c rename to src/merge-text.c diff --git a/glabels2/src/merge-text.h b/src/merge-text.h similarity index 100% rename from glabels2/src/merge-text.h rename to src/merge-text.h diff --git a/glabels2/src/merge-vcard.c b/src/merge-vcard.c similarity index 100% rename from glabels2/src/merge-vcard.c rename to src/merge-vcard.c diff --git a/glabels2/src/merge-vcard.h b/src/merge-vcard.h similarity index 100% rename from glabels2/src/merge-vcard.h rename to src/merge-vcard.h diff --git a/glabels2/src/merge.c b/src/merge.c similarity index 100% rename from glabels2/src/merge.c rename to src/merge.c diff --git a/glabels2/src/merge.h b/src/merge.h similarity index 100% rename from glabels2/src/merge.h rename to src/merge.h diff --git a/glabels2/src/mini-preview-pixbuf-cache.c b/src/mini-preview-pixbuf-cache.c similarity index 100% rename from glabels2/src/mini-preview-pixbuf-cache.c rename to src/mini-preview-pixbuf-cache.c diff --git a/glabels2/src/mini-preview-pixbuf-cache.h b/src/mini-preview-pixbuf-cache.h similarity index 100% rename from glabels2/src/mini-preview-pixbuf-cache.h rename to src/mini-preview-pixbuf-cache.h diff --git a/glabels2/src/mini-preview-pixbuf.c b/src/mini-preview-pixbuf.c similarity index 100% rename from glabels2/src/mini-preview-pixbuf.c rename to src/mini-preview-pixbuf.c diff --git a/glabels2/src/mini-preview-pixbuf.h b/src/mini-preview-pixbuf.h similarity index 100% rename from glabels2/src/mini-preview-pixbuf.h rename to src/mini-preview-pixbuf.h diff --git a/glabels2/src/mygal/Makefile.am b/src/mygal/Makefile.am similarity index 100% rename from glabels2/src/mygal/Makefile.am rename to src/mygal/Makefile.am diff --git a/glabels2/src/mygal/color-group.c b/src/mygal/color-group.c similarity index 100% rename from glabels2/src/mygal/color-group.c rename to src/mygal/color-group.c diff --git a/glabels2/src/mygal/color-group.h b/src/mygal/color-group.h similarity index 100% rename from glabels2/src/mygal/color-group.h rename to src/mygal/color-group.h diff --git a/glabels2/src/mygal/color-palette.c b/src/mygal/color-palette.c similarity index 100% rename from glabels2/src/mygal/color-palette.c rename to src/mygal/color-palette.c diff --git a/glabels2/src/mygal/color-palette.h b/src/mygal/color-palette.h similarity index 100% rename from glabels2/src/mygal/color-palette.h rename to src/mygal/color-palette.h diff --git a/glabels2/src/mygal/e-colors.c b/src/mygal/e-colors.c similarity index 100% rename from glabels2/src/mygal/e-colors.c rename to src/mygal/e-colors.c diff --git a/glabels2/src/mygal/e-colors.h b/src/mygal/e-colors.h similarity index 100% rename from glabels2/src/mygal/e-colors.h rename to src/mygal/e-colors.h diff --git a/glabels2/src/mygal/e-marshal.list b/src/mygal/e-marshal.list similarity index 100% rename from glabels2/src/mygal/e-marshal.list rename to src/mygal/e-marshal.list diff --git a/glabels2/src/mygal/e-util.h b/src/mygal/e-util.h similarity index 100% rename from glabels2/src/mygal/e-util.h rename to src/mygal/e-util.h diff --git a/glabels2/src/mygal/mygal-combo-box.c b/src/mygal/mygal-combo-box.c similarity index 100% rename from glabels2/src/mygal/mygal-combo-box.c rename to src/mygal/mygal-combo-box.c diff --git a/glabels2/src/mygal/mygal-combo-box.h b/src/mygal/mygal-combo-box.h similarity index 100% rename from glabels2/src/mygal/mygal-combo-box.h rename to src/mygal/mygal-combo-box.h diff --git a/glabels2/src/mygal/widget-color-combo.c b/src/mygal/widget-color-combo.c similarity index 100% rename from glabels2/src/mygal/widget-color-combo.c rename to src/mygal/widget-color-combo.c diff --git a/glabels2/src/mygal/widget-color-combo.h b/src/mygal/widget-color-combo.h similarity index 100% rename from glabels2/src/mygal/widget-color-combo.h rename to src/mygal/widget-color-combo.h diff --git a/glabels2/src/new-label-dialog.c b/src/new-label-dialog.c similarity index 100% rename from glabels2/src/new-label-dialog.c rename to src/new-label-dialog.c diff --git a/glabels2/src/new-label-dialog.h b/src/new-label-dialog.h similarity index 100% rename from glabels2/src/new-label-dialog.h rename to src/new-label-dialog.h diff --git a/glabels2/src/object-editor-bc-page.c b/src/object-editor-bc-page.c similarity index 100% rename from glabels2/src/object-editor-bc-page.c rename to src/object-editor-bc-page.c diff --git a/glabels2/src/object-editor-data-page.c b/src/object-editor-data-page.c similarity index 100% rename from glabels2/src/object-editor-data-page.c rename to src/object-editor-data-page.c diff --git a/glabels2/src/object-editor-edit-page.c b/src/object-editor-edit-page.c similarity index 100% rename from glabels2/src/object-editor-edit-page.c rename to src/object-editor-edit-page.c diff --git a/glabels2/src/object-editor-fill-page.c b/src/object-editor-fill-page.c similarity index 100% rename from glabels2/src/object-editor-fill-page.c rename to src/object-editor-fill-page.c diff --git a/glabels2/src/object-editor-image-page.c b/src/object-editor-image-page.c similarity index 100% rename from glabels2/src/object-editor-image-page.c rename to src/object-editor-image-page.c diff --git a/glabels2/src/object-editor-line-page.c b/src/object-editor-line-page.c similarity index 100% rename from glabels2/src/object-editor-line-page.c rename to src/object-editor-line-page.c diff --git a/glabels2/src/object-editor-lsize-page.c b/src/object-editor-lsize-page.c similarity index 100% rename from glabels2/src/object-editor-lsize-page.c rename to src/object-editor-lsize-page.c diff --git a/glabels2/src/object-editor-position-page.c b/src/object-editor-position-page.c similarity index 100% rename from glabels2/src/object-editor-position-page.c rename to src/object-editor-position-page.c diff --git a/glabels2/src/object-editor-private.h b/src/object-editor-private.h similarity index 100% rename from glabels2/src/object-editor-private.h rename to src/object-editor-private.h diff --git a/glabels2/src/object-editor-shadow-page.c b/src/object-editor-shadow-page.c similarity index 100% rename from glabels2/src/object-editor-shadow-page.c rename to src/object-editor-shadow-page.c diff --git a/glabels2/src/object-editor-size-page.c b/src/object-editor-size-page.c similarity index 100% rename from glabels2/src/object-editor-size-page.c rename to src/object-editor-size-page.c diff --git a/glabels2/src/object-editor-text-page.c b/src/object-editor-text-page.c similarity index 100% rename from glabels2/src/object-editor-text-page.c rename to src/object-editor-text-page.c diff --git a/glabels2/src/object-editor.c b/src/object-editor.c similarity index 100% rename from glabels2/src/object-editor.c rename to src/object-editor.c diff --git a/glabels2/src/object-editor.h b/src/object-editor.h similarity index 100% rename from glabels2/src/object-editor.h rename to src/object-editor.h diff --git a/glabels2/src/pixbuf-cache.c b/src/pixbuf-cache.c similarity index 100% rename from glabels2/src/pixbuf-cache.c rename to src/pixbuf-cache.c diff --git a/glabels2/src/pixbuf-cache.h b/src/pixbuf-cache.h similarity index 100% rename from glabels2/src/pixbuf-cache.h rename to src/pixbuf-cache.h diff --git a/glabels2/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am similarity index 100% rename from glabels2/src/pixmaps/Makefile.am rename to src/pixmaps/Makefile.am diff --git a/glabels2/src/pixmaps/checkerboard.xpm b/src/pixmaps/checkerboard.xpm similarity index 100% rename from glabels2/src/pixmaps/checkerboard.xpm rename to src/pixmaps/checkerboard.xpm diff --git a/glabels2/src/pixmaps/collate.xpm b/src/pixmaps/collate.xpm similarity index 100% rename from glabels2/src/pixmaps/collate.xpm rename to src/pixmaps/collate.xpm diff --git a/glabels2/src/pixmaps/cursor_barcode.xbm b/src/pixmaps/cursor_barcode.xbm similarity index 100% rename from glabels2/src/pixmaps/cursor_barcode.xbm rename to src/pixmaps/cursor_barcode.xbm diff --git a/glabels2/src/pixmaps/cursor_barcode_mask.xbm b/src/pixmaps/cursor_barcode_mask.xbm similarity index 100% rename from glabels2/src/pixmaps/cursor_barcode_mask.xbm rename to src/pixmaps/cursor_barcode_mask.xbm diff --git a/glabels2/src/pixmaps/cursor_box.xbm b/src/pixmaps/cursor_box.xbm similarity index 100% rename from glabels2/src/pixmaps/cursor_box.xbm rename to src/pixmaps/cursor_box.xbm diff --git a/glabels2/src/pixmaps/cursor_box_mask.xbm b/src/pixmaps/cursor_box_mask.xbm similarity index 100% rename from glabels2/src/pixmaps/cursor_box_mask.xbm rename to src/pixmaps/cursor_box_mask.xbm diff --git a/glabels2/src/pixmaps/cursor_ellipse.xbm b/src/pixmaps/cursor_ellipse.xbm similarity index 100% rename from glabels2/src/pixmaps/cursor_ellipse.xbm rename to src/pixmaps/cursor_ellipse.xbm diff --git a/glabels2/src/pixmaps/cursor_ellipse_mask.xbm b/src/pixmaps/cursor_ellipse_mask.xbm similarity index 100% rename from glabels2/src/pixmaps/cursor_ellipse_mask.xbm rename to src/pixmaps/cursor_ellipse_mask.xbm diff --git a/glabels2/src/pixmaps/cursor_image.xbm b/src/pixmaps/cursor_image.xbm similarity index 100% rename from glabels2/src/pixmaps/cursor_image.xbm rename to src/pixmaps/cursor_image.xbm diff --git a/glabels2/src/pixmaps/cursor_image_mask.xbm b/src/pixmaps/cursor_image_mask.xbm similarity index 100% rename from glabels2/src/pixmaps/cursor_image_mask.xbm rename to src/pixmaps/cursor_image_mask.xbm diff --git a/glabels2/src/pixmaps/cursor_line.xbm b/src/pixmaps/cursor_line.xbm similarity index 100% rename from glabels2/src/pixmaps/cursor_line.xbm rename to src/pixmaps/cursor_line.xbm diff --git a/glabels2/src/pixmaps/cursor_line_mask.xbm b/src/pixmaps/cursor_line_mask.xbm similarity index 100% rename from glabels2/src/pixmaps/cursor_line_mask.xbm rename to src/pixmaps/cursor_line_mask.xbm diff --git a/glabels2/src/pixmaps/cursor_text.xbm b/src/pixmaps/cursor_text.xbm similarity index 100% rename from glabels2/src/pixmaps/cursor_text.xbm rename to src/pixmaps/cursor_text.xbm diff --git a/glabels2/src/pixmaps/cursor_text_mask.xbm b/src/pixmaps/cursor_text_mask.xbm similarity index 100% rename from glabels2/src/pixmaps/cursor_text_mask.xbm rename to src/pixmaps/cursor_text_mask.xbm diff --git a/glabels2/src/pixmaps/nocollate.xpm b/src/pixmaps/nocollate.xpm similarity index 100% rename from glabels2/src/pixmaps/nocollate.xpm rename to src/pixmaps/nocollate.xpm diff --git a/glabels2/src/prefs-dialog.c b/src/prefs-dialog.c similarity index 100% rename from glabels2/src/prefs-dialog.c rename to src/prefs-dialog.c diff --git a/glabels2/src/prefs-dialog.h b/src/prefs-dialog.h similarity index 100% rename from glabels2/src/prefs-dialog.h rename to src/prefs-dialog.h diff --git a/glabels2/src/prefs-model.c b/src/prefs-model.c similarity index 100% rename from glabels2/src/prefs-model.c rename to src/prefs-model.c diff --git a/glabels2/src/prefs-model.h b/src/prefs-model.h similarity index 100% rename from glabels2/src/prefs-model.h rename to src/prefs-model.h diff --git a/glabels2/src/prefs.c b/src/prefs.c similarity index 100% rename from glabels2/src/prefs.c rename to src/prefs.c diff --git a/glabels2/src/prefs.h b/src/prefs.h similarity index 100% rename from glabels2/src/prefs.h rename to src/prefs.h diff --git a/glabels2/src/print-op.c b/src/print-op.c similarity index 100% rename from glabels2/src/print-op.c rename to src/print-op.c diff --git a/glabels2/src/print-op.h b/src/print-op.h similarity index 100% rename from glabels2/src/print-op.h rename to src/print-op.h diff --git a/glabels2/src/print.c b/src/print.c similarity index 100% rename from glabels2/src/print.c rename to src/print.c diff --git a/glabels2/src/print.h b/src/print.h similarity index 100% rename from glabels2/src/print.h rename to src/print.h diff --git a/glabels2/src/recent.c b/src/recent.c similarity index 100% rename from glabels2/src/recent.c rename to src/recent.c diff --git a/glabels2/src/recent.h b/src/recent.h similarity index 100% rename from glabels2/src/recent.h rename to src/recent.h diff --git a/glabels2/src/stock-pixmaps/Makefile.am b/src/stock-pixmaps/Makefile.am similarity index 100% rename from glabels2/src/stock-pixmaps/Makefile.am rename to src/stock-pixmaps/Makefile.am diff --git a/glabels2/src/stock-pixmaps/stock_align_bottom_16.png b/src/stock-pixmaps/stock_align_bottom_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_align_bottom_16.png rename to src/stock-pixmaps/stock_align_bottom_16.png diff --git a/glabels2/src/stock-pixmaps/stock_align_hcenter_16.png b/src/stock-pixmaps/stock_align_hcenter_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_align_hcenter_16.png rename to src/stock-pixmaps/stock_align_hcenter_16.png diff --git a/glabels2/src/stock-pixmaps/stock_align_left_16.png b/src/stock-pixmaps/stock_align_left_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_align_left_16.png rename to src/stock-pixmaps/stock_align_left_16.png diff --git a/glabels2/src/stock-pixmaps/stock_align_right_16.png b/src/stock-pixmaps/stock_align_right_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_align_right_16.png rename to src/stock-pixmaps/stock_align_right_16.png diff --git a/glabels2/src/stock-pixmaps/stock_align_top_16.png b/src/stock-pixmaps/stock_align_top_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_align_top_16.png rename to src/stock-pixmaps/stock_align_top_16.png diff --git a/glabels2/src/stock-pixmaps/stock_align_vcenter_16.png b/src/stock-pixmaps/stock_align_vcenter_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_align_vcenter_16.png rename to src/stock-pixmaps/stock_align_vcenter_16.png diff --git a/glabels2/src/stock-pixmaps/stock_arrow_16.png b/src/stock-pixmaps/stock_arrow_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_arrow_16.png rename to src/stock-pixmaps/stock_arrow_16.png diff --git a/glabels2/src/stock-pixmaps/stock_arrow_24.png b/src/stock-pixmaps/stock_arrow_24.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_arrow_24.png rename to src/stock-pixmaps/stock_arrow_24.png diff --git a/glabels2/src/stock-pixmaps/stock_barcode_16.png b/src/stock-pixmaps/stock_barcode_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_barcode_16.png rename to src/stock-pixmaps/stock_barcode_16.png diff --git a/glabels2/src/stock-pixmaps/stock_barcode_24.png b/src/stock-pixmaps/stock_barcode_24.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_barcode_24.png rename to src/stock-pixmaps/stock_barcode_24.png diff --git a/glabels2/src/stock-pixmaps/stock_box_16.png b/src/stock-pixmaps/stock_box_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_box_16.png rename to src/stock-pixmaps/stock_box_16.png diff --git a/glabels2/src/stock-pixmaps/stock_box_24.png b/src/stock-pixmaps/stock_box_24.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_box_24.png rename to src/stock-pixmaps/stock_box_24.png diff --git a/glabels2/src/stock-pixmaps/stock_bucket_fill_16.png b/src/stock-pixmaps/stock_bucket_fill_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_bucket_fill_16.png rename to src/stock-pixmaps/stock_bucket_fill_16.png diff --git a/glabels2/src/stock-pixmaps/stock_bucket_fill_24.png b/src/stock-pixmaps/stock_bucket_fill_24.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_bucket_fill_24.png rename to src/stock-pixmaps/stock_bucket_fill_24.png diff --git a/glabels2/src/stock-pixmaps/stock_center_horiz_16.png b/src/stock-pixmaps/stock_center_horiz_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_center_horiz_16.png rename to src/stock-pixmaps/stock_center_horiz_16.png diff --git a/glabels2/src/stock-pixmaps/stock_center_vert_16.png b/src/stock-pixmaps/stock_center_vert_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_center_vert_16.png rename to src/stock-pixmaps/stock_center_vert_16.png diff --git a/glabels2/src/stock-pixmaps/stock_ellipse_16.png b/src/stock-pixmaps/stock_ellipse_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_ellipse_16.png rename to src/stock-pixmaps/stock_ellipse_16.png diff --git a/glabels2/src/stock-pixmaps/stock_ellipse_24.png b/src/stock-pixmaps/stock_ellipse_24.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_ellipse_24.png rename to src/stock-pixmaps/stock_ellipse_24.png diff --git a/glabels2/src/stock-pixmaps/stock_flip_horiz_16.png b/src/stock-pixmaps/stock_flip_horiz_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_flip_horiz_16.png rename to src/stock-pixmaps/stock_flip_horiz_16.png diff --git a/glabels2/src/stock-pixmaps/stock_flip_vert_16.png b/src/stock-pixmaps/stock_flip_vert_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_flip_vert_16.png rename to src/stock-pixmaps/stock_flip_vert_16.png diff --git a/glabels2/src/stock-pixmaps/stock_hchain_24.png b/src/stock-pixmaps/stock_hchain_24.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_hchain_24.png rename to src/stock-pixmaps/stock_hchain_24.png diff --git a/glabels2/src/stock-pixmaps/stock_hchain_broken_24.png b/src/stock-pixmaps/stock_hchain_broken_24.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_hchain_broken_24.png rename to src/stock-pixmaps/stock_hchain_broken_24.png diff --git a/glabels2/src/stock-pixmaps/stock_image_16.png b/src/stock-pixmaps/stock_image_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_image_16.png rename to src/stock-pixmaps/stock_image_16.png diff --git a/glabels2/src/stock-pixmaps/stock_image_24.png b/src/stock-pixmaps/stock_image_24.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_image_24.png rename to src/stock-pixmaps/stock_image_24.png diff --git a/glabels2/src/stock-pixmaps/stock_line_16.png b/src/stock-pixmaps/stock_line_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_line_16.png rename to src/stock-pixmaps/stock_line_16.png diff --git a/glabels2/src/stock-pixmaps/stock_line_24.png b/src/stock-pixmaps/stock_line_24.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_line_24.png rename to src/stock-pixmaps/stock_line_24.png diff --git a/glabels2/src/stock-pixmaps/stock_merge_16.png b/src/stock-pixmaps/stock_merge_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_merge_16.png rename to src/stock-pixmaps/stock_merge_16.png diff --git a/glabels2/src/stock-pixmaps/stock_merge_24.png b/src/stock-pixmaps/stock_merge_24.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_merge_24.png rename to src/stock-pixmaps/stock_merge_24.png diff --git a/glabels2/src/stock-pixmaps/stock_order_bottom_16.png b/src/stock-pixmaps/stock_order_bottom_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_order_bottom_16.png rename to src/stock-pixmaps/stock_order_bottom_16.png diff --git a/glabels2/src/stock-pixmaps/stock_order_top_16.png b/src/stock-pixmaps/stock_order_top_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_order_top_16.png rename to src/stock-pixmaps/stock_order_top_16.png diff --git a/glabels2/src/stock-pixmaps/stock_pencil_16.png b/src/stock-pixmaps/stock_pencil_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_pencil_16.png rename to src/stock-pixmaps/stock_pencil_16.png diff --git a/glabels2/src/stock-pixmaps/stock_pencil_24.png b/src/stock-pixmaps/stock_pencil_24.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_pencil_24.png rename to src/stock-pixmaps/stock_pencil_24.png diff --git a/glabels2/src/stock-pixmaps/stock_properties_16.png b/src/stock-pixmaps/stock_properties_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_properties_16.png rename to src/stock-pixmaps/stock_properties_16.png diff --git a/glabels2/src/stock-pixmaps/stock_properties_24.png b/src/stock-pixmaps/stock_properties_24.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_properties_24.png rename to src/stock-pixmaps/stock_properties_24.png diff --git a/glabels2/src/stock-pixmaps/stock_rotate_left_16.png b/src/stock-pixmaps/stock_rotate_left_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_rotate_left_16.png rename to src/stock-pixmaps/stock_rotate_left_16.png diff --git a/glabels2/src/stock-pixmaps/stock_rotate_right_16.png b/src/stock-pixmaps/stock_rotate_right_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_rotate_right_16.png rename to src/stock-pixmaps/stock_rotate_right_16.png diff --git a/glabels2/src/stock-pixmaps/stock_text_16.png b/src/stock-pixmaps/stock_text_16.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_text_16.png rename to src/stock-pixmaps/stock_text_16.png diff --git a/glabels2/src/stock-pixmaps/stock_text_24.png b/src/stock-pixmaps/stock_text_24.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_text_24.png rename to src/stock-pixmaps/stock_text_24.png diff --git a/glabels2/src/stock-pixmaps/stock_vchain_24.png b/src/stock-pixmaps/stock_vchain_24.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_vchain_24.png rename to src/stock-pixmaps/stock_vchain_24.png diff --git a/glabels2/src/stock-pixmaps/stock_vchain_broken_24.png b/src/stock-pixmaps/stock_vchain_broken_24.png similarity index 100% rename from glabels2/src/stock-pixmaps/stock_vchain_broken_24.png rename to src/stock-pixmaps/stock_vchain_broken_24.png diff --git a/glabels2/src/stock.c b/src/stock.c similarity index 100% rename from glabels2/src/stock.c rename to src/stock.c diff --git a/glabels2/src/stock.h b/src/stock.h similarity index 100% rename from glabels2/src/stock.h rename to src/stock.h diff --git a/glabels2/src/template-designer.c b/src/template-designer.c similarity index 100% rename from glabels2/src/template-designer.c rename to src/template-designer.c diff --git a/glabels2/src/template-designer.h b/src/template-designer.h similarity index 100% rename from glabels2/src/template-designer.h rename to src/template-designer.h diff --git a/glabels2/src/text-node.c b/src/text-node.c similarity index 100% rename from glabels2/src/text-node.c rename to src/text-node.c diff --git a/glabels2/src/text-node.h b/src/text-node.h similarity index 100% rename from glabels2/src/text-node.h rename to src/text-node.h diff --git a/glabels2/src/ui-commands.c b/src/ui-commands.c similarity index 100% rename from glabels2/src/ui-commands.c rename to src/ui-commands.c diff --git a/glabels2/src/ui-commands.h b/src/ui-commands.h similarity index 100% rename from glabels2/src/ui-commands.h rename to src/ui-commands.h diff --git a/glabels2/src/ui-property-bar.c b/src/ui-property-bar.c similarity index 100% rename from glabels2/src/ui-property-bar.c rename to src/ui-property-bar.c diff --git a/glabels2/src/ui-property-bar.h b/src/ui-property-bar.h similarity index 100% rename from glabels2/src/ui-property-bar.h rename to src/ui-property-bar.h diff --git a/glabels2/src/ui-sidebar.c b/src/ui-sidebar.c similarity index 100% rename from glabels2/src/ui-sidebar.c rename to src/ui-sidebar.c diff --git a/glabels2/src/ui-sidebar.h b/src/ui-sidebar.h similarity index 100% rename from glabels2/src/ui-sidebar.h rename to src/ui-sidebar.h diff --git a/glabels2/src/ui-util.c b/src/ui-util.c similarity index 100% rename from glabels2/src/ui-util.c rename to src/ui-util.c diff --git a/glabels2/src/ui-util.h b/src/ui-util.h similarity index 100% rename from glabels2/src/ui-util.h rename to src/ui-util.h diff --git a/glabels2/src/ui.c b/src/ui.c similarity index 100% rename from glabels2/src/ui.c rename to src/ui.c diff --git a/glabels2/src/ui.h b/src/ui.h similarity index 100% rename from glabels2/src/ui.h rename to src/ui.h diff --git a/glabels2/src/util.c b/src/util.c similarity index 100% rename from glabels2/src/util.c rename to src/util.c diff --git a/glabels2/src/util.h b/src/util.h similarity index 100% rename from glabels2/src/util.h rename to src/util.h diff --git a/glabels2/src/view-barcode.c b/src/view-barcode.c similarity index 100% rename from glabels2/src/view-barcode.c rename to src/view-barcode.c diff --git a/glabels2/src/view-barcode.h b/src/view-barcode.h similarity index 100% rename from glabels2/src/view-barcode.h rename to src/view-barcode.h diff --git a/glabels2/src/view-box.c b/src/view-box.c similarity index 100% rename from glabels2/src/view-box.c rename to src/view-box.c diff --git a/glabels2/src/view-box.h b/src/view-box.h similarity index 100% rename from glabels2/src/view-box.h rename to src/view-box.h diff --git a/glabels2/src/view-ellipse.c b/src/view-ellipse.c similarity index 100% rename from glabels2/src/view-ellipse.c rename to src/view-ellipse.c diff --git a/glabels2/src/view-ellipse.h b/src/view-ellipse.h similarity index 100% rename from glabels2/src/view-ellipse.h rename to src/view-ellipse.h diff --git a/glabels2/src/view-image.c b/src/view-image.c similarity index 100% rename from glabels2/src/view-image.c rename to src/view-image.c diff --git a/glabels2/src/view-image.h b/src/view-image.h similarity index 100% rename from glabels2/src/view-image.h rename to src/view-image.h diff --git a/glabels2/src/view-line.c b/src/view-line.c similarity index 100% rename from glabels2/src/view-line.c rename to src/view-line.c diff --git a/glabels2/src/view-line.h b/src/view-line.h similarity index 100% rename from glabels2/src/view-line.h rename to src/view-line.h diff --git a/glabels2/src/view-object.c b/src/view-object.c similarity index 100% rename from glabels2/src/view-object.c rename to src/view-object.c diff --git a/glabels2/src/view-object.h b/src/view-object.h similarity index 100% rename from glabels2/src/view-object.h rename to src/view-object.h diff --git a/glabels2/src/view-text.c b/src/view-text.c similarity index 100% rename from glabels2/src/view-text.c rename to src/view-text.c diff --git a/glabels2/src/view-text.h b/src/view-text.h similarity index 100% rename from glabels2/src/view-text.h rename to src/view-text.h diff --git a/glabels2/src/view.c b/src/view.c similarity index 100% rename from glabels2/src/view.c rename to src/view.c diff --git a/glabels2/src/view.h b/src/view.h similarity index 100% rename from glabels2/src/view.h rename to src/view.h diff --git a/glabels2/src/warning-handler.c b/src/warning-handler.c similarity index 100% rename from glabels2/src/warning-handler.c rename to src/warning-handler.c diff --git a/glabels2/src/warning-handler.h b/src/warning-handler.h similarity index 100% rename from glabels2/src/warning-handler.h rename to src/warning-handler.h diff --git a/glabels2/src/wdgt-chain-button.c b/src/wdgt-chain-button.c similarity index 100% rename from glabels2/src/wdgt-chain-button.c rename to src/wdgt-chain-button.c diff --git a/glabels2/src/wdgt-chain-button.h b/src/wdgt-chain-button.h similarity index 100% rename from glabels2/src/wdgt-chain-button.h rename to src/wdgt-chain-button.h diff --git a/glabels2/src/wdgt-media-select.c b/src/wdgt-media-select.c similarity index 100% rename from glabels2/src/wdgt-media-select.c rename to src/wdgt-media-select.c diff --git a/glabels2/src/wdgt-media-select.h b/src/wdgt-media-select.h similarity index 100% rename from glabels2/src/wdgt-media-select.h rename to src/wdgt-media-select.h diff --git a/glabels2/src/wdgt-mini-preview.c b/src/wdgt-mini-preview.c similarity index 100% rename from glabels2/src/wdgt-mini-preview.c rename to src/wdgt-mini-preview.c diff --git a/glabels2/src/wdgt-mini-preview.h b/src/wdgt-mini-preview.h similarity index 100% rename from glabels2/src/wdgt-mini-preview.h rename to src/wdgt-mini-preview.h diff --git a/glabels2/src/wdgt-print-copies.c b/src/wdgt-print-copies.c similarity index 100% rename from glabels2/src/wdgt-print-copies.c rename to src/wdgt-print-copies.c diff --git a/glabels2/src/wdgt-print-copies.h b/src/wdgt-print-copies.h similarity index 100% rename from glabels2/src/wdgt-print-copies.h rename to src/wdgt-print-copies.h diff --git a/glabels2/src/wdgt-print-merge.c b/src/wdgt-print-merge.c similarity index 100% rename from glabels2/src/wdgt-print-merge.c rename to src/wdgt-print-merge.c diff --git a/glabels2/src/wdgt-print-merge.h b/src/wdgt-print-merge.h similarity index 100% rename from glabels2/src/wdgt-print-merge.h rename to src/wdgt-print-merge.h diff --git a/glabels2/src/wdgt-rotate-label.c b/src/wdgt-rotate-label.c similarity index 100% rename from glabels2/src/wdgt-rotate-label.c rename to src/wdgt-rotate-label.c diff --git a/glabels2/src/wdgt-rotate-label.h b/src/wdgt-rotate-label.h similarity index 100% rename from glabels2/src/wdgt-rotate-label.h rename to src/wdgt-rotate-label.h diff --git a/glabels2/src/window.c b/src/window.c similarity index 100% rename from glabels2/src/window.c rename to src/window.c diff --git a/glabels2/src/window.h b/src/window.h similarity index 100% rename from glabels2/src/window.h rename to src/window.h diff --git a/glabels2/src/xml-label-04.c b/src/xml-label-04.c similarity index 100% rename from glabels2/src/xml-label-04.c rename to src/xml-label-04.c diff --git a/glabels2/src/xml-label-04.h b/src/xml-label-04.h similarity index 100% rename from glabels2/src/xml-label-04.h rename to src/xml-label-04.h diff --git a/glabels2/src/xml-label.c b/src/xml-label.c similarity index 100% rename from glabels2/src/xml-label.c rename to src/xml-label.c diff --git a/glabels2/src/xml-label.h b/src/xml-label.h similarity index 100% rename from glabels2/src/xml-label.h rename to src/xml-label.h -- 2.39.5