[SCM] kalzium packaging branch, master, updated. debian/16.08.3-1-69-gd174ceb

Maximiliano Curia maxy at moszumanska.debian.org
Tue Nov 21 15:07:20 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kalzium.git;a=commitdiff;h=da05628

The following commit has been merged in the master branch:
commit da05628375c1140939c4b98a15cac2a4453a3c38
Merge: 5a814c837c9eaeac20fa6b5b92ce81204b2fa7a3 f7aa2c07097e4d15f66e271bc44475f3e83ed87f
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Feb 28 18:01:00 2017 +0100

    Merge branch 'Neon/release-lts' into Neon/release

 debian/watch | 4 ++++
 1 file changed, 4 insertions(+)

diff --cc debian/watch
index 0ab387e,3e4971d..ffd4de2
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,2 +1,7 @@@
  version=4
++<<<<<<< HEAD
 +opts=pgpsigurlmangle=s/$/.sig/ \
 + http://download.kde.org/stable/applications/([\d.]+)/src/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
++=======
+ opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/applications/([\d.]+)/src/kalzium-([\d.]+).tar.xz
++>>>>>>> Neon/release-lts

-- 
kalzium packaging



More information about the pkg-kde-commits mailing list