This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor.
commit c50cf0b863edf30c40c8573ef4100d01d942efde Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Jun 6 22:24:01 2016 +0200 Add patch to fix 'committed' typo. --- debian/changelog | 1 + debian/patches/committed-typo.patch | 26 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 28 insertions(+) diff --git a/debian/changelog b/debian/changelog index fc3d381..f96c5a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ merkaartor (0.18.3~rc1-1) UNRELEASED; urgency=medium - Update copyright years for Bart Vanhauwaert, Chris Browet & Ladislav Láska. * Drop patches applied upstream, refresh remaining patches. + * Add patch to fix 'committed' typo. -- Bas Couwenberg <sebas...@debian.org> Mon, 06 Jun 2016 20:12:06 +0200 diff --git a/debian/patches/committed-typo.patch b/debian/patches/committed-typo.patch new file mode 100644 index 0000000..9b4ca91 --- /dev/null +++ b/debian/patches/committed-typo.patch @@ -0,0 +1,26 @@ +Description: Fix 'commited' typo, replace with 'committed'. +Author: Bas Couwenberg <sebas...@debian.org> +Forwarded: https://github.com/openstreetmap/merkaartor/pull/113 + +--- a/src/Sync/SyncListDialog.ui ++++ b/src/Sync/SyncListDialog.ui +@@ -56,7 +56,7 @@ + <item> + <widget class="QLabel" name="label"> + <property name="text"> +- <string>The following changes will be commited:</string> ++ <string>The following changes will be committed:</string> + </property> + </widget> + </item> +--- a/translations/README.md ++++ b/translations/README.md +@@ -13,7 +13,7 @@ The regular workflow is: + This pushes the original english strings to Transifex, updating the database and + allowing new strings to be downloaded. + +-1) Before release, Transifex data should be pulled and commited into the ++1) Before release, Transifex data should be pulled and committed into the + repository. This is not necessary, but serves as a backup in case something + terrible happens to Transifex. + diff --git a/debian/patches/series b/debian/patches/series index 2016e86..276b615 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ qmake-config-nostrip.patch +committed-typo.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel