bump version to 0.12.4.2

Conflict with debian package 'libspice-server1'.
Add reference to git version.

diff --git a/Makefile b/Makefile
index 060b0865bba640819be04dbdb28128b42532168c..1c704950dbe7aec5ecf9fd1feb39f8bbb0cbbe5a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,14 @@
-RELEASE=3.0
+RELEASE=3.1
 
 PACKAGE=pve-libspice-server1
 PKGVERSION=0.12.4
-PKGRELEASE=1
+PKGRELEASE=2
 
 PKGDIR=spice-${PKGVERSION}
 PKGSRC=${PKGDIR}.tar.bz2
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+GITVERSION:=$(shell cat .git/refs/heads/master)
 
 DEBS=pve-libspice-server1_${PKGVERSION}-${PKGRELEASE}_${ARCH}.deb  \
 pve-libspice-server-dev_${PKGVERSION}-${PKGRELEASE}_${ARCH}.deb                
@@ -28,6 +29,7 @@ ${DEBS}: ${PKGSRC}
        cd ${PKGDIR}/${CELTDIR}; ./configure --prefix=/usr; make
        # now compile spice server
        cp -a debian ${PKGDIR}/debian
+       echo "git clone git://git.proxmox.com/git/pve-libspice-server.git\\ngit checkout ${GITVERSION}" > ${PKGDIR}/debian/SOURCE
        cd ${PKGDIR}; dpkg-buildpackage -rfakeroot -b -us -uc
 
 

diff --git a/debian/changelog b/debian/changelog
index e25dc4445df85b534e9407d2f7aae62266d05c84..b79d83e2c431fac0b339809c53923fd1da0b4ce6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-libspice-server (0.12.4-2) unstable; urgency=low
+
+  * conflict with debian package 'libspice-server1'
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 16 Sep 2013 06:27:09 +0200
+
 pve-libspice-server (0.12.4-1) unstable; urgency=low
 
   * update to 0.12.4

diff --git a/debian/control b/debian/control
index 8c7688bd89d4d0ea2a3a89209db7bed957b2172d..a39fdd5d7b34ce0ecffc0553eb8c0ae24bd6f731 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Section: libdevel
 Architecture: amd64
 Depends: pve-libspice-server1 (= ${binary:Version}), ${misc:Depends}, libpixman-1-dev (>= 0.17.7~), libssl-dev, libxinerama-dev
 Suggests: pkg-config
-Description: SHeader and development files for SPICE server
+Description: Header and development files for SPICE server
  SPICE is a remote display system built for virtual environments which
  allows you to view a computing 'desktop' environment not only on the
  machine where it is running, but from anywhere on the Internet and
@@ -23,6 +23,9 @@ Package: pve-libspice-server1
 Section: libs
 Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libspice-server1
+Provides: libspice-server1
+Replaces: libspice-server1
 Description: SPICE remote display system server library
  SPICE is a remote display system built for virtual environments which
  allows you to view a computing 'desktop' environment not only on the

diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index 50bd824..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-NEWS
-README

diff --git a/debian/pve-libspice-server-dev.docs b/debian/pve-libspice-server-dev.docs
new file mode 100644 (file)
index 0000000..1749125
--- /dev/null
+++ b/debian/pve-libspice-server-dev.docs
@@ -0,0 +1,3 @@
+NEWS
+README
+debian/SOURCE

diff --git a/debian/pve-libspice-server1.docs b/debian/pve-libspice-server1.docs
new file mode 100644 (file)
index 0000000..8696672
--- /dev/null
+++ b/debian/pve-libspice-server1.docs
@@ -0,0 +1 @@
+debian/SOURCE