[devscripts] 01/01: Replace git-import-orig references with gbp-import-orig
James McCoy
jamessan at debian.org
Tue Jun 28 02:06:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch master
in repository devscripts.
commit 8dec22a7f88fc60f32a25662ffccb541c6521e35
Author: James McCoy <jamessan at debian.org>
Date: Mon Jun 27 21:35:48 2016 -0400
Replace git-import-orig references with gbp-import-orig
Signed-off-by: James McCoy <jamessan at debian.org>
---
debian/changelog | 2 ++
po4a/po/de.po | 8 ++++----
po4a/po/devscripts.pot | 4 ++--
po4a/po/fr.po | 8 ++++----
scripts/origtargz.pl | 4 ++--
5 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a07a472..a50de74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ devscripts (2.16.6) UNRELEASED; urgency=medium
+ Merging the existing changelog stanza when a package is UNRELEASED and
--newversion is used now also happens with --distribution. Thanks to
Ilias Tsitsimpi for the patch. (Closes: #826837)
+ * Replace git-import-orig references with gbp-import-orig. Thanks to Guido
+ Günther for the patch. (Closes: #828758)
[ Paul Wise ]
* uscan:
diff --git a/po4a/po/de.po b/po4a/po/de.po
index ee11bc2..50e7ca9 100644
--- a/po4a/po/de.po
+++ b/po4a/po/de.po
@@ -16581,12 +16581,12 @@ msgstr ""
msgid ""
"For Debian package repositories that keep the full upstream source, other "
"tools should be used to upgrade the repository from the new tarball. See "
-"B<git-import-orig>(1) and B<svn-upgrade>(1) for examples. B<origtargz> is "
+"B<gbp-import-orig>(1) and B<svn-upgrade>(1) for examples. B<origtargz> is "
"still useful for downloading the current tarball."
msgstr ""
"Für Debian-Paketdepots, die die ganze Ursprungsquelle beibehalten, sollten "
"andere Werkzeuge benutzt werden, um ein Upgrade des Depots von dem neuen "
-"Tarball durchzuführen. Siehe zum Beispiel B<git-import-orig>(1) und B<svn-"
+"Tarball durchzuführen. Siehe zum Beispiel B<gbp-import-orig>(1) und B<svn-"
"upgrade>(1). B<origtargz> ist immer noch zum Herunterladen des aktuellen "
"Tarballs nützlich."
@@ -16703,10 +16703,10 @@ msgstr ""
#. type: textblock
#: ../scripts/origtargz.pl:159
msgid ""
-"B<debcheckout>(1), B<git-import-orig>(1), B<pristine-tar>(1), B<svn-"
+"B<debcheckout>(1), B<gbp-import-orig>(1), B<pristine-tar>(1), B<svn-"
"upgrade>(1), B<uupdate>(1)"
msgstr ""
-"B<debcheckout>(1), B<git-import-orig>(1), B<pristine-tar>(1), B<svn-"
+"B<debcheckout>(1), B<gbp-import-orig>(1), B<pristine-tar>(1), B<svn-"
"upgrade>(1), B<uupdate>(1)"
#. type: textblock
diff --git a/po4a/po/devscripts.pot b/po4a/po/devscripts.pot
index 8da4057..a8e7963 100644
--- a/po4a/po/devscripts.pot
+++ b/po4a/po/devscripts.pot
@@ -12956,7 +12956,7 @@ msgstr ""
msgid ""
"For Debian package repositories that keep the full upstream source, other "
"tools should be used to upgrade the repository from the new tarball. See "
-"B<git-import-orig>(1) and B<svn-upgrade>(1) for examples. B<origtargz> is "
+"B<gbp-import-orig>(1) and B<svn-upgrade>(1) for examples. B<origtargz> is "
"still useful for downloading the current tarball."
msgstr ""
@@ -13055,7 +13055,7 @@ msgstr ""
#. type: textblock
#: ../scripts/origtargz.pl:159
msgid ""
-"B<debcheckout>(1), B<git-import-orig>(1), B<pristine-tar>(1), "
+"B<debcheckout>(1), B<gbp-import-orig>(1), B<pristine-tar>(1), "
"B<svn-upgrade>(1), B<uupdate>(1)"
msgstr ""
diff --git a/po4a/po/fr.po b/po4a/po/fr.po
index 770156b..f709f35 100644
--- a/po4a/po/fr.po
+++ b/po4a/po/fr.po
@@ -16596,12 +16596,12 @@ msgstr ""
msgid ""
"For Debian package repositories that keep the full upstream source, other "
"tools should be used to upgrade the repository from the new tarball. See "
-"B<git-import-orig>(1) and B<svn-upgrade>(1) for examples. B<origtargz> is "
+"B<gbp-import-orig>(1) and B<svn-upgrade>(1) for examples. B<origtargz> is "
"still useful for downloading the current tarball."
msgstr ""
"Pour les dépôts de paquet Debian gardant l'intégralité des sources amont, "
"d'autres outils devraient être utilisés pour mettre à niveau le dépôt à "
-"partir de l'archive amont. Consultez par exemple B<git-import-orig>(1) et "
+"partir de l'archive amont. Consultez par exemple B<gbp-import-orig>(1) et "
"B<svn-upgrade>(1). B<origtargz> est toujours utile pour télécharger "
"l'archive amont actuelle."
@@ -16718,10 +16718,10 @@ msgstr ""
#. type: textblock
#: ../scripts/origtargz.pl:159
msgid ""
-"B<debcheckout>(1), B<git-import-orig>(1), B<pristine-tar>(1), B<svn-"
+"B<debcheckout>(1), B<gbp-import-orig>(1), B<pristine-tar>(1), B<svn-"
"upgrade>(1), B<uupdate>(1)"
msgstr ""
-"B<debcheckout>(1), B<git-import-orig>(1), B<pristine-tar>(1), B<svn-"
+"B<debcheckout>(1), B<gbp-import-orig>(1), B<pristine-tar>(1), B<svn-"
"upgrade>(1), B<uupdate>(1)"
#. type: textblock
diff --git a/scripts/origtargz.pl b/scripts/origtargz.pl
index 6fba5fb..c9430b6 100755
--- a/scripts/origtargz.pl
+++ b/scripts/origtargz.pl
@@ -90,7 +90,7 @@ metadata.
For Debian package repositories that keep the full upstream source, other tools
should be used to upgrade the repository from the new tarball. See
-B<git-import-orig>(1) and B<svn-upgrade>(1) for examples. B<origtargz> is still
+B<gbp-import-orig>(1) and B<svn-upgrade>(1) for examples. B<origtargz> is still
useful for downloading the current tarball.
=head1 OPTIONS
@@ -157,7 +157,7 @@ will remove upstream files even if they are stored in VCS.
=head1 SEE ALSO
-B<debcheckout>(1), B<git-import-orig>(1), B<pristine-tar>(1), B<svn-upgrade>(1), B<uupdate>(1)
+B<debcheckout>(1), B<gbp-import-orig>(1), B<pristine-tar>(1), B<svn-upgrade>(1), B<uupdate>(1)
=head1 AUTHOR
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git
More information about the devscripts-devel
mailing list