[Pkg-nagios-changes] [pkg-icingaweb2] 02/02: Moved packaging to debian.org

[Markus Frosch]

This is an automated email from the git hooks/post-receive script.

lazyfrosch pushed a commit to branch master
in repository pkg-icingaweb2.

commit 66f0ec068795a635786f7301a55076e2aa8f3131
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Mar 10 18:02:15 2015 +0100

    Moved packaging to debian.org
---
 debian/.gitignore    |  1 +
 debian/changelog     |  9 ++-------
 debian/control       |  4 ++--
 debian/source/format |  2 +-
 debian/updateversion | 14 --------------
 debian/watch         |  5 +++++
 6 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/debian/.gitignore b/debian/.gitignore
index 3372943..2044abb 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -8,3 +8,4 @@ icingaweb2-module-monitoring/
 icingaweb2-module-setup/
 icingaweb2/
 php-icinga/
+.*.sw[op]
diff --git a/debian/changelog b/debian/changelog
index f01432e..67848d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,5 @@
-icingaweb2 (2.0.0~beta) UNRELEASED; urgency=low
+icingaweb2 (2.0.0~beta2-1) UNRELEASED; urgency=low
 
-  * Icingaweb 2 Debian packaging for snapshot builds
-
-  *** Please note that this package is built from the development tree of
-  *** Icingaweb 2 - Use it with care, because it might be broken or include
-  *** incomplete features and other known issues.
-  *** Please see http://debmon.org and Debian for released package versions.
+  * Initial Debian packaging
 
  -- Markus Frosch <lazyfrosch at debian.org>  Fri, 12 Dec 2014 12:05:21 +0100
diff --git a/debian/control b/debian/control
index ca1e29a..1b193ed 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Uploaders:
 Build-Depends: debhelper (>=9)
 Standards-Version: 3.9.6
 Homepage: https://www.icinga.org
-Vcs-Git: git://git.icinga.org/icingaweb2.git
-Vcs-Browser: https://git.icinga.org/?p=icingaweb2.git;a=summary
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-nagios/pkg-icingaweb2.git
+Vcs-Git: git://anonscm.debian.org/pkg-nagios/pkg-icingaweb2.git
 
 Package: icingaweb2
 Architecture: all
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
diff --git a/debian/updateversion b/debian/updateversion
deleted file mode 100755
index 732bbef..0000000
--- a/debian/updateversion
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-###
-# Helper script to update the Debian changelog locally
-###
-
-set -e
-set -x
-
-#VERSION=$(grep -E "^Version:" icinga2.spec | cut -d" " -f2)
-VERSION=`git describe --abbrev=0 | sed 's/^v//' | grep -oP "^\d+\.\d+\.\d+(-.*)?" | sed 's/-/~/'`
-DEB_VERSION_SUFFIX=$(echo "+icingasnap"`date +%Y%m%d%H%M`"."`git rev-parse --short HEAD`)
-
-# update Debian version
-dch "$@" --newversion "${VERSION}${DEB_VERSION_SUFFIX}" ""
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..19171c2
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,5 @@
+version=3
+# filenamemangle -> prepending icingaweb2 if only tag name
+# versionmangle  -> convert version addition to ~ version
+opts=filenamemangle=s/.+\/(?:icingaweb2-|v)([\d.]+(?:-.+)?).tar.gz/icingaweb2-$1.tar.gz/,versionmangle=s/^([\d.]+)-(.+)?/$1~$2/ \
+https://github.com/Icinga/icingaweb2/releases .*/(?:icingaweb2-|v)([\d.]+(?:-.+)?).tar.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icingaweb2.git