[Pkg-ganeti-devel] [ganeti] 05/13: Update packaging for 2.12
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Mon Oct 13 08:15:01 UTC 2014
This is an automated email from the git hooks/post-receive script.
apoikos pushed a commit to branch master
in repository ganeti.
commit dabfb611789289636aba44d79aee888605dd7eff
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date: Wed Sep 17 14:08:22 2014 +0300
Update packaging for 2.12
---
debian/control | 29 +++++++++++-----------
debian/ganeti-2.11.install | 5 ----
debian/ganeti-2.11.prerm | 24 ------------------
debian/ganeti-2.12.install | 5 ++++
...ian-overrides => ganeti-2.12.lintian-overrides} | 2 +-
.../{ganeti-2.11.postinst => ganeti-2.12.postinst} | 0
debian/ganeti-2.12.prerm | 24 ++++++++++++++++++
...askell-2.11.templates => ganeti-2.12.templates} | 11 +++++++-
debian/ganeti-haskell-2.11.install | 5 ----
debian/ganeti-haskell-2.11.lintian-overrides | 9 -------
debian/ganeti-haskell-2.11.prerm | 24 ------------------
debian/ganeti-haskell-2.12.install | 5 ++++
debian/ganeti-haskell-2.12.lintian-overrides | 9 +++++++
...-2.11.postinst => ganeti-haskell-2.12.postinst} | 0
debian/ganeti-haskell-2.12.prerm | 24 ++++++++++++++++++
....11.templates => ganeti-haskell-2.12.templates} | 11 +++++++-
debian/ganeti-htools-2.11.install | 3 ---
debian/ganeti-htools-2.11.lintian-overrides | 5 ----
debian/ganeti-htools-2.11.prerm | 24 ------------------
debian/ganeti-htools-2.12.install | 3 +++
debian/ganeti-htools-2.12.lintian-overrides | 5 ++++
...s-2.11.postinst => ganeti-htools-2.12.postinst} | 0
debian/ganeti-htools-2.12.prerm | 24 ++++++++++++++++++
...2.11.templates => ganeti-htools-2.12.templates} | 11 +++++++-
24 files changed, 144 insertions(+), 118 deletions(-)
diff --git a/debian/control b/debian/control
index a8966e2..c123d2c 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,6 @@ Build-Depends: debhelper (>= 9),
libghc-attoparsec-dev,
libghc-vector-dev,
libpcre3-dev,
- libcurl4-openssl-dev,
python-simplejson,
python-pyparsing,
python-openssl,
@@ -58,12 +57,12 @@ 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.11 (= ${source:Version}),
- ganeti-haskell-2.11 (>= ${source:Version}),
- ganeti-haskell-2.11 (<< ${source:Version}.1~),
- ganeti-htools-2.11 (>= ${source:Version}),
- ganeti-htools-2.11 (<< ${source:Version}.1~),
- adduser, python, ${misc:Depends}
+Depends: ganeti-2.12 (= ${source:Version}),
+ ganeti-haskell-2.12 (>= ${source:Version}),
+ ganeti-haskell-2.12 (<< ${source:Version}.1~),
+ ganeti-htools-2.12 (>= ${source:Version}),
+ ganeti-htools-2.12 (<< ${source:Version}.1~),
+ adduser, ${misc:Depends}
Recommends: drbd-utils | drbd8-utils (>= 8.0.7), qemu-kvm |
xen-linux-system-amd64 | xen-linux-system-686-pae,
ganeti-instance-debootstrap, ndisc6
@@ -85,7 +84,7 @@ Description: cluster virtualization manager
.
This package installs the complete Ganeti system.
-Package: ganeti-2.11
+Package: ganeti-2.12
Architecture: all
Depends: ${shlibs:Depends},
${misc:Depends},
@@ -125,9 +124,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.11.
+ This package provides all architecture-independent components of Ganeti 2.12.
-Package: ganeti-haskell-2.11
+Package: ganeti-haskell-2.12
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf | debconf-2.0
Description: cluster virtualization manager - Haskell components
@@ -143,12 +142,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.11
+ This package provides the architecture-dependent components of Ganeti 2.12
written in Haskell.
Package: ganeti-htools
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ganeti-htools-2.11
+Depends: ${shlibs:Depends}, ${misc:Depends}, ganeti-htools-2.12
Breaks: ganeti2 (<< 2.4)
Description: cluster virtualization manager - tools (stand-alone)
Ganeti is a virtual server cluster management tool built on top of the
@@ -171,10 +170,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.11
+Package: ganeti-htools-2.12
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: cluster virtualization manager - tools for Ganeti 2.11
+Description: cluster virtualization manager - tools for Ganeti 2.12
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
@@ -193,7 +192,7 @@ Description: cluster virtualization manager - tools for Ganeti 2.11
* hspace: cluster capacity calculator.
.
This package provides the version intended for use on systems that are part
- of a Ganeti 2.11 cluster. On stand-alone systems, use ganeti-htools instead.
+ of a Ganeti 2.12 cluster. On stand-alone systems, use ganeti-htools instead.
Package: ganeti-doc
Architecture: all
diff --git a/debian/ganeti-2.11.install b/debian/ganeti-2.11.install
deleted file mode 100644
index 1d7458a..0000000
--- a/debian/ganeti-2.11.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/share/ganeti/2.11
-usr/lib/ganeti/2.11/usr/lib/ganeti
-usr/lib/ganeti/2.11/usr/sbin/ganeti-cleaner
-usr/lib/ganeti/2.11/usr/sbin/ganeti-listrunner
-debian/molly-guard-helper usr/share/ganeti/2.11/
diff --git a/debian/ganeti-2.11.prerm b/debian/ganeti-2.11.prerm
deleted file mode 100644
index 4371d90..0000000
--- a/debian/ganeti-2.11.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.11 ]; then
- db_version 2.0
- db_fset ganeti-2.11/abort-removal seen false
- db_subst ganeti-2.11/abort-removal version 2.11
- db_subst ganeti-2.11/abort-removal package ganeti-2.11
- db_input critical ganeti-2.11/abort-removal
- db_go
- db_get ganeti-2.11/abort-removal
-
- if [ "$RET" = "true" ]; then
- echo "Aborting removal on user request"
- exit 1;
- fi
- fi
-fi
-
-#DEBHELPER#
diff --git a/debian/ganeti-2.12.install b/debian/ganeti-2.12.install
new file mode 100644
index 0000000..a95bfdf
--- /dev/null
+++ b/debian/ganeti-2.12.install
@@ -0,0 +1,5 @@
+usr/share/ganeti/2.12
+usr/lib/ganeti/2.12/usr/lib/ganeti
+usr/lib/ganeti/2.12/usr/sbin/ganeti-cleaner
+usr/lib/ganeti/2.12/usr/sbin/ganeti-listrunner
+debian/molly-guard-helper usr/share/ganeti/2.12/
diff --git a/debian/ganeti-2.11.lintian-overrides b/debian/ganeti-2.12.lintian-overrides
similarity index 77%
rename from debian/ganeti-2.11.lintian-overrides
rename to debian/ganeti-2.12.lintian-overrides
index fe512e4..17b1919 100644
--- a/debian/ganeti-2.11.lintian-overrides
+++ b/debian/ganeti-2.12.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.11: no-debconf-config
+ganeti-2.12: no-debconf-config
diff --git a/debian/ganeti-2.11.postinst b/debian/ganeti-2.12.postinst
similarity index 100%
rename from debian/ganeti-2.11.postinst
rename to debian/ganeti-2.12.postinst
diff --git a/debian/ganeti-2.12.prerm b/debian/ganeti-2.12.prerm
new file mode 100644
index 0000000..99a8daa
--- /dev/null
+++ b/debian/ganeti-2.12.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.12 ]; then
+ db_version 2.0
+ db_fset ganeti-2.12/abort-removal seen false
+ db_subst ganeti-2.12/abort-removal version 2.12
+ db_subst ganeti-2.12/abort-removal package ganeti-2.12
+ db_input critical ganeti-2.12/abort-removal
+ db_go
+ db_get ganeti-2.12/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.11.templates b/debian/ganeti-2.12.templates
similarity index 57%
rename from debian/ganeti-haskell-2.11.templates
rename to debian/ganeti-2.12.templates
index c559fbe..d5857c0 100644
--- a/debian/ganeti-haskell-2.11.templates
+++ b/debian/ganeti-2.12.templates
@@ -1,4 +1,13 @@
-Template: ganeti-haskell-2.11/abort-removal
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english at lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: ganeti-2.12/abort-removal
Type: boolean
Default: true
_Description: Abort ${package} removal?
diff --git a/debian/ganeti-haskell-2.11.install b/debian/ganeti-haskell-2.11.install
deleted file mode 100644
index e417c3d..0000000
--- a/debian/ganeti-haskell-2.11.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/ganeti/2.11/usr/sbin/ganeti-confd
-usr/lib/ganeti/2.11/usr/sbin/ganeti-mond
-usr/lib/ganeti/2.11/usr/sbin/ganeti-kvmd
-usr/lib/ganeti/2.11/usr/sbin/ganeti-luxid
-usr/lib/ganeti/2.11/usr/lib/ganeti/mon-collector
diff --git a/debian/ganeti-haskell-2.11.lintian-overrides b/debian/ganeti-haskell-2.11.lintian-overrides
deleted file mode 100644
index 27e5088..0000000
--- a/debian/ganeti-haskell-2.11.lintian-overrides
+++ /dev/null
@@ -1,9 +0,0 @@
-ganeti-haskell-2.11: hardening-no-fortify-functions usr/lib/ganeti/2.11/usr/sbin/ganeti-confd
-ganeti-haskell-2.11: hardening-no-fortify-functions usr/lib/ganeti/2.11/usr/sbin/ganeti-kvmd
-ganeti-haskell-2.11: hardening-no-fortify-functions usr/lib/ganeti/2.11/usr/sbin/ganeti-luxid
-ganeti-haskell-2.11: hardening-no-fortify-functions usr/lib/ganeti/2.11/usr/sbin/ganeti-mond
-ganeti-haskell-2.11: hardening-no-fortify-functions usr/lib/ganeti/2.11/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.11: no-debconf-config
diff --git a/debian/ganeti-haskell-2.11.prerm b/debian/ganeti-haskell-2.11.prerm
deleted file mode 100644
index 4db58d6..0000000
--- a/debian/ganeti-haskell-2.11.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.11 ]; then
- db_version 2.0
- db_fset ganeti-haskell-2.11/abort-removal seen false
- db_subst ganeti-haskell-2.11/abort-removal version 2.11
- db_subst ganeti-haskell-2.11/abort-removal package ganeti-haskell-2.11
- db_input critical ganeti-haskell-2.11/abort-removal
- db_go
- db_get ganeti-haskell-2.11/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.12.install b/debian/ganeti-haskell-2.12.install
new file mode 100644
index 0000000..5e01d43
--- /dev/null
+++ b/debian/ganeti-haskell-2.12.install
@@ -0,0 +1,5 @@
+usr/lib/ganeti/2.12/usr/sbin/ganeti-confd
+usr/lib/ganeti/2.12/usr/sbin/ganeti-mond
+usr/lib/ganeti/2.12/usr/sbin/ganeti-kvmd
+usr/lib/ganeti/2.12/usr/sbin/ganeti-luxid
+usr/lib/ganeti/2.12/usr/lib/ganeti/mon-collector
diff --git a/debian/ganeti-haskell-2.12.lintian-overrides b/debian/ganeti-haskell-2.12.lintian-overrides
new file mode 100644
index 0000000..cd2bcd2
--- /dev/null
+++ b/debian/ganeti-haskell-2.12.lintian-overrides
@@ -0,0 +1,9 @@
+ganeti-haskell-2.12: hardening-no-fortify-functions usr/lib/ganeti/2.12/usr/sbin/ganeti-confd
+ganeti-haskell-2.12: hardening-no-fortify-functions usr/lib/ganeti/2.12/usr/sbin/ganeti-kvmd
+ganeti-haskell-2.12: hardening-no-fortify-functions usr/lib/ganeti/2.12/usr/sbin/ganeti-luxid
+ganeti-haskell-2.12: hardening-no-fortify-functions usr/lib/ganeti/2.12/usr/sbin/ganeti-mond
+ganeti-haskell-2.12: hardening-no-fortify-functions usr/lib/ganeti/2.12/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.12: no-debconf-config
diff --git a/debian/ganeti-haskell-2.11.postinst b/debian/ganeti-haskell-2.12.postinst
similarity index 100%
rename from debian/ganeti-haskell-2.11.postinst
rename to debian/ganeti-haskell-2.12.postinst
diff --git a/debian/ganeti-haskell-2.12.prerm b/debian/ganeti-haskell-2.12.prerm
new file mode 100644
index 0000000..e263ea1
--- /dev/null
+++ b/debian/ganeti-haskell-2.12.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.12 ]; then
+ db_version 2.0
+ db_fset ganeti-haskell-2.12/abort-removal seen false
+ db_subst ganeti-haskell-2.12/abort-removal version 2.12
+ db_subst ganeti-haskell-2.12/abort-removal package ganeti-haskell-2.12
+ db_input critical ganeti-haskell-2.12/abort-removal
+ db_go
+ db_get ganeti-haskell-2.12/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.11.templates b/debian/ganeti-haskell-2.12.templates
similarity index 56%
rename from debian/ganeti-htools-2.11.templates
rename to debian/ganeti-haskell-2.12.templates
index 2779d98..8f7fee7 100644
--- a/debian/ganeti-htools-2.11.templates
+++ b/debian/ganeti-haskell-2.12.templates
@@ -1,4 +1,13 @@
-Template: ganeti-htools-2.11/abort-removal
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english at lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: ganeti-haskell-2.12/abort-removal
Type: boolean
Default: true
_Description: Abort ${package} removal?
diff --git a/debian/ganeti-htools-2.11.install b/debian/ganeti-htools-2.11.install
deleted file mode 100644
index aa6b29b..0000000
--- a/debian/ganeti-htools-2.11.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/ganeti/2.11/usr/bin
-usr/share/ganeti/2.11/root/usr/share/man/man1/h*
-usr/lib/ganeti/2.11/usr/lib/ganeti/iallocators/hail
diff --git a/debian/ganeti-htools-2.11.lintian-overrides b/debian/ganeti-htools-2.11.lintian-overrides
deleted file mode 100644
index 003dcf4..0000000
--- a/debian/ganeti-htools-2.11.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-ganeti-htools-2.11: hardening-no-fortify-functions usr/lib/ganeti/2.11/usr/bin/htools
-
-# We only use debconf during prerm to interactively abort installation of
-# packages that are still in use.
-ganeti-htools-2.11: no-debconf-config
diff --git a/debian/ganeti-htools-2.11.prerm b/debian/ganeti-htools-2.11.prerm
deleted file mode 100644
index eeb3eeb..0000000
--- a/debian/ganeti-htools-2.11.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.11 ]; then
- db_version 2.0
- db_fset ganeti-htools-2.11/abort-removal seen false
- db_subst ganeti-htools-2.11/abort-removal version 2.11
- db_subst ganeti-htools-2.11/abort-removal package ganeti-htools-2.11
- db_input critical ganeti-htools-2.11/abort-removal
- db_go
- db_get ganeti-htools-2.11/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.12.install b/debian/ganeti-htools-2.12.install
new file mode 100644
index 0000000..aaeeefc
--- /dev/null
+++ b/debian/ganeti-htools-2.12.install
@@ -0,0 +1,3 @@
+usr/lib/ganeti/2.12/usr/bin
+usr/share/ganeti/2.12/root/usr/share/man/man1/h*
+usr/lib/ganeti/2.12/usr/lib/ganeti/iallocators/hail
diff --git a/debian/ganeti-htools-2.12.lintian-overrides b/debian/ganeti-htools-2.12.lintian-overrides
new file mode 100644
index 0000000..e021ec6
--- /dev/null
+++ b/debian/ganeti-htools-2.12.lintian-overrides
@@ -0,0 +1,5 @@
+ganeti-htools-2.12: hardening-no-fortify-functions usr/lib/ganeti/2.12/usr/bin/htools
+
+# We only use debconf during prerm to interactively abort installation of
+# packages that are still in use.
+ganeti-htools-2.12: no-debconf-config
diff --git a/debian/ganeti-htools-2.11.postinst b/debian/ganeti-htools-2.12.postinst
similarity index 100%
rename from debian/ganeti-htools-2.11.postinst
rename to debian/ganeti-htools-2.12.postinst
diff --git a/debian/ganeti-htools-2.12.prerm b/debian/ganeti-htools-2.12.prerm
new file mode 100644
index 0000000..bba23ab
--- /dev/null
+++ b/debian/ganeti-htools-2.12.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.12 ]; then
+ db_version 2.0
+ db_fset ganeti-htools-2.12/abort-removal seen false
+ db_subst ganeti-htools-2.12/abort-removal version 2.12
+ db_subst ganeti-htools-2.12/abort-removal package ganeti-htools-2.12
+ db_input critical ganeti-htools-2.12/abort-removal
+ db_go
+ db_get ganeti-htools-2.12/abort-removal
+
+ if [ "$RET" = "true" ]; then
+ echo "Aborting removal on user request"
+ exit 1;
+ fi
+ fi
+fi
+
+#DEBHELPER#
diff --git a/debian/ganeti-2.11.templates b/debian/ganeti-htools-2.12.templates
similarity index 56%
rename from debian/ganeti-2.11.templates
rename to debian/ganeti-htools-2.12.templates
index 746b3bf..e1982ad 100644
--- a/debian/ganeti-2.11.templates
+++ b/debian/ganeti-htools-2.12.templates
@@ -1,4 +1,13 @@
-Template: ganeti-2.11/abort-removal
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english at lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: ganeti-htools-2.12/abort-removal
Type: boolean
Default: true
_Description: Abort ${package} removal?
--
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