From 409dc7faca4bce27e51aa159819d804340baef54 Mon Sep 17 00:00:00 2001 From: Ivan Rako Date: Thu, 13 Aug 2020 22:57:17 +0200 Subject: [PATCH] Ispravke za Lintian. --- debian/changelog | 4 ---- debian/po/templates.pot | 10 +++++----- debian/source/format | 1 + 3 files changed, 6 insertions(+), 9 deletions(-) create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index 20e7866..ddbb4c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,9 @@ -<<<<<<< HEAD postfix-cn (3.4.10~cn0) stable; urgency=medium * Prva verzija za buster -- Ivan Rako Thu, 13 Aug 2020 19:05:45 +0200 -postfix-cn (3.1.8~cn1) stable; urgency=medium -======= postfix-cn (3.1.8~cn2) stable; urgency=medium * Non-maintainer upload. @@ -16,7 +13,6 @@ postfix-cn (3.1.8~cn2) stable; urgency=medium -- Zeljko Boros Wed, 05 Feb 2020 15:27:43 +0100 ppostfix-cn (3.1.8~cn1) stable; urgency=medium ->>>>>>> 1185b2ef230939782be3a96949ad7d7dfa738686 * sdbm->btree * rjesava gresku "using backwards-compatible default setting chroot=y" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 4fc5406..4caca45 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the postfix-cn package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: postfix-cn\n" "Report-Msgid-Bugs-To: postfix-cn@packages.debian.org\n" -"POT-Creation-Date: 2012-05-03 11:09+0200\n" +"POT-Creation-Date: 2020-08-13 22:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,8 +35,8 @@ msgstr "" #. Description #: ../templates:1001 msgid "" -"VAZNO: Zbog licencnih razloga pristup CARNetovom RBL posluzitelju je " -"dopusten samo sa CARNetove mreze (161.53.0.0/16 i 193.198.0.0/16)." +"VAZNO: Zbog licencnih razloga pristup CARNETovom RBL posluzitelju je " +"dopusten samo sa CARNETove mreze (161.53.0.0/16 i 193.198.0.0/16)." msgstr "" #. Type: boolean diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0 -- 1.7.10.4