[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, for-review, updated. debian/2.7.0-1-29-g845ac58

Apollon Oikonomopoulos apoikos at gmail.com
Tue Jul 16 11:44:23 UTC 2013 

The following commit has been merged in the for-review branch:
commit aa19e27420f311c154114ec9f2ef6fec0b21a04e
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Tue Jul 16 13:34:21 2013 +0300

    Rename the binary package back to ganeti

diff --git a/debian/NEWS b/debian/NEWS
index b297a12..6238a49 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-ganeti2 (2.7.0-2) unstable; urgency=low
+ganeti (2.7.0-2) unstable; urgency=low
 
   Since 2.7.0-2, all internal Ganeti Python libraries are shipped as a private
   module. This is done because the Ganeti internal APIs are not guaranteed to
@@ -9,7 +9,7 @@ ganeti2 (2.7.0-2) unstable; urgency=low
   The RAPI client library, being the only stable external API, is now shipped
   as a public module in its own package, python-ganeti-rapi.
 
-  Since 2.7.0-2, the HTML documentation is provided in the ganeti2-doc package.
+  Since 2.7.0-2, the HTML documentation is provided in the ganeti-doc package.
 
  -- Apollon Oikonomopoulos <apoikos at gmail.com>  Sat, 13 Jul 2013 04:04:27 +0300
 
diff --git a/debian/changelog b/debian/changelog
index 29cf87d..ea7fb4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ ganeti (2.7.0-2) UNRELEASED; urgency=low
   * Ship the majority of the Python code in a private module under
     /usr/lib/ganeti
   * Ship the RAPI client as a separate package (python-ganeti-rapi)
-  * Ship the HTML documentation as ganeti2-doc
+  * Ship the HTML documentation as ganeti-doc
     - Depend on libjs-underscore instead of embedding a copy
   * Update standards version to 3.9.4 and compat to 9
     - No changes needed, see #688251 for not adding Built-Using
diff --git a/debian/control b/debian/control
index 18de195..a040ff8 100644
--- a/debian/control
+++ b/debian/control
@@ -21,9 +21,10 @@ Homepage: http://code.google.com/p/ganeti/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ganeti/ganeti.git
 Vcs-Git: git://anonscm.debian.org/pkg-ganeti/ganeti.git
 
-Package: ganeti2
+Package: ganeti
 Architecture: all
-Conflicts: ganeti
+Breaks: ganeti2 (<< 2.7.0-2), ganeti-htools (<< 0.3)
+Replaces: ganeti2 (<< 2.7.0-2)
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2,
  openssh-client, openssh-server, bridge-utils, iproute, iputils-arping,
  openssl, python-simplejson, python-pyparsing, python-openssl,
@@ -33,8 +34,7 @@ Recommends: drbd8-utils (>= 8.0.7), qemu-kvm |
  xen-linux-system-amd64 | xen-linux-system-686 |
  xen-linux-system-686-pae, ganeti-instance-debootstrap,
  ndisc6
-Breaks: ganeti-htools (<< 0.3)
-Suggests: drbd8-module-source (>= 8.0.7), ganeti-htools, ganeti2-doc
+Suggests: drbd8-module-source (>= 8.0.7), ganeti-htools, ganeti-doc
 Provides: ${python:Provides}
 Description: Cluster-based virtualization management software
  Ganeti is a virtual server cluster management software tool built on top
@@ -51,6 +51,12 @@ Description: Cluster-based virtualization management software
  install scripts), startup, shutdown, failover of instances between physical
  systems.
 
+Package: ganeti2
+Architecture: all
+Depends: ganeti, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package for ganeti. It can safely be removed.
+
 Package: ganeti-haskell
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -87,7 +93,7 @@ Description: Cluster allocation tools for Ganeti
    - hscan, used to gather cluster files for offline use in hbal/hspace
    - hroller, used to calculate rolling maintenances
 
-Package: ganeti2-doc
+Package: ganeti-doc
 Architecture: all
 Section: doc
 Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery, libjs-underscore
@@ -112,7 +118,7 @@ Package: python-ganeti-rapi
 Architecture: all
 Section: python
 Depends: ${python:Depends}, ${misc:Depends}, python-pycurl, python-simplejson
-Suggests: ganeti2-doc
+Suggests: ganeti-doc
 Replaces: ganeti2 (<< 2.7.0-2)
 Breaks: ganeti2 (<< 2.7.0-2)
 Description: Cluster-based virtualization management software - RAPI client library
diff --git a/debian/ganeti-doc.dirs b/debian/ganeti-doc.dirs
new file mode 100644
index 0000000..cefcd5a
--- /dev/null
+++ b/debian/ganeti-doc.dirs
@@ -0,0 +1 @@
+/usr/share/doc/ganeti-doc
diff --git a/debian/ganeti2-doc.doc-base b/debian/ganeti-doc.doc-base
similarity index 64%
rename from debian/ganeti2-doc.doc-base
rename to debian/ganeti-doc.doc-base
index 458121f..35bb1d2 100644
--- a/debian/ganeti2-doc.doc-base
+++ b/debian/ganeti-doc.doc-base
@@ -4,5 +4,5 @@ Abstract: This manual describes installation, administration and general use asp
 Section: System/Administration
 
 Format: HTML
-Index: /usr/share/doc/ganeti2-doc/html/index.html
-Files: /usr/share/doc/ganeti2-doc/html/*.html
+Index: /usr/share/doc/ganeti-doc/html/index.html
+Files: /usr/share/doc/ganeti-doc/html/*.html
diff --git a/debian/ganeti2-doc.docs b/debian/ganeti-doc.docs
similarity index 100%
rename from debian/ganeti2-doc.docs
rename to debian/ganeti-doc.docs
diff --git a/debian/ganeti-doc.links b/debian/ganeti-doc.links
new file mode 100644
index 0000000..fa67c3a
--- /dev/null
+++ b/debian/ganeti-doc.links
@@ -0,0 +1,2 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/ganeti-doc/html/_static/jquery.js
+usr/share/javascript/underscore/underscore.js usr/share/doc/ganeti-doc/html/_static/underscore.js
diff --git a/debian/ganeti2.dirs b/debian/ganeti.dirs
similarity index 100%
rename from debian/ganeti2.dirs
rename to debian/ganeti.dirs
diff --git a/debian/ganeti.overrides b/debian/ganeti.overrides
new file mode 100644
index 0000000..01da608
--- /dev/null
+++ b/debian/ganeti.overrides
@@ -0,0 +1,2 @@
+ganeti binary: hyphen-used-as-minus-sign
+ganeti binary: package-contains-empty-directory usr/lib/ganeti/iallocators/
diff --git a/debian/ganeti2-doc.dirs b/debian/ganeti2-doc.dirs
deleted file mode 100644
index 8e1c932..0000000
--- a/debian/ganeti2-doc.dirs
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/ganeti2-doc
diff --git a/debian/ganeti2-doc.links b/debian/ganeti2-doc.links
deleted file mode 100644
index fec3ab7..0000000
--- a/debian/ganeti2-doc.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/ganeti2-doc/html/_static/jquery.js
-usr/share/javascript/underscore/underscore.js usr/share/doc/ganeti2-doc/html/_static/underscore.js
diff --git a/debian/ganeti2.overrides b/debian/ganeti2.overrides
deleted file mode 100644
index 4c923c5..0000000
--- a/debian/ganeti2.overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-ganeti2 binary: hyphen-used-as-minus-sign
-ganeti2 binary: package-contains-empty-directory usr/lib/ganeti/iallocators/
diff --git a/debian/rules b/debian/rules
index cd97e5b..41ddc02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-GANETI_DIR=$(CURDIR)/debian/ganeti2
+GANETI_DIR=$(CURDIR)/debian/ganeti
 HTOOLS_DIR=$(CURDIR)/debian/ganeti-htools
 HASKELL_DIR=$(CURDIR)/debian/ganeti-haskell
 RAPI_DIR=$(CURDIR)/debian/python-ganeti-rapi
@@ -23,7 +23,7 @@ override_dh_auto_configure:
 	  --with-export-dir=/var/lib/ganeti/export \
 	  --with-iallocator-search-path=/usr/local/lib/ganeti/iallocators,/usr/lib/ganeti/iallocators \
 	  --with-os-search-path=/srv/ganeti/os,/usr/local/lib/ganeti/os,/usr/lib/ganeti/os,/usr/share/ganeti/os \
-	  --docdir=/usr/share/doc/ganeti2 \
+	  --docdir=/usr/share/doc/ganeti \
 	  --enable-htools --enable-htools-rapi --enable-restricted-commands
 
 override_dh_auto_clean:
@@ -31,22 +31,22 @@ override_dh_auto_clean:
 	# this is not removed by make distclean :(
 	rm -f ganeti
 
-	rm -f debian/ganeti2.ganeti.init
-	rm -f debian/ganeti2.ganeti.cron.d
-	rm -f debian/ganeti2.ganeti.default
+	rm -f debian/ganeti.init
+	rm -f debian/ganeti.cron.d
+	rm -f debian/ganeti.default
 
 	dh_auto_clean
 
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(GANETI_DIR)
-	cp $(CURDIR)/doc/examples/ganeti.initd $(CURDIR)/debian/ganeti2.ganeti.init
-	cp $(CURDIR)/doc/examples/ganeti.cron $(CURDIR)/debian/ganeti2.ganeti.cron.d
-	cp $(CURDIR)/doc/examples/ganeti.default $(CURDIR)/debian/ganeti2.ganeti.default
+	cp $(CURDIR)/doc/examples/ganeti.initd $(CURDIR)/debian/ganeti.init
+	cp $(CURDIR)/doc/examples/ganeti.cron $(CURDIR)/debian/ganeti.cron.d
+	cp $(CURDIR)/doc/examples/ganeti.default $(CURDIR)/debian/ganeti.default
 
 	install -m 0644 $(CURDIR)/doc/examples/bash_completion \
 	  $(GANETI_DIR)/etc/bash_completion.d/ganeti
-	install -m 0644 $(CURDIR)/debian/ganeti2.overrides \
-	  $(GANETI_DIR)/usr/share/lintian/overrides/ganeti2
+	install -m 0644 $(CURDIR)/debian/ganeti.overrides \
+	  $(GANETI_DIR)/usr/share/lintian/overrides/ganeti
 
 	rmdir $(GANETI_DIR)/var/run/ganeti
 	rmdir $(GANETI_DIR)/var/run

-- 
Ganeti packaging

More information about the Pkg-ganeti-devel mailing list