[MediaWiki-commits] [Gerrit] operations...apertium-nno[master]: apertium-nno: Update dependency on cg3

2018-01-11 Thread Alexandros Kosiaris (Code Review) 
Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403100 )

Change subject: apertium-nno: Update dependency on cg3
..


apertium-nno: Update dependency on cg3

Added patch to fix cg3 parse error.

Bug: T171406
Change-Id: I2c654f4aaf800191d2d01a9e84aae2c52b7d1b8b
---
M debian/changelog
M debian/control
A debian/patches/001-cg3-temp-fix.diff
A debian/patches/series
4 files changed, 27 insertions(+), 2 deletions(-)

Approvals:
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/debian/changelog b/debian/changelog
index 997065a..a504936 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apertium-nno (0.9.0~r69513-2+wmf2) jessie-wikimedia; urgency=low
+
+  * Updated depends on cg3.
+  * Added patch to fix cg3 parse error from upstream.
+
+ -- Kartik Mistry   Thu, 11 Jan 2018 17:09:40 +0530
+
 apertium-nno (0.9.0~r69513-2+wmf1) jessie-wikimedia; urgency=low
 
   * Rebuild for Jessie
diff --git a/debian/control b/debian/control
index 1d518e3..23fa03a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@
Kartik Mistry 
 Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -18,6 +18,9 @@
 
 Package: apertium-nno
 Architecture: all
-Depends: apertium (>= 3.4), cg3, ${misc:Depends}, ${shlibs:Depends}
+Depends: apertium (>= 3.4),
+ cg3 (>= 1.0.0~r12254),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Apertium single language data for Norwegian Nynorsk
  Data package providing Apertium language resources for Norwegian Nynorsk
diff --git a/debian/patches/001-cg3-temp-fix.diff 
b/debian/patches/001-cg3-temp-fix.diff
new file mode 100644
index 000..3b83fdd
--- /dev/null
+++ b/debian/patches/001-cg3-temp-fix.diff
@@ -0,0 +1,14 @@
+Description: Temporary fix for FTBFS with latest CG-3
+diff --git a/apertium-nno.nno.rlx b/apertium-nno.nno.rlx
+index 032c32d..8f227c1 100644
+--- a/apertium-nno.nno.rlx
 b/apertium-nno.nno.rlx
+@@ -6987,7 +6987,7 @@ REMOVE:mwe-verb-unlikely-adj ("<.* .*>"r adj pp); # e.g. 
«førte_til brannar»
+ 
+ #:6072
+  ""   REMOVE:6072   (n nt) IF
+-   (O inf)
++   (0 inf)
+ ;
+ #sjeldent i fleirtal - og eintal
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..cb3736d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001-cg3-temp-fix.diff

-- 
To view, visit https://gerrit.wikimedia.org/r/403100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c654f4aaf800191d2d01a9e84aae2c52b7d1b8b
Gerrit-PatchSet: 2
Gerrit-Project: operations/debs/contenttranslation/apertium-nno
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...apertium-nno[master]: apertium-nno: Update dependency on cg3

2018-01-08 Thread KartikMistry (Code Review) 
KartikMistry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403100 )

Change subject: apertium-nno: Update dependency on cg3
..

apertium-nno: Update dependency on cg3

Bug: T171406
Change-Id: I2c654f4aaf800191d2d01a9e84aae2c52b7d1b8b
---
M debian/changelog
M debian/control
2 files changed, 11 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-nno
 refs/changes/00/403100/1

diff --git a/debian/changelog b/debian/changelog
index 997065a..8509a00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apertium-nno (0.9.0~r69513-2+wmf2) jessie-wikimedia; urgency=low
+
+  * Updated depends on cg3.
+
+ -- Kartik Mistry   Tue, 09 Jan 2018 09:48:38 +0530
+
 apertium-nno (0.9.0~r69513-2+wmf1) jessie-wikimedia; urgency=low
 
   * Rebuild for Jessie
diff --git a/debian/control b/debian/control
index 1d518e3..23fa03a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@
Kartik Mistry 
 Build-Depends: apertium-dev (>= 3.4),
autotools-dev,
-   cg3,
+   cg3 (>= 1.0.0~r12254),
debhelper (>= 9),
dh-autoreconf,
gawk,
@@ -18,6 +18,9 @@
 
 Package: apertium-nno
 Architecture: all
-Depends: apertium (>= 3.4), cg3, ${misc:Depends}, ${shlibs:Depends}
+Depends: apertium (>= 3.4),
+ cg3 (>= 1.0.0~r12254),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Apertium single language data for Norwegian Nynorsk
  Data package providing Apertium language resources for Norwegian Nynorsk

-- 
To view, visit https://gerrit.wikimedia.org/r/403100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c654f4aaf800191d2d01a9e84aae2c52b7d1b8b
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium-nno
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits