[Pkg-ganeti-devel] [ganeti] 163/165: Update packaging for 2.15
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Tue Aug 11 13:53:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
apoikos pushed a commit to branch master
in repository ganeti.
commit a20336f70ee4b2258a3bdfce56e0b049d4d0e130
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date: Tue Aug 11 15:24:42 2015 +0300
Update packaging for 2.15
---
debian/control | 26 +++++++++++-----------
debian/ganeti-2.14.install | 5 -----
debian/ganeti-2.14.prerm | 24 --------------------
debian/ganeti-2.15.install | 5 +++++
...ian-overrides => ganeti-2.15.lintian-overrides} | 2 +-
.../{ganeti-2.14.postinst => ganeti-2.15.postinst} | 0
debian/ganeti-2.15.prerm | 24 ++++++++++++++++++++
...ganeti-2.14.templates => ganeti-2.15.templates} | 2 +-
debian/ganeti-haskell-2.14.install | 7 ------
debian/ganeti-haskell-2.14.lintian-overrides | 9 --------
debian/ganeti-haskell-2.14.prerm | 24 --------------------
debian/ganeti-haskell-2.15.install | 7 ++++++
debian/ganeti-haskell-2.15.lintian-overrides | 9 ++++++++
...-2.14.postinst => ganeti-haskell-2.15.postinst} | 0
debian/ganeti-haskell-2.15.prerm | 24 ++++++++++++++++++++
....14.templates => ganeti-haskell-2.15.templates} | 2 +-
debian/ganeti-htools-2.14.install | 3 ---
debian/ganeti-htools-2.14.lintian-overrides | 5 -----
debian/ganeti-htools-2.14.prerm | 24 --------------------
debian/ganeti-htools-2.15.install | 3 +++
debian/ganeti-htools-2.15.lintian-overrides | 5 +++++
...s-2.14.postinst => ganeti-htools-2.15.postinst} | 0
debian/ganeti-htools-2.15.prerm | 24 ++++++++++++++++++++
...2.14.templates => ganeti-htools-2.15.templates} | 2 +-
debian/gbp.conf | 2 +-
debian/watch | 2 +-
26 files changed, 120 insertions(+), 120 deletions(-)
diff --git a/debian/control b/debian/control
index 5433429..0d5f7cc 100644
--- a/debian/control
+++ b/debian/control
@@ -67,11 +67,11 @@ Package: ganeti
Architecture: all
Breaks: ganeti2 (<< 2.7.0-2), ganeti-haskell
Replaces: ganeti2 (<< 2.7.0-2), ganeti-haskell, ganeti-htools
-Depends: ganeti-2.14 (= ${source:Version}),
- ganeti-haskell-2.14 (>= ${source:Version}),
- ganeti-haskell-2.14 (<< ${source:Version}.1~),
- ganeti-htools-2.14 (>= ${source:Version}),
- ganeti-htools-2.14 (<< ${source:Version}.1~),
+Depends: ganeti-2.15 (= ${source:Version}),
+ ganeti-haskell-2.15 (>= ${source:Version}),
+ ganeti-haskell-2.15 (<< ${source:Version}.1~),
+ ganeti-htools-2.15 (>= ${source:Version}),
+ ganeti-htools-2.15 (<< ${source:Version}.1~),
adduser, ${misc:Depends}, python
Recommends: drbd-utils | drbd8-utils (>= 8.0.7), qemu-kvm |
xen-linux-system-amd64 | xen-linux-system-686-pae,
@@ -94,7 +94,7 @@ Description: cluster virtualization manager
.
This package installs the complete Ganeti system.
-Package: ganeti-2.14
+Package: ganeti-2.15
Architecture: all
Depends: ${shlibs:Depends},
${misc:Depends},
@@ -134,9 +134,9 @@ Description: cluster virtualization manager - Python components
OS-specific install scripts), startup, shutdown, and failover of instances
between physical systems.
.
- This package provides all architecture-independent components of Ganeti 2.14.
+ This package provides all architecture-independent components of Ganeti 2.15.
-Package: ganeti-haskell-2.14
+Package: ganeti-haskell-2.15
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf | debconf-2.0
Description: cluster virtualization manager - Haskell components
@@ -152,12 +152,12 @@ Description: cluster virtualization manager - Haskell components
OS-specific install scripts), startup, shutdown, and failover of instances
between physical systems.
.
- This package provides the architecture-dependent components of Ganeti 2.14
+ This package provides the architecture-dependent components of Ganeti 2.15
written in Haskell.
Package: ganeti-htools
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ganeti-htools-2.14
+Depends: ${shlibs:Depends}, ${misc:Depends}, ganeti-htools-2.15
Breaks: ganeti2 (<< 2.4)
Description: cluster virtualization manager - tools (stand-alone)
Ganeti is a virtual server cluster management tool built on top of the
@@ -180,10 +180,10 @@ Description: cluster virtualization manager - tools (stand-alone)
This package provides the version intended for stand-alone systems that
are not part of a Ganeti cluster.
-Package: ganeti-htools-2.14
+Package: ganeti-htools-2.15
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: cluster virtualization manager - tools for Ganeti 2.14
+Description: cluster virtualization manager - tools for Ganeti 2.15
Ganeti is a virtual server cluster management tool built on top of the
Xen and KVM virtualization technologies and other free software. It
provides an automated environment to manage highly available virtual
@@ -202,7 +202,7 @@ Description: cluster virtualization manager - tools for Ganeti 2.14
* hspace: cluster capacity calculator.
.
This package provides the version intended for use on systems that are part
- of a Ganeti 2.14 cluster. On stand-alone systems, use ganeti-htools instead.
+ of a Ganeti 2.15 cluster. On stand-alone systems, use ganeti-htools instead.
Package: ganeti-doc
Architecture: all
diff --git a/debian/ganeti-2.14.install b/debian/ganeti-2.14.install
deleted file mode 100644
index 7d383a0..0000000
--- a/debian/ganeti-2.14.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/share/ganeti/2.14
-usr/lib/ganeti/2.14/usr/lib/ganeti
-usr/lib/ganeti/2.14/usr/sbin/ganeti-cleaner
-usr/lib/ganeti/2.14/usr/sbin/ganeti-listrunner
-debian/molly-guard-helper usr/share/ganeti/2.14/
diff --git a/debian/ganeti-2.14.prerm b/debian/ganeti-2.14.prerm
deleted file mode 100644
index 8421f1a..0000000
--- a/debian/ganeti-2.14.prerm
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ]; then
- . /usr/share/debconf/confmodule
-
- if [ /usr/lib/ganeti/default -ef /usr/lib/ganeti/2.14 ]; then
- db_version 2.0
- db_fset ganeti-2.14/abort-removal seen false
- db_subst ganeti-2.14/abort-removal version 2.14
- db_subst ganeti-2.14/abort-removal package ganeti-2.14
- db_input critical ganeti-2.14/abort-removal
- db_go
- db_get ganeti-2.14/abort-removal
-
- if [ "$RET" = "true" ]; then
- echo "Aborting removal on user request"
- exit 1;
- fi
- fi
-fi
-
-#DEBHELPER#
diff --git a/debian/ganeti-2.15.install b/debian/ganeti-2.15.install
new file mode 100644
index 0000000..a59225b
--- /dev/null
+++ b/debian/ganeti-2.15.install
@@ -0,0 +1,5 @@
+usr/share/ganeti/2.15
+usr/lib/ganeti/2.15/usr/lib/ganeti
+usr/lib/ganeti/2.15/usr/sbin/ganeti-cleaner
+usr/lib/ganeti/2.15/usr/sbin/ganeti-listrunner
+debian/molly-guard-helper usr/share/ganeti/2.15/
diff --git a/debian/ganeti-2.14.lintian-overrides b/debian/ganeti-2.15.lintian-overrides
similarity index 77%
rename from debian/ganeti-2.14.lintian-overrides
rename to debian/ganeti-2.15.lintian-overrides
index 16a5580..1a5d7c3 100644
--- a/debian/ganeti-2.14.lintian-overrides
+++ b/debian/ganeti-2.15.lintian-overrides
@@ -1,3 +1,3 @@
# We only use debconf during prerm to interactively abort installation of
# packages that are still in use.
-ganeti-2.14: no-debconf-config
+ganeti-2.15: no-debconf-config
diff --git a/debian/ganeti-2.14.postinst b/debian/ganeti-2.15.postinst
similarity index 100%
rename from debian/ganeti-2.14.postinst
rename to debian/ganeti-2.15.postinst
diff --git a/debian/ganeti-2.15.prerm b/debian/ganeti-2.15.prerm
new file mode 100644
index 0000000..509c5a1
--- /dev/null
+++ b/debian/ganeti-2.15.prerm
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ]; then
+ . /usr/share/debconf/confmodule
+
+ if [ /usr/lib/ganeti/default -ef /usr/lib/ganeti/2.15 ]; then
+ db_version 2.0
+ db_fset ganeti-2.15/abort-removal seen false
+ db_subst ganeti-2.15/abort-removal version 2.15
+ db_subst ganeti-2.15/abort-removal package ganeti-2.15
+ db_input critical ganeti-2.15/abort-removal
+ db_go
+ db_get ganeti-2.15/abort-removal
+
+ if [ "$RET" = "true" ]; then
+ echo "Aborting removal on user request"
+ exit 1;
+ fi
+ fi
+fi
+
+#DEBHELPER#
diff --git a/debian/ganeti-2.14.templates b/debian/ganeti-2.15.templates
similarity index 95%
rename from debian/ganeti-2.14.templates
rename to debian/ganeti-2.15.templates
index 482c608..22e8d17 100644
--- a/debian/ganeti-2.14.templates
+++ b/debian/ganeti-2.15.templates
@@ -7,7 +7,7 @@
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.
-Template: ganeti-2.14/abort-removal
+Template: ganeti-2.15/abort-removal
Type: boolean
Default: true
_Description: Abort ${package} removal?
diff --git a/debian/ganeti-haskell-2.14.install b/debian/ganeti-haskell-2.14.install
deleted file mode 100644
index 042f4ed..0000000
--- a/debian/ganeti-haskell-2.14.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/lib/ganeti/2.14/usr/sbin/ganeti-confd
-usr/lib/ganeti/2.14/usr/sbin/ganeti-metad
-usr/lib/ganeti/2.14/usr/sbin/ganeti-mond
-usr/lib/ganeti/2.14/usr/sbin/ganeti-kvmd
-usr/lib/ganeti/2.14/usr/sbin/ganeti-luxid
-usr/lib/ganeti/2.14/usr/sbin/ganeti-wconfd
-usr/lib/ganeti/2.14/usr/lib/ganeti/mon-collector
diff --git a/debian/ganeti-haskell-2.14.lintian-overrides b/debian/ganeti-haskell-2.14.lintian-overrides
deleted file mode 100644
index b4a97c6..0000000
--- a/debian/ganeti-haskell-2.14.lintian-overrides
+++ /dev/null
@@ -1,9 +0,0 @@
-ganeti-haskell-2.14: hardening-no-fortify-functions usr/lib/ganeti/2.14/usr/sbin/ganeti-confd
-ganeti-haskell-2.14: hardening-no-fortify-functions usr/lib/ganeti/2.14/usr/sbin/ganeti-kvmd
-ganeti-haskell-2.14: hardening-no-fortify-functions usr/lib/ganeti/2.14/usr/sbin/ganeti-luxid
-ganeti-haskell-2.14: hardening-no-fortify-functions usr/lib/ganeti/2.14/usr/sbin/ganeti-mond
-ganeti-haskell-2.14: hardening-no-fortify-functions usr/lib/ganeti/2.14/usr/lib/ganeti/mon-collector
-
-# We only use debconf during prerm to interactively abort installation of
-# packages that are still in use.
-ganeti-haskell-2.14: no-debconf-config
diff --git a/debian/ganeti-haskell-2.14.prerm b/debian/ganeti-haskell-2.14.prerm
deleted file mode 100644
index e89b5f7..0000000
--- a/debian/ganeti-haskell-2.14.prerm
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ]; then
- . /usr/share/debconf/confmodule
-
- if [ /usr/lib/ganeti/default -ef /usr/lib/ganeti/2.14 ]; then
- db_version 2.0
- db_fset ganeti-haskell-2.14/abort-removal seen false
- db_subst ganeti-haskell-2.14/abort-removal version 2.14
- db_subst ganeti-haskell-2.14/abort-removal package ganeti-haskell-2.14
- db_input critical ganeti-haskell-2.14/abort-removal
- db_go
- db_get ganeti-haskell-2.14/abort-removal
-
- if [ "$RET" = "true" ]; then
- echo "Aborting removal on user request"
- exit 1;
- fi
- fi
-fi
-
-#DEBHELPER#
diff --git a/debian/ganeti-haskell-2.15.install b/debian/ganeti-haskell-2.15.install
new file mode 100644
index 0000000..d8c8c0a
--- /dev/null
+++ b/debian/ganeti-haskell-2.15.install
@@ -0,0 +1,7 @@
+usr/lib/ganeti/2.15/usr/sbin/ganeti-confd
+usr/lib/ganeti/2.15/usr/sbin/ganeti-metad
+usr/lib/ganeti/2.15/usr/sbin/ganeti-mond
+usr/lib/ganeti/2.15/usr/sbin/ganeti-kvmd
+usr/lib/ganeti/2.15/usr/sbin/ganeti-luxid
+usr/lib/ganeti/2.15/usr/sbin/ganeti-wconfd
+usr/lib/ganeti/2.15/usr/lib/ganeti/mon-collector
diff --git a/debian/ganeti-haskell-2.15.lintian-overrides b/debian/ganeti-haskell-2.15.lintian-overrides
new file mode 100644
index 0000000..91e6eef
--- /dev/null
+++ b/debian/ganeti-haskell-2.15.lintian-overrides
@@ -0,0 +1,9 @@
+ganeti-haskell-2.15: hardening-no-fortify-functions usr/lib/ganeti/2.15/usr/sbin/ganeti-confd
+ganeti-haskell-2.15: hardening-no-fortify-functions usr/lib/ganeti/2.15/usr/sbin/ganeti-kvmd
+ganeti-haskell-2.15: hardening-no-fortify-functions usr/lib/ganeti/2.15/usr/sbin/ganeti-luxid
+ganeti-haskell-2.15: hardening-no-fortify-functions usr/lib/ganeti/2.15/usr/sbin/ganeti-mond
+ganeti-haskell-2.15: hardening-no-fortify-functions usr/lib/ganeti/2.15/usr/lib/ganeti/mon-collector
+
+# We only use debconf during prerm to interactively abort installation of
+# packages that are still in use.
+ganeti-haskell-2.15: no-debconf-config
diff --git a/debian/ganeti-haskell-2.14.postinst b/debian/ganeti-haskell-2.15.postinst
similarity index 100%
rename from debian/ganeti-haskell-2.14.postinst
rename to debian/ganeti-haskell-2.15.postinst
diff --git a/debian/ganeti-haskell-2.15.prerm b/debian/ganeti-haskell-2.15.prerm
new file mode 100644
index 0000000..9670a9c
--- /dev/null
+++ b/debian/ganeti-haskell-2.15.prerm
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ]; then
+ . /usr/share/debconf/confmodule
+
+ if [ /usr/lib/ganeti/default -ef /usr/lib/ganeti/2.15 ]; then
+ db_version 2.0
+ db_fset ganeti-haskell-2.15/abort-removal seen false
+ db_subst ganeti-haskell-2.15/abort-removal version 2.15
+ db_subst ganeti-haskell-2.15/abort-removal package ganeti-haskell-2.15
+ db_input critical ganeti-haskell-2.15/abort-removal
+ db_go
+ db_get ganeti-haskell-2.15/abort-removal
+
+ if [ "$RET" = "true" ]; then
+ echo "Aborting removal on user request"
+ exit 1;
+ fi
+ fi
+fi
+
+#DEBHELPER#
diff --git a/debian/ganeti-haskell-2.14.templates b/debian/ganeti-haskell-2.15.templates
similarity index 94%
rename from debian/ganeti-haskell-2.14.templates
rename to debian/ganeti-haskell-2.15.templates
index 9d8a7c4..59a7436 100644
--- a/debian/ganeti-haskell-2.14.templates
+++ b/debian/ganeti-haskell-2.15.templates
@@ -7,7 +7,7 @@
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.
-Template: ganeti-haskell-2.14/abort-removal
+Template: ganeti-haskell-2.15/abort-removal
Type: boolean
Default: true
_Description: Abort ${package} removal?
diff --git a/debian/ganeti-htools-2.14.install b/debian/ganeti-htools-2.14.install
deleted file mode 100644
index 7c762c7..0000000
--- a/debian/ganeti-htools-2.14.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/ganeti/2.14/usr/bin
-usr/share/ganeti/2.14/root/usr/share/man/man1/h*
-usr/lib/ganeti/2.14/usr/lib/ganeti/iallocators/hail
diff --git a/debian/ganeti-htools-2.14.lintian-overrides b/debian/ganeti-htools-2.14.lintian-overrides
deleted file mode 100644
index 0659e31..0000000
--- a/debian/ganeti-htools-2.14.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-ganeti-htools-2.14: hardening-no-fortify-functions usr/lib/ganeti/2.14/usr/bin/htools
-
-# We only use debconf during prerm to interactively abort installation of
-# packages that are still in use.
-ganeti-htools-2.14: no-debconf-config
diff --git a/debian/ganeti-htools-2.14.prerm b/debian/ganeti-htools-2.14.prerm
deleted file mode 100644
index 81f92b7..0000000
--- a/debian/ganeti-htools-2.14.prerm
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ]; then
- . /usr/share/debconf/confmodule
-
- if [ /usr/lib/ganeti/default -ef /usr/lib/ganeti/2.14 ]; then
- db_version 2.0
- db_fset ganeti-htools-2.14/abort-removal seen false
- db_subst ganeti-htools-2.14/abort-removal version 2.14
- db_subst ganeti-htools-2.14/abort-removal package ganeti-htools-2.14
- db_input critical ganeti-htools-2.14/abort-removal
- db_go
- db_get ganeti-htools-2.14/abort-removal
-
- if [ "$RET" = "true" ]; then
- echo "Aborting removal on user request"
- exit 1;
- fi
- fi
-fi
-
-#DEBHELPER#
diff --git a/debian/ganeti-htools-2.15.install b/debian/ganeti-htools-2.15.install
new file mode 100644
index 0000000..11825ea
--- /dev/null
+++ b/debian/ganeti-htools-2.15.install
@@ -0,0 +1,3 @@
+usr/lib/ganeti/2.15/usr/bin
+usr/share/ganeti/2.15/root/usr/share/man/man1/h*
+usr/lib/ganeti/2.15/usr/lib/ganeti/iallocators/hail
diff --git a/debian/ganeti-htools-2.15.lintian-overrides b/debian/ganeti-htools-2.15.lintian-overrides
new file mode 100644
index 0000000..1aa7a09
--- /dev/null
+++ b/debian/ganeti-htools-2.15.lintian-overrides
@@ -0,0 +1,5 @@
+ganeti-htools-2.15: hardening-no-fortify-functions usr/lib/ganeti/2.15/usr/bin/htools
+
+# We only use debconf during prerm to interactively abort installation of
+# packages that are still in use.
+ganeti-htools-2.15: no-debconf-config
diff --git a/debian/ganeti-htools-2.14.postinst b/debian/ganeti-htools-2.15.postinst
similarity index 100%
rename from debian/ganeti-htools-2.14.postinst
rename to debian/ganeti-htools-2.15.postinst
diff --git a/debian/ganeti-htools-2.15.prerm b/debian/ganeti-htools-2.15.prerm
new file mode 100644
index 0000000..9fe7eab
--- /dev/null
+++ b/debian/ganeti-htools-2.15.prerm
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ]; then
+ . /usr/share/debconf/confmodule
+
+ if [ /usr/lib/ganeti/default -ef /usr/lib/ganeti/2.15 ]; then
+ db_version 2.0
+ db_fset ganeti-htools-2.15/abort-removal seen false
+ db_subst ganeti-htools-2.15/abort-removal version 2.15
+ db_subst ganeti-htools-2.15/abort-removal package ganeti-htools-2.15
+ db_input critical ganeti-htools-2.15/abort-removal
+ db_go
+ db_get ganeti-htools-2.15/abort-removal
+
+ if [ "$RET" = "true" ]; then
+ echo "Aborting removal on user request"
+ exit 1;
+ fi
+ fi
+fi
+
+#DEBHELPER#
diff --git a/debian/ganeti-htools-2.14.templates b/debian/ganeti-htools-2.15.templates
similarity index 94%
rename from debian/ganeti-htools-2.14.templates
rename to debian/ganeti-htools-2.15.templates
index 868e569..523521c 100644
--- a/debian/ganeti-htools-2.14.templates
+++ b/debian/ganeti-htools-2.15.templates
@@ -7,7 +7,7 @@
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.
-Template: ganeti-htools-2.14/abort-removal
+Template: ganeti-htools-2.15/abort-removal
Type: boolean
Default: true
_Description: Abort ${package} removal?
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 4ddebcb..26c1bb1 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,7 +3,7 @@ sign-tags = True
pristine-tar = True
upstream-tag = v%(version)s
upstream-tree = tag
-upstream-branch = stable-2.14
+upstream-branch = stable-2.15
[git-buildpackage]
export-dir = ../build-area/
diff --git a/debian/watch b/debian/watch
index bfaabf6..309abed 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
opts=pgpsigurlmangle=s/$/.sig/ \
- http://downloads.ganeti.org/releases/2.14/ ganeti-(\d+\.\d+[\d.]+(?:~rc[0-9]+)?)\.tar\.gz
+ http://downloads.ganeti.org/releases/2.15/ ganeti-(\d+\.\d+[\d.]+(?:~rc[0-9]+)?)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git
More information about the Pkg-ganeti-devel
mailing list