]> git.proxmox.com Git - pve-spice-protocol.git/commitdiff
move to dget based re-build from Debian as upstream
authorThomas Lamprecht <t.lamprecht@proxmox.com>
Tue, 22 Oct 2019 13:24:25 +0000 (15:24 +0200)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Tue, 22 Oct 2019 13:24:25 +0000 (15:24 +0200)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Makefile
debian/changelog [deleted file]
debian/compat [deleted file]
debian/control [deleted file]
debian/copyright [deleted file]
debian/rules [deleted file]
spice-protocol-0.12.14.tar.bz2 [deleted file]

index 16d8753bf0ed035a0a8b749f3a1d539e61e640b7..ffc9f1975a8f5d56eaf3c5a6a3c15edb5ca4221d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,53 @@
-RELEASE=4.2
+SOURCE=spice-protocol
+PACKAGE=libspice-protocol
 
-PACKAGE=libspice-protocol-dev
-PKGVERSION=0.12.14
-PKGRELEASE=1~pve5+1
+PKGVERSION=0.14.0
+DEBVERSION=0.14.0-1
+PVERELEASE=pve6
+
+VERSION := $(DEBVERSION)~$(PVERELEASE)
 
 PKGDIR=spice-protocol-${PKGVERSION}
 PKGSRC=${PKGDIR}.tar.bz2
 
-ARCH=all
-
-DEB=${PACKAGE}_${PKGVERSION}-${PKGRELEASE}_${ARCH}.deb
+ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+GITVERSION:=$(shell cat .git/refs/heads/master)
 
+DEB=$(PACKAGE)-dev_${VERSION}_all.deb
+DEBS=$(DEB)
 
-all: ${DEB}
+all: ${DEBS}
+       echo ${DEBS}
 
 .PHONY: deb
 deb: $(DEB)
-$(DEB): ${PKGSRC}
+$(DEB): $(SOURCE)_$(PKGVERSION).orig.tar.bz2 $(SOURCE)_$(DEBVERSION).debian.tar.xz
        rm -rf ${PKGDIR}
-       tar xf ${PKGSRC}
-       cp -a debian ${PKGDIR}/debian
-       cd ${PKGDIR}; dpkg-buildpackage -rfakeroot -b -us -uc
+       tar xf $(SOURCE)_$(PKGVERSION).orig.tar.bz2
+       tar xf $(SOURCE)_$(DEBVERSION).debian.tar.xz -C $(SOURCE)-$(PKGVERSION)
+       cat changelog.Debian $(PKGDIR)/debian/changelog > $(PKGDIR)/debian/changelog.tmp
+       mv $(PKGDIR)/debian/changelog.tmp $(PKGDIR)/debian/changelog
+       cd ${PKGDIR}; dpkg-buildpackage -b -us -uc
+       lintian ${DEBS}
+
 
 .PHONY: download
-download:
-       rm -f ${PKGSRC}
-       wget https://www.spice-space.org/download/releases/spice-protocol-${PKGVERSION}.tar.bz2
+download: $(SOURCE)_$(PKGVERSION).orig.tar.bz2 $(SOURCE)_$(DEBVERSION).debian.tar.xz
+$(SOURCE)_$(PKGVERSION).orig.tar.bz2: $(SOURCE)_$(DEBVERSION).debian.tar.xz
+$(SOURCE)_$(DEBVERSION).debian.tar.xz:
+       dget http://deb.debian.org/debian/pool/main/s/spice-protocol/spice-protocol_0.14.0-1.dsc
 
 .PHONY: upload
-upload: ${DEB}
-       tar cf - ${DEB}|ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch
+upload: ${DEBS}
+       tar cf - ${DEBS}|ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}
 
 distclean: clean
+       rm -f *.tar.*
 
 .PHONY: clean
 clean:
-       rm -rf *~ debian/*~ *_${ARCH}.deb *.changes *.buildinfo *.dsc ${PKGDIR}
+       rm -rf *~ debian/*~ *.deb *.changes *.dsc *.buildinfo $(SOURCE)-*/ ${PKGDIR}
 
 .PHONY: dinstall
-dinstall: ${DEB}
-       dpkg -i ${DEB}
+dinstall: ${DEBS}
+       dpkg -i ${DEBS}
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644 (file)
index 346cce2..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-spice-protocol (0.12.14-1~pve5+1) unstable; urgency=medium
-
-  * update to v0.12.14
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 26 Sep 2018 12:26:01 +0200
-
-spice-protocol (0.12.11-1) unstable; urgency=medium
-
-  * update to v0.12.11
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jul 2016 06:58:27 +0200
-
-spice-protocol (0.12.6-1) unstable; urgency=low
-
-  [ Proxmox Support Team ]
-  * first try
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 19 Aug 2013 12:34:09 +0200
diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index f599e28..0000000
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
deleted file mode 100644 (file)
index 1b9c0b7..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-Source: spice-protocol
-Priority: optional
-Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper (>= 10)
-Standards-Version: 4.2.1
-Section: libs
-Homepage: http://www.spice-space.org/
-Vcs-Git: https://salsa.debian.org/debian/spice-protocol.git
-Vcs-Browser: https://salsa.debian.org/debian/spice-protocol
-
-Package: libspice-protocol-dev
-Section: libdevel
-Architecture: all
-Depends: ${misc:Depends}
-Description: SPICE protocol headers
- The Simple Protocol for Independent Computing Environments (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 from a wide variety of machine architectures.
- .
- This package provides headers defining protocols.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644 (file)
index 17d44fa..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
-Upstream-Name: spice-protocol
-Upstream-Contact: Alexander Larsson <alexl@redhat.com>,
-                  Alon Levy <alevy@redhat.com>,
-                  Arnon Gilboa <agilboa@agilboa.usersys.redhat.com>,
-                  Gerd Hoffmann <kraxel@redhat.com>,
-                  Izik Eidus <ieidus@redhat.com>,
-                  Yonit Halperin <yhalperi@redhat.com>
-Source: http://www.spice-space.org/download/releases/
-
-Files: *
-Copyright: Copyright (C) 2009-2013 Red Hat, Inc
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
- \* Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- \* Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
- \* Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Files: spice/macros.h
-       spice/controller_prot.h
-       spice/foreign_menu_prot.h
-       debian/*
-Copyright: Copyright (C) 2009-2010 Red Hat, Inc
-           Copyright (C) 2010 Liang Guo <bluestonechina@gmail.com>
-License: LGPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- This file is to a large extent based on gmacros.h from glib
- Which is LGPL and copyright:
- .
- Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- file for a list of people on the GLib Team.  See the ChangeLog
- files for a list of changes.  These files are distributed with
- GLib at ftp://ftp.gtk.org/pub/gtk/.
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- '/usr/share/common-licenses/GPL-2'.
diff --git a/debian/rules b/debian/rules
deleted file mode 100755 (executable)
index abde6ef..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-       dh $@
-
diff --git a/spice-protocol-0.12.14.tar.bz2 b/spice-protocol-0.12.14.tar.bz2
deleted file mode 100644 (file)
index 3956ec1..0000000
Binary files a/spice-protocol-0.12.14.tar.bz2 and /dev/null differ