Merge branch 'rename_src_gajim' into 'master'

Move src/ to gajim/

See merge request !103

Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = src data po icons plugins
+SUBDIRS = gajim data po icons plugins
 
 ACLOCAL_AMFLAGS = -I m4
 

autogen.sh

@@ -6,9 +6,9 @@
   && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
   po/POTFILES.in; done \
   && ls -1 data/org.gajim.Gajim.appdata.xml.in data/org.gajim.Gajim.desktop.in.in data/gajim-remote.desktop.in.in \
-  src/*.py src/common/*.py src/command_system/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \
+  gajim/*.py gajim/common/*.py gajim/command_system/*.py gajim/command_system/implementation/*.py gajim/common/zeroconf/*.py gajim/plugins/*.py | grep -v ipython_view.py >> \
   po/POTFILES.in \
-  && echo -e "data/org.gajim.Gajim.desktop.in\ndata/gajim-remote.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip  || exit 1
+  && echo -e "data/org.gajim.Gajim.desktop.in\ndata/gajim-remote.desktop.in\ngajim/ipython_view.py" > po/POTFILES.skip  || exit 1
   if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then
     ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip
   fi

configure.ac

@@ -1,5 +1,5 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-		m4_esyscmd_s([python -c "import os;os.chdir('src');from common import defs; print(defs.version)"]),[https://dev.gajim.org/gajim/gajim],[gajim])
+		m4_esyscmd_s([python -c "import os;os.chdir('gajim');from common import defs; print(defs.version)"]),[https://dev.gajim.org/gajim/gajim],[gajim])
 AC_PREREQ([2.59])
 
 AC_CONFIG_HEADER(config.h)
@@ -48,7 +48,7 @@ instead of DATADIR/gajim/src.])]
 ,
 AC_SUBST([gajim_srcdir], [\${pkgpythondir}])
 ,
-AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src])
+AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/gajim])
 )
 
 AC_SUBST([gajim_pluginsdir], [\${datadir}/\${PACKAGE}/plugins])
@@ -76,7 +76,7 @@ AC_CONFIG_FILES([
 	data/org.gajim.Gajim.desktop.in
 	data/gajim-remote.desktop.in
 	data/defs.py
-	src/Makefile
+	gajim/Makefile
 	scripts/gajim
 	scripts/gajim-remote:scripts/gajim.in
 	scripts/gajim-history-manager:scripts/gajim.in

doc/epydoc.conf

@@ -13,7 +13,7 @@ docformat: restructuredtext
 # The list of modules to document.  Modules can be named using
 # dotted names, module filenames, or package directory names.
 # This option may be repeated.
-modules: src/* test/*
+modules: gajim/* test/*
 
 # Write html output to the directory "apidocs"
 #output: pdf