chiark / gitweb /
Merge branch 'changelog' of https://gitlab.com/krt/fdroidserver
authorDaniel Martí <mvdan@mvdan.cc>
Wed, 3 Jun 2015 13:52:01 +0000 (15:52 +0200)
committerDaniel Martí <mvdan@mvdan.cc>
Wed, 3 Jun 2015 13:52:01 +0000 (15:52 +0200)
1  2 
docs/fdroid.texi
fdroidserver/import.py
fdroidserver/lint.py
fdroidserver/metadata.py
fdroidserver/update.py
wp-fdroid/wp-fdroid.php

Simple merge
index fa9c02537a3d8adda95ce0dc9497e2819babd393,c2f0bbd74700d86b87f94604ce9c04ee5d3bd746..5e0c6b02321618b2902ef9346062feb1d096e593
@@@ -142,7 -143,7 +143,8 @@@ def main()
          repotype = 'git'
          sourcecode = url
          issuetracker = url + '/issues'
 +        website = ""
+         changelog = url + '/commits'
      elif url.startswith('https://gitlab.com/'):
          projecttype = 'gitlab'
          repo = url
index 55722506e7acd7077a450120fac3f33431fbc7e5,19dfcadacb6703c793c03cb4d1b94351e5f39020..169dc14764c5359eef5a067653f1172bfbf845bc
@@@ -70,10 -73,15 +70,18 @@@ regex_warnings = 
           "github URLs should always use https:// not http://"),
          (re.compile(r'.*[^sS]://gitorious\.org/.*'),
           "gitorious URLs should always use https:// not http://"),
 +        # TODO enable in August 2015, when Google Code goes read-only
 +        # (re.compile(r'.*://code\.google\.com/.*'),
 +        # "code.google.com will be soon switching down, perhaps it moved to github.com?"),
      ],
+     'Changelog': [
+         (re.compile(r'.*[^sS]://code\.google\.com/.*'),
+          "code.google.com URLs should always use https:// not http://"),
+         (re.compile(r'.*[^sS]://github\.com/.*'),
+          "github URLs should always use https:// not http://"),
+         (re.compile(r'.*[^sS]://gitorious\.org/.*'),
+          "gitorious URLs should always use https:// not http://"),
+     ],
      'License': [
          (re.compile(r'^(|None|Unknown)$'),
           "No license specified"),
@@@ -117,8 -125,16 +125,12 @@@ regex_pedantic = 
          (re.compile(r'.*github\.com/[^/]+/[^/]+/issues/.*'),
           "/issues is often enough on its own"),
      ],
+     'Changelog': [
+         (re.compile(r'.*commit.*', re.IGNORECASE),
+          "Not every commit log is suitable as change log"),
+     ],
      'Summary': [
 -        (re.compile(r'.*\b(free software|open source)\b.*', re.IGNORECASE),
 -         "No need to specify that the app is Free Software"),
 -        (re.compile(r'.*[a-z0-9][.,!?][ $]'),
 +        (re.compile(r'.*[a-z0-9][.!?][ $]'),
           "Punctuation should be avoided"),
      ],
  }
Simple merge
Simple merge
Simple merge