Merge remote-tracking branch 'orbweaver/master'

# Conflicts:
#	radiant/ui/lightinspector/LightInspector.cpp

.gitlab-ci.yml

@@ -0,0 +1,14 @@
+pages:
+  stage: deploy
+  script:
+  - mkdir .public
+  - cp doc/*.html .public
+  - cp -r doc/img .public
+  - mv .public/manual.html .public/index.html
+  - gzip -k .public/index.html
+  - mv .public public
+  artifacts:
+    paths:
+    - public
+  only:
+  - master

Makefile.am

@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = libs radiant plugins install/i18n
+SUBDIRS = libs radiant plugins install/i18n doc
 
 # Install data and stuff
 gamedir = $(pkgdatadir)/games

configure.ac

@@ -60,6 +60,12 @@ AC_ARG_ENABLE([debug],
                               [enable debug build])],
               [debug_build=$enableval],
               [debug_build='no'])
+AC_ARG_ENABLE([relocation],
+              [AS_HELP_STRING([--enable-relocation],
+                              [build a relocatable package without hard-coded
+                               absolute paths])],
+              [reloc_build=$enableval],
+              [reloc_build='no'])
 AC_ARG_ENABLE([darkmod-plugins],
               [AS_HELP_STRING([--enable-darkmod-plugins],
                               [build Dark Mod plugins such as S/R editor])],
@@ -329,6 +335,12 @@ else
     CXXFLAGS="-g -O2 -DNDEBUG $CXXFLAGS"
 fi
 
+# Relocation
+if test "$reloc_build" != 'no'
+then
+    CPPFLAGS="-DENABLE_RELOCATION $CPPFLAGS"
+fi
+
 AC_SUBST([CPPFLAGS])
 AC_SUBST([CFLAGS])
 AC_SUBST([CXXFLAGS])
@@ -340,35 +352,15 @@ AC_CONFIG_FILES([install/darkradiant.desktop install/i18n//Makefile.in
                  Makefile
                  radiant/Makefile
                  install/i18n/Makefile.in
+                 doc/Makefile
                  libs/Makefile
-                 libs/ddslib/Makefile
                  libs/wxutil/Makefile
                  libs/math/Makefile
-                 libs/picomodel/Makefile
                  libs/scene/Makefile
                  libs/xmlutil/Makefile
                  plugins/Makefile
-                 plugins/archivezip/Makefile
-                 plugins/commandsystem/Makefile
-                 plugins/eclassmgr/Makefile
-                 plugins/entity/Makefile
-                 plugins/eventmanager/Makefile
-                 plugins/filetypes/Makefile
-                 plugins/filters/Makefile
-                 plugins/fonts/Makefile
-                 plugins/image/Makefile
-                 plugins/mapdoom3/Makefile
-                 plugins/md5model/Makefile
-                 plugins/model/Makefile
-                 plugins/particles/Makefile
-                 plugins/scenegraph/Makefile
                  plugins/script/Makefile
-                 plugins/shaders/Makefile
-                 plugins/skins/Makefile
                  plugins/sound/Makefile
-                 plugins/uimanager/Makefile
-                 plugins/vfspk3/Makefile
-                 plugins/xmlregistry/Makefile
                  plugins/dm.stimresponse/Makefile
                  plugins/dm.objectives/Makefile
                  plugins/dm.difficulty/Makefile
@@ -382,7 +374,15 @@ AC_OUTPUT
 echo "
 Configuration options:"
 
-echo     " Installation prefix: $prefix"
+echo     " Installation prefix:   $prefix"
+
+if test "$reloc_build" != 'no'
+then
+    echo " Relocatable package:   yes"
+else
+    echo " Relocatable package:   no"
+fi
+
 if test -n "$sound_module"
 then
     echo " Sound:                 yes"

debian/changelog

@@ -1,3 +1,13 @@
+darkradiant (2.6.0) bionic; urgency=medium
+
+  * 2.6.0 release for Bionic.
+  * This feature release is further improving on the Model Exporting
+    capabilities and introduces smaller features like a mapping time stopwatch
+    and the ability to define favourites in the Media Browser, making it more
+    convenient to work with a large number of materials.
+
+ -- Matthew Mott <orbweaver3d@gmail.com>  Fri, 18 Jan 2019 20:17:22 +0000
+
 darkradiant (2.0.2-2~vivid1) vivid; urgency=medium
 
   * Entity list now shows entity names, and no longer crashes when an entity is

debian/control

@@ -2,7 +2,7 @@ Source: darkradiant
 Section: editors
 Priority: extra
 Maintainer: Matthew Mott <orbweaver3d@gmail.com>
-Build-Depends: debhelper (>= 5), autotools-dev, libgtkmm-2.4-dev, libgtkglextmm-x11-1.2-dev, libxml2-dev, libglew-dev, libboost-regex-dev, libboost-filesystem-dev, libboost-serialization-dev, libboost-test-dev, libboost-python-dev, python-dev, libvorbis-dev, libopenal-dev, libalut-dev, libjpeg-dev, ftgl-dev, libwxbase3.0-dev, libwxgtk3.0-dev
+Build-Depends: debhelper (>= 5), autotools-dev, libgtkmm-2.4-dev, libgtkglextmm-x11-1.2-dev, libxml2-dev, libglew-dev, libboost-regex-dev, libboost-filesystem-dev, libboost-serialization-dev, libboost-test-dev, libboost-python-dev, python-dev, libvorbis-dev, libopenal-dev, libalut-dev, libjpeg-dev, libftgl-dev, libwxbase3.0-dev, libwxgtk3.0-dev
 Standards-Version: 3.9.1
 
 Package: darkradiant

debian/darkradiant.install

@@ -2,6 +2,5 @@ usr/bin
 usr/lib/darkradiant/lib*
 usr/lib/darkradiant/modules
 usr/lib/darkradiant/scripts
-usr/lib/darkradiant/plugins/eclasstree*
 usr/share/darkradiant
 usr/share/applications