Merge branch 'master' into gl2-lensflare

distrib/autobuild.py

@@ -177,6 +177,7 @@ def update_debian_changelog():
 
 def build_source_package():
     """Builds the source tarball and a Debian source package."""
+    git_pull()
     ev = builder.Event(latestAvailable=True)
     print "Creating source tarball for build %i." % ev.number()
     os.chdir(os.path.join(builder.config.DISTRIB_DIR))
@@ -192,8 +193,12 @@ def build_source_package():
             remote_copy(fn, ev.file_path(fn))
             break
 
+    # Check distribution.
+    system_command("lsb_release -a | perl -n -e 'm/Codename:\s(.+)/ && print $1' > /tmp/distroname")
+    distro = file('/tmp/distroname', 'rt').read()
+
     # Create a source Debian package and upload it to Launchpad.
-    pkgVer = '%s.%i' % (ev.version_base(), ev.number())
+    pkgVer = '%s.%i+%s' % (ev.version_base(), ev.number(), distro)
     pkgDir = 'doomsday-%s' % pkgVer
     system_command('tar xzf %s' % fn)
     os.rename(fn[:-7], pkgDir)
@@ -209,7 +214,12 @@ def gen_changelog(src, dst, extraSub=''):
         system_command("sed 's/%s-build%i/%s/;%s' %s > %s" % (
                 ev.version_base(), ev.number(), pkgVer, extraSub, src, dst))
 
-    gen_changelog('../../../debian/changelog', 'changelog')
+    # Figure out the name of the distribution.
+    dsub = ''
+    if distro:
+        dsub = 's/) precise;/) %s;/' % distro
+
+    gen_changelog('../../../debian/changelog', 'changelog', dsub)
     system_command("sed 's/${Arch}/i386 amd64/' ../../../debian/control.template > control")
     system_command("sed 's/`..\/build_number.py --print`/%i/;s/..\/..\/doomsday/..\/doomsday/' ../../../debian/rules > rules" % ev.number())
     os.chdir('..')

distrib/builder/utils.py

@@ -137,21 +137,23 @@ def aptrepo_find_latest_tag():
 
 def count_log_word(fn, word):
     count = 0
-    #txt = unicode(gzip.open(fn).read(), 'latin1').lower()
-    for txt in [unicode(rl, 'latin1').lower() for rl in string.split(gzip.open(fn).read(), '\n')]:
-        pos = txt.find(unicode(word))
-        if pos < 0: continue 
-        # Ignore some unnecessary gcc messages.
-        if 'should be explicitly initialized in the copy constructor' in txt: continue
-        if 'deprecated' in txt: continue
-        try:
-            if txt[pos-1] not in '/\\_'+string.ascii_letters and \
-                txt[pos+len(word)] not in 's.' and \
-                txt[pos-11:pos] != 'shlibdeps: ' and txt[pos-12:pos] != 'genchanges: ' and \
-                txt[pos-12:pos] != 'cc1objplus: ':
-                count += 1            
-        except IndexError:
-            count += 1
+    try:
+        for txt in [unicode(rl, 'latin1').lower() for rl in string.split(gzip.open(fn).read(), '\n')]:
+            pos = txt.find(unicode(word))
+            if pos < 0: continue 
+            # Ignore some unnecessary gcc messages.
+            if 'should be explicitly initialized in the copy constructor' in txt: continue
+            if 'deprecated' in txt: continue
+            try:
+                if txt[pos-1] not in '/\\_'+string.ascii_letters and \
+                    txt[pos+len(word)] not in 's.' and \
+                    txt[pos-11:pos] != 'shlibdeps: ' and txt[pos-12:pos] != 'genchanges: ' and \
+                    txt[pos-12:pos] != 'cc1objplus: ':
+                    count += 1            
+            except IndexError:
+                count += 1
+    except:
+        pass
     return count
 
 

distrib/debian/control.template

@@ -2,7 +2,7 @@ Source: doomsday
 Section: universe/games
 Priority: optional
 Maintainer: Jaakko Keränen <jaakko.keranen@iki.fi>
-Build-Depends: debhelper (>= 8.0.0), python, libsdl1.2-dev, libsdl-mixer1.2-dev, libxrandr-dev, libxxf86vm-dev, libqt4-network (>= 4.7), libqtcore4 (>= 4.7), libqtgui4 (>= 4.7), qt4-qmake (>= 4.7), libqt4-opengl-dev (>= 4.7), zlib1g-dev, libfluidsynth-dev
+Build-Depends: debhelper (>= 8.0.0), python, libsdl1.2-dev, libsdl-mixer1.2-dev, libxrandr-dev, libxxf86vm-dev, libqt4-network (>= 4.7), libqtcore4 (>= 4.7), libqtgui4 (>= 4.7), qt4-qmake (>= 4.7), libqt4-opengl-dev (>= 4.7), zlib1g-dev, libfluidsynth-dev, libncurses5-dev
 Standards-Version: 3.9.3
 Homepage: http://dengine.net/
 Vcs-Git: https://github.com/skyjake/Doomsday-Engine.git

distrib/pilot.py

@@ -395,6 +395,7 @@ def handleCompletedTasks():
 
         elif task == 'build':
             newTask('source', forClient='ubuntu')
+            newTask('source', forClient='saucy')
 
         elif task == 'source':
             newTask('sign', forClient='master')

web/classes/frontcontroller.class.php

@@ -304,7 +304,9 @@ public function outputHeader($mainHeading='')
 <head>
     <title><?=$siteTitle?></title>
     <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width" />
+    <meta http-equiv="cleartype" content="on">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, target-densityDpi=device-dpi">
     <meta name="author" content="<?=$this->siteAuthor()?>" />
     <meta name="keywords" content="<?php { $keywords = $this->defaultPageKeywords(); foreach($keywords as $keyword) echo $keyword.','; } ?>" />
     <meta name="description" content="<?=$this->siteDescription()?>" />

web/forums/skin/template/overall_header.html

@@ -2,7 +2,9 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
     <meta charset="{S_CONTENT_ENCODING}" />
-    <meta name="viewport" content="width=device-width" />
+    <meta http-equiv="cleartype" content="on">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, target-densityDpi=device-dpi">
     <meta name="author" content="David Gardner" />
     <meta name="keywords" content="Doomsday,Doomsday Engine,Deng,Doom,Heretic,Hexen,jDoom,jHeretic,jHexen,sourceport,first person shooter,fps," />
     <meta name="description" content="Home of the Doomsday Engine, a modern engine for playing classic 2.5d first person shooters DOOM, Heretic and Hexen." />

web/forums/skin/theme/stylesheet.css

@@ -56,7 +56,7 @@ ul.navlinks {
     padding-bottom: 1px;
     margin-bottom: 1px;
     font-weight: bold;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
+    /*font-family: Verdana, Arial, Helvetica, sans-serif;*/
     font-size: 12pt;
 }
 
@@ -373,9 +373,9 @@ p.rules {
 
 /* Links for forum/topic lists */
 .forumtitle, .topictitle {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
+    /*font-family: Verdana, Arial, Helvetica, sans-serif;*/
     font-size: 1.1em;
-    font-weight: bold;
+    /*font-weight: bold;*/
 }
 
 a.top {
@@ -630,7 +630,7 @@ dl.faq {
 }
 
 dl.faq dt, dl.faqanswer dt {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
+    /*font-family: Verdana, Arial, Helvetica, sans-serif;*/
     margin-bottom: 0.5em;
 }
 
@@ -666,7 +666,7 @@ dl.faq dd {
     overflow: hidden;
     width: 100%;
     font-size:10pt;
-    font-family: Arial, Helvetica, sans-serif;
+    /*font-family: Arial, Helvetica, sans-serif;*/
     line-height:120%;
 }
 
@@ -1070,7 +1070,7 @@ fieldset.polls dd div {
     width: 18%;
     float: left;
     display: inline;
-    font-family: Arial, Helvetica, sans-serif;
+    /*font-family: Arial, Helvetica, sans-serif;*/
     font-size: 8pt;
     text-align: center;
 }
@@ -1604,7 +1604,7 @@ ol.def-rules li {
 ----------------------------------------*/
 fieldset {
     border-width: 0;
-    font-family: Verdana, Helvetica, Arial, sans-serif;
+    /*font-family: Verdana, Helvetica, Arial, sans-serif;*/
     font-size: 10pt;
 }
 

web/plugins/pages/html/engine.html

@@ -67,7 +67,7 @@ <h2>Multiplayer</h2>
 <div class="twocolumn collapsible">
 <h2>User Interface</h2>
 <ul>
-<li>Graphical <a href="/dew/index.php?title=Console">command console</a>, <a href="/dew/index.php?title=Control_panel">control panel</a> and <a href="/dew/index.php?title=Task_bar">task bar</a></li>
+<li>Graphical <a href="/dew/index.php?title=Console">command console</a> and <a href="/dew/index.php?title=Task_bar">task bar</a></li>
 <li>Easy to use <a href="/dew/index.php?title=Ringzero_Gui">game selection screen</a> for runtime <a href="/games">game</a> changing (e.g., from DOOM to Heretic)</li>
 <li>On-the-fly <a href="/addons">add-on</a> resource loading</li>
 <li>Flexible input control <a href="/dew/index.php?title=Bindings">bindings</a> system</li>

web/style.css

@@ -1,25 +1,20 @@
+
+@import url(http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,700,300);
+
 body {
     background: #282D2B url(panoramarotator) no-repeat fixed;
     background-position: center 100%;
     background-size: 200% 200%;
 
     color: #A7A29C;
-    font-family: Georgia, serif;
-    font-size: 100%;
-    line-height: 1.5;
-
+    font-family: "Open Sans",sans-serif !important;
+    font-size: small;
+    padding: 0;
     margin: 1.2em;
     margin-top: 1.8em;
 }
 
-@media only screen and (max-width: 767px) {
-body {
-    margin: 0px;
-}
-}
-
 h1, h2, h3, h4, h5, h6 {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
     margin-bottom: 0;
     margin-top: .6em;
     font-weight: lighter;
@@ -287,7 +282,7 @@ ul.topiclist {
     list-style-type: none;
     margin: -6px;
     padding:0;
-    font-family: sans-serif;
+    /*font-family: sans-serif;*/
     font-size: 8pt;
 }
 
@@ -625,8 +620,9 @@ ol.jumplist li {
 }
 
 #menu {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-weight: bold;
+    /*font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-weight: bold;*/
+    font-size:120%;
 }
 
 #menu a:focus { outline-offset: 0; }
@@ -806,9 +802,9 @@ div.clear {
     color: #A7A29C;
 }
 
-#status {
+/*#status {
     font-size: 66%;
-}
+}*/
 
 #recentbuilds { float: left; }
 #activeservers { float: right; }