Alexandros Kosiaris has submitted this change and it was merged.

Change subject: apertium-urd: New upstream release and rebuild for Jessie
......................................................................


apertium-urd: New upstream release and rebuild for Jessie

Bug: T107306
Change-Id: Ic462b7dbc1b331221e15fe565fa56d420316a270
---
M debian/changelog
M debian/compat
M debian/control
M debian/copyright
A debian/patches/01_remove_libdir.diff
A debian/patches/series
M debian/rules
7 files changed, 37 insertions(+), 32 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 44e6f21..628f288 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apertium-urd (0.1.0~r61311-1+wmf1) jessie-wikimedia; urgency=low
+
+  * New upstream release.
+  * Rebuild for Jessie.
+  * Cleanup debian/rules.
+  * Fixed dependencies.
+
+ -- Kartik Mistry <[email protected]>  Mon, 27 Jun 2016 18:55:26 +0530
+
 apertium-urd (0.1.0~r57551-1) trusty; urgency=low
 
   [ Tino Didriksen ]
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index ec5bcd3..82a8e28 100644
--- a/debian/control
+++ b/debian/control
@@ -2,28 +2,24 @@
 Section: science
 Priority: optional
 Maintainer: Debian Science Team 
<[email protected]>
-Uploaders: Tino Didriksen <[email protected]>,
+Uploaders: Tino Didriksen <[email protected]>,
            Kartik Mistry <[email protected]>
-Build-Depends: apertium (>= 3.3),
+Build-Depends: apertium-dev (>= 3.4),
                autotools-dev,
                cg3,
-               debhelper (>= 8.0),
+               debhelper (>= 9),
                dh-autoreconf,
                gawk,
                hfst,
-               libapertium3-3.3-dev,
-               libhfst39-dev,
-               liblttoolbox3-3.3-dev (>= 3.3),
-               locales,
-               lttoolbox (>= 3.3),
+               libhfst-dev,
                pkg-config (>= 0.21)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://apertium.org/
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-urd.git
+Vcs-Git: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-urd.git
 Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-urd.git
 
 Package: apertium-urd
 Architecture: all
-Depends: apertium (>= 3.3), cg3, hfst, ${misc:Depends}, ${shlibs:Depends}
+Depends: apertium (>= 3.4), cg3, hfst, ${misc:Depends}, ${shlibs:Depends}
 Description: Apertium single language data for Urdu
  Data package providing Apertium language resources for Urdu
diff --git a/debian/copyright b/debian/copyright
index 58bf940..f995e7c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,8 @@
            2013-2014, Kevin Brubeck Unhammer <[email protected]>
                 2014, Sudarsh Rathi <[email protected]>
 License: GPL-3
+
+License: GPL-3
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, version 3 of the License
@@ -24,6 +26,8 @@
 Files: debian/*
 Copyright: 2014, Apertium Project Management Committee 
<[email protected]>
 License: GPL-3+
+
+License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
diff --git a/debian/patches/01_remove_libdir.diff 
b/debian/patches/01_remove_libdir.diff
new file mode 100644
index 0000000..71f7fa5
--- /dev/null
+++ b/debian/patches/01_remove_libdir.diff
@@ -0,0 +1,13 @@
+Description: Remove libdir from pkg-config
+Index: b/apertium-urd.pc.in
+===================================================================
+--- a/apertium-urd.pc.in
++++ b/apertium-urd.pc.in
+@@ -1,7 +1,5 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=@libdir@
+-dir=@libdir@/apertium/apertium-urd
+ srcdir=@datarootdir@/apertium/apertium-urd
+ 
+ Name: apertium-urd
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..45a75f8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_remove_libdir.diff
diff --git a/debian/rules b/debian/rules
index 11004df..b5d222c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,9 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
 export DH_OPTIONS
+export LC_ALL=C.UTF-8
 
 %:
-       dh $@ --with autoreconf
-
-override_dh_auto_build:
-       mkdir -p debian/tmp/locale/
-       localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
-       export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
-       export LC_ALL=en_US.UTF-8 && \
-       dh_auto_build
+       dh $@ --fail-missing --with autoreconf

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic462b7dbc1b331221e15fe565fa56d420316a270
Gerrit-PatchSet: 3
Gerrit-Project: operations/debs/contenttranslation/apertium-urd
Gerrit-Branch: master
Gerrit-Owner: KartikMistry <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to