[MediaWiki-commits] [Gerrit] operations...apertium-pt-gl[master]: apertium-pt-gl: Cleanup
Alexandros Kosiaris has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/403116 ) Change subject: apertium-pt-gl: Cleanup .. apertium-pt-gl: Cleanup * Simplify debian/rules. Do not install duplicate changelog. * Removed dependency on locales. * Other minor cleanups. Change-Id: I1ead8f13cc98d70e0c92a17d31a250118cb77434 --- M debian/changelog M debian/control M debian/rules 3 files changed, 19 insertions(+), 23 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 48d8bcd..d84b475 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apertium-pt-gl (0.9.2~r60358-2+wmf1) jessie-wikimedia; urgency=low + + * debian/rules: ++ Simplify rules file. ++ Do not install duplicate upstream changelog. + * debian/control: ++ Removed dependency on locales. ++ Updated Vcs-Git URL. ++ Updated to Standards-Version 3.9.8 + + -- Kartik Mistry Tue, 09 Jan 2018 14:18:38 +0530 + apertium-pt-gl (0.9.2~r60358-1) jessie-wikimedia; urgency=low * Rebuild for Jessie. diff --git a/debian/control b/debian/control index fd5ff72..1ad6787 100644 --- a/debian/control +++ b/debian/control @@ -2,18 +2,17 @@ Section: science Priority: optional Maintainer: Debian Science Team -Uploaders: Tino Didriksen , +Uploaders: Tino Didriksen , Kartik Mistry Build-Depends: apertium-dev (>= 3.4), autotools-dev, debhelper (>= 9), dh-autoreconf, gawk, - locales, 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-pt-gl.git +Vcs-Git: https://anonscm.debian.org/cgit/debian-science/packages/apertium-pt-gl.git Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/apertium-pt-gl.git Package: apertium-pt-gl diff --git a/debian/rules b/debian/rules index 11004df..0539901 100755 --- a/debian/rules +++ b/debian/rules @@ -1,27 +1,12 @@ #!/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 + dh $@ --fail-missing --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 +override_dh_installchangelogs: + dh_installchangelogs -k NEWS -- To view, visit https://gerrit.wikimedia.org/r/403116 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1ead8f13cc98d70e0c92a17d31a250118cb77434 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/contenttranslation/apertium-pt-gl 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-pt-gl[master]: apertium-pt-gl: Cleanup
KartikMistry has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403116 ) Change subject: apertium-pt-gl: Cleanup .. apertium-pt-gl: Cleanup * Simplify debian/rules. Do not install duplicate changelog. * Removed dependency on locales. * Other minor cleanups. Change-Id: I1ead8f13cc98d70e0c92a17d31a250118cb77434 --- M debian/changelog M debian/control M debian/rules 3 files changed, 19 insertions(+), 23 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-pt-gl refs/changes/16/403116/1 diff --git a/debian/changelog b/debian/changelog index 48d8bcd..d84b475 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apertium-pt-gl (0.9.2~r60358-2+wmf1) jessie-wikimedia; urgency=low + + * debian/rules: ++ Simplify rules file. ++ Do not install duplicate upstream changelog. + * debian/control: ++ Removed dependency on locales. ++ Updated Vcs-Git URL. ++ Updated to Standards-Version 3.9.8 + + -- Kartik Mistry Tue, 09 Jan 2018 14:18:38 +0530 + apertium-pt-gl (0.9.2~r60358-1) jessie-wikimedia; urgency=low * Rebuild for Jessie. diff --git a/debian/control b/debian/control index fd5ff72..1ad6787 100644 --- a/debian/control +++ b/debian/control @@ -2,18 +2,17 @@ Section: science Priority: optional Maintainer: Debian Science Team -Uploaders: Tino Didriksen , +Uploaders: Tino Didriksen , Kartik Mistry Build-Depends: apertium-dev (>= 3.4), autotools-dev, debhelper (>= 9), dh-autoreconf, gawk, - locales, 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-pt-gl.git +Vcs-Git: https://anonscm.debian.org/cgit/debian-science/packages/apertium-pt-gl.git Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/apertium-pt-gl.git Package: apertium-pt-gl diff --git a/debian/rules b/debian/rules index 11004df..0539901 100755 --- a/debian/rules +++ b/debian/rules @@ -1,27 +1,12 @@ #!/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 + dh $@ --fail-missing --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 +override_dh_installchangelogs: + dh_installchangelogs -k NEWS -- To view, visit https://gerrit.wikimedia.org/r/403116 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ead8f13cc98d70e0c92a17d31a250118cb77434 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/contenttranslation/apertium-pt-gl Gerrit-Branch: master Gerrit-Owner: KartikMistry ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
