diff -Nru tilix-1.6.1/debian/changelog tilix-1.6.1/debian/changelog --- tilix-1.6.1/debian/changelog 2017-07-14 19:40:01.000000000 +0100 +++ tilix-1.6.1/debian/changelog 2017-07-17 20:35:44.000000000 +0100 @@ -1,3 +1,13 @@ +tilix (1.6.1-1ubuntu1) artful; urgency=medium + + * Packaging Changes (LP: #1704223): + - readd Terminix transitional package to ensure upgraders + can move smoothly from terminix to tilix + - Add patch fix-pcre2-in-ubuntu.patch to ensure VTE version + checks works correctly with the version in Artful + + -- David Mohammed Mon, 17 Jul 2017 20:35:44 +0100 + tilix (1.6.1-1build1) artful; urgency=medium * Rebuild against new ldc72. diff -Nru tilix-1.6.1/debian/control tilix-1.6.1/debian/control --- tilix-1.6.1/debian/control 2017-07-14 19:40:01.000000000 +0100 +++ tilix-1.6.1/debian/control 2017-07-17 20:35:44.000000000 +0100 @@ -52,3 +52,12 @@ GNOME human interface design guidelines. . This package contains architecture independent data. + +Package: terminix +Architecture: all +Priority: extra +Section: oldlibs +Depends: tilix, + ${misc:Depends} +Description: Transitional package (terminix -> tilix) + This is a transitional package. It can safely be removed. diff -Nru tilix-1.6.1/debian/control.in tilix-1.6.1/debian/control.in --- tilix-1.6.1/debian/control.in 2017-07-13 20:52:10.000000000 +0100 +++ tilix-1.6.1/debian/control.in 2017-07-17 20:33:53.000000000 +0100 @@ -48,3 +48,12 @@ GNOME human interface design guidelines. . This package contains architecture independent data. + +Package: terminix +Architecture: all +Priority: extra +Section: oldlibs +Depends: tilix, + ${misc:Depends} +Description: Transitional package (terminix -> tilix) + This is a transitional package. It can safely be removed. diff -Nru tilix-1.6.1/debian/patches/pcre2-version-update.patch tilix-1.6.1/debian/patches/pcre2-version-update.patch --- tilix-1.6.1/debian/patches/pcre2-version-update.patch 1970-01-01 01:00:00.000000000 +0100 +++ tilix-1.6.1/debian/patches/pcre2-version-update.patch 2017-07-17 20:35:44.000000000 +0100 @@ -0,0 +1,81 @@ +From: David Mohammed +Date: Tue, 18 Jul 2017 20:47:21 +0100 +Subject: bump VTE Version number + Ubuntu has a patched VTE that removes + PCRE2. This patch bumps the expected version + number check so that PCRE2 capability is + not invoked. This stops Tilix from crashing + on startup. + . + https://github.com/gnunn1/tilix/issues/916 +Forwarded: N/A +Origin: Other +--- a/source/gx/tilix/terminal/regex.d ++++ b/source/gx/tilix/terminal/regex.d +@@ -232,7 +232,7 @@ + static this() { + import std.exception : assumeUnique; + +- if (checkVTEVersionNumber(0, 46)) { ++ if (checkVTEVersionNumber(0, 50)) { + VRegex[URL_REGEX_PATTERNS.length] tempRegex; + foreach (i, regex; URL_REGEX_PATTERNS) { + tempRegex[i] = compileVRegex(regex); +--- a/source/gx/tilix/terminal/search.d ++++ b/source/gx/tilix/terminal/search.d +@@ -199,7 +199,7 @@ + void setTerminalSearchCriteria() { + string text = seSearch.getText(); + if (text.length == 0) { +- if (checkVTEVersionNumber(0, 46)) { ++ if (checkVTEVersionNumber(0, 50)) { + vte.searchSetRegex(null, 0); + } else { + vte.searchSetGregex(null, cast(GRegexMatchFlags) 0); +@@ -212,7 +212,7 @@ + text = format("\\b%s\\b", text); + + try { +- if (checkVTEVersionNumber(0, 46)) { ++ if (checkVTEVersionNumber(0, 50)) { + uint flags = PCRE2Flags.UTF | PCRE2Flags.MULTILINE | PCRE2Flags.NO_UTF_CHECK; + if (!matchCase) { + flags |= PCRE2Flags.CASELESS; +--- a/source/gx/tilix/terminal/terminal.d ++++ b/source/gx/tilix/terminal/terminal.d +@@ -802,13 +802,13 @@ + vte.setVexpand(true); + //Search Properties + vte.searchSetWrapAround(gsSettings.getValue(SETTINGS_SEARCH_DEFAULT_WRAP_AROUND).getBoolean()); +- if (checkVTEVersionNumber(0, 49)) { ++ if (checkVTEVersionNumber(0, 50)) { + vte.setAllowHyperlink(true); +- trace("Custom hyperlinks enabled for VTE 0.49"); ++ trace("Custom hyperlinks enabled for VTE 0.50"); + } + //URL Regex Experessions + try { +- if (checkVTEVersionNumber(0, 46)) { ++ if (checkVTEVersionNumber(0, 50)) { + foreach (i, regex; compiledVRegex) { + int id = vte.matchAddRegex(cast(VRegex) regex, 0); + regexTag[id] = URL_REGEX_PATTERNS[i]; +@@ -1591,7 +1591,7 @@ + } + + public void checkHyperlinkMatch(Event event) { +- if (!checkVTEVersionNumber(0, 49)) return; ++ if (!checkVTEVersionNumber(0, 50)) return; + string uri = vte.hyperlinkCheckEvent(event); + if (uri.length == 0) return; + match.match = uri; +@@ -2186,7 +2186,7 @@ + } + TerminalRegex regex = TerminalRegex(value[0], TerminalURLFlavor.CUSTOM, caseInsensitive, value[1]); + try { +- if (checkVTEVersionNumber(0, 46)) { ++ if (checkVTEVersionNumber(0, 50)) { + VRegex compiledRegex = compileVRegex(regex); + if (compiledRegex !is null) { + int id = vte.matchAddRegex(compiledRegex, 0); + diff -Nru tilix-1.6.1/debian/patches/series tilix-1.6.1/debian/patches/series --- tilix-1.6.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ tilix-1.6.1/debian/patches/series 2017-07-17 20:35:44.000000000 +0100 @@ -0,0 +1 @@ +pcre2-version-update.patch