2 files changed, 6 insertions, 294 deletions
diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index 792535e49..000000000
--- a/.bzrignore
+++ /dev/null
@@ -1,289 +0,0 @@
-./Info.plist
-./Makefile
-./ABOUT-NLS
-./build
-./build.dep
-./compile
-./compile.lst
-./config.guess
-./config.h
-./config.h.in
-./config.log
-./config.status
-./config.status.lineno
-./config.sub
-./configure
-./depcomp
-./inkscape
-./inkscape.1
-./inkscape.desktop
-./inkscape.de.1
-./inkscape.el.1
-./inkscape.fr.1
-./inkscape.ja.1
-./inkscape.sk.1
-./inkscape.zh_TW.1
-./man/inkscape.1
-./man/inkscape.de.1
-./man/inkscape.de.pod
-./man/inkscape.de.tmp
-./man/inkscape.el.1
-./man/inkscape.el.pod
-./man/inkscape.el.tmp
-./man/inkscape.fr.1
-./man/inkscape.fr.pod
-./man/inkscape.fr.tmp
-./man/inkscape.ja.1
-./man/inkscape.ja.pod
-./man/inkscape.ja.tmp
-./man/inkscape.pod
-./man/inkscape.sk.1
-./man/inkscape.sk.pod
-./man/inkscape.sk.tmp
-./man/inkscape.tmp
-./man/inkscape.zh_TW.1
-./man/inkscape.zh_TW.pod
-./man/inkscape.zh_TW.tmp
-./man/inkview.pod
-./inkscape.appdata.xml
-./inkscape.spec
-./inkview.1
-./install
-./install-sh
-./intltool-extract.in
-./intltool-merge.in
-./intltool-update.in
-./libtool
-./missing
-./stamp-h1
-./CMakeLists.txt.user
-.deps
-.dirstamp
-doc/Makefile
-packaging/autopackage/default.apspec
-po/.intltool-merge-cache
-po/*.gmo
-po/boldquot.sed
-po/en@boldquot.header
-po/en@quot.header
-po/insert-header.sin
-po/messages.mo
-po/Makefile
-po/Makefile.in.in
-po/Makevars.template
-po/POTFILES
-po/quot.sed
-po/remove-potcdate.sin
-po/Rules-quot
-po/stamp-it
-share/Makefile
-share/attributes/Makefile
-share/branding/Makefile
-share/clipart/Makefile
-share/examples/Makefile
-share/extensions/Barcode/Makefile
-share/extensions/Makefile
-share/extensions/Poly3DObjects/Makefile
-share/extensions/alphabet_soup/Makefile
-share/extensions/ink2canvas/Makefile
-share/extensions/test/Makefile
-share/extensions/xaml2svg/Makefile
-share/filters/Makefile
-share/filters/filters.svg.h
-share/fonts/Makefile
-share/gradients/Makefile
-share/icons/Makefile
-share/icons/application/16x16/Makefile
-share/icons/application/22x22/Makefile
-share/icons/application/24x24/Makefile
-share/icons/application/256x256/Makefile
-share/icons/application/32x32/Makefile
-share/icons/application/48x48/Makefile
-share/icons/application/Makefile
-share/keys/Makefile
-share/markers/Makefile
-share/palettes/Makefile
-share/palettes/palettes.h
-share/patterns/Makefile
-share/patterns/patterns.svg.h
-share/screens/Makefile
-share/symbols/Makefile
-share/symbols/symbols.h
-share/templates/Makefile
-share/templates/templates.h
-share/tutorials/Makefile
-share/ui/Makefile
-src/.libs/
-src/2geom/makefile
-src/Makefile
-src/algorithms/makefile
-src/application/makefile
-src/bind/makefile
-src/check-header-compile
-src/cxxtests.cpp
-src/debug/makefile
-src/dialogs/makefile
-src/display/makefile
-src/dom/makefile
-src/extension/dbus/wrapper/inkdbus.pc
-src/extension/implementation/makefile
-src/extension/internal/makefile
-src/extension/makefile
-src/extension/script/makefile
-src/filters/makefile
-src/helper/makefile
-src/helper/sp-marshal.cpp
-src/helper/sp-marshal.h
-src/inkscape
-src/inkscape-version.cpp
-src/inkview
-src/io/makefile
-src/jabber_whiteboard/makefile
-src/libavoid/makefile
-src/libcroco/makefile
-src/libgdl/makefile
-src/libnr/makefile
-src/libnrtype/makefile
-src/libuemf/makefile
-src/livarot/makefile
-src/live_effects/makefile
-src/live_effects/parameter/makefile
-src/pedro/makefile
-src/removeoverlap/makefile
-src/svg/makefile
-src/trace/makefile
-src/traits/makefile
-src/ui/cache/makefile
-src/ui/dialog/makefile
-src/ui/makefile
-src/ui/view/makefile
-src/ui/widget/makefile
-src/util/makefile
-src/widgets/makefile
-src/xml/makefile
-src/test-main.cpp
-src/test-src.cpp
-src/display/test-display.cpp
-src/helper/test-helper.cpp
-src/libnr/test-nr.cpp
-src/svg/test-svg.cpp
-src/util/test-util.cpp
-src/xml/test-xml.cpp
-gc.log
-ltmain.sh
-backup.bzr
-mkinstalldirs
-Inkscape.config
-Inkscape.creator
-Inkscape.creator.user
-Inkscape.files
-Inkscape.includes
-# osxapp (X11)
-build-osxapp
-inst-osxapp
-packaging/macosx/ScriptExec/build
-packaging/macosx/Inkscape.app
-
-# cmake bits
-cmake_install.cmake
-cmake_uninstall.cmake
-CMakeCache.txt
-CMakeFiles
-Makefile
-bin/
-lib/
-include/
-
-.project
-.cproject
-.settings
-am.po.old
-ar.po.old
-as.po.old
-az.po.old
-be.po.old
-bg.po.old
-bn_BD.po.old
-bn.po.old
-br.po.old
-brx.po.old
-ca.po.old
-ca@valencia.po.old
-cs.po.old
-da.po.old
-de.po.old
-doi.po.old
-dz.po.old
-el.po.old
-en_AU.po.old
-en_CA.po.old
-en_GB.po.old
-en_US@piglatin.po.old
-eo.po.old
-es_MX.po.old
-es.po.old
-et.po.old
-eu.po.old
-fa.po.old
-fi.po.old
-fr.po.old
-ga.po.old
-gl.po.old
-gu.po.old
-he.po.old
-hi.po.old
-hr.po.old
-hu.po.old
-hy.po.old
-id.po.old
-is.po.old
-it.po.old
-ja.po.old
-km.po.old
-kn.po.old
-kok@latin.po.old
-kok.po.old
-ko.po.old
-ks@aran.po.old
-ks@deva.po.old
-lt.po.old
-lv.po.old
-mai.po.old
-mk.po.old
-ml.po.old
-mni@beng.po.old
-mni.po.old
-mn.po.old
-mr.po.old
-nb.po.old
-ne.po.old
-nl.po.old
-nn.po.old
-or.po.old
-pa.po.old
-pl.po.old
-pt_BR.po.old
-pt.po.old
-ro.po.old
-ru.po.old
-rw.po.old
-sa.po.old
-sat@deva.po.old
-sat.po.old
-sd@deva.po.old
-sd.po.old
-sk.po.old
-sl.po.old
-sq.po.old
-sr@latin.po.old
-sr.po.old
-sv.po.old
-ta.po.old
-te.po.old
-th.po.old
-tr.po.old
-uk.po.old
-ur.po.old
-vi.po.old
-zh_CN.po.old
-zh_TW.po.old
diff --git a/.gitignore b/.gitignore
index 619692120..a56790eb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-share/filters/filters.svg.h
-share/palettes/palettes.h
-share/patterns/patterns.svg.h
-share/symbols/symbols.h
-share/templates/templates.h
+build
+share/inkscape
+share/*/*.h
+
+*.old
+*.swp