fixup debian packagin/Makefile
authorDominik Csapak <d.csapak@proxmox.com>
Wed, 24 May 2017 09:37:48 +0000 (11:37 +0200)
committerWolfgang Bumiller <w.bumiller@proxmox.com>
Wed, 24 May 2017 10:55:19 +0000 (12:55 +0200)
this patch cleans up the debian packaging and Makefile
(modeled after our spiceterm package)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Makefile
debian/changelog [new file with mode: 0644]
debian/changelog.Debian [deleted file]
debian/compat [new file with mode: 0644]
debian/conffiles [deleted file]
debian/control
debian/docs [new file with mode: 0644]
debian/rules [new file with mode: 0755]

index 5d7a65e..792b5bd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ PACKAGE=vncterm
 VERSION=1.4
 PACKAGERELEASE=2
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+GITVERSION:=$(shell cat .git/refs/heads/master)
 CDATE:=$(shell date +%F)
 
 VNCVER=0.9.11
@@ -39,7 +40,9 @@ vncterm: vncterm.c glyphs.h ${VNCLIB}
 .PHONY: install
 install: vncterm vncterm.1
        mkdir -p ${DESTDIR}/usr/share/doc/${PACKAGE}
+       install -m 0644 copyright ${DESTDIR}/usr/share/doc/${PACKAGE}
        mkdir -p ${DESTDIR}/usr/share/man/man1
+       install -m 0644 vncterm.1 ${DESTDIR}/usr/share/man/man1
        mkdir -p ${DESTDIR}/usr/bin
        install -s -m 0755 vncterm ${DESTDIR}/usr/bin
 
@@ -55,21 +58,10 @@ vncterm.1: vncterm.pod
 deb: $(DEB)
 ${DEB}:
        make clean
-       rm -rf dest
-       mkdir dest
-       make DESTDIR=`pwd`/dest install
-       install -d -m 0755 dest/DEBIAN
-       install -m 0644 debian/control dest/DEBIAN
-       echo "Architecture: ${ARCH}" >>dest/DEBIAN/control
-       install -m 0644 debian/conffiles dest/DEBIAN
-       install -m 0644 copyright dest/usr/share/doc/${PACKAGE}
-       install -m 0644 vncterm.1 dest/usr/share/man/man1
-       install -m 0644 debian/changelog.Debian dest/usr/share/doc/${PACKAGE}
-       gzip -n --best dest/usr/share/man/*/*
-       gzip -n --best dest/usr/share/doc/${PACKAGE}/changelog.Debian
-       fakeroot dpkg-deb --build dest
-       mv dest.deb ${DEB}
-       rm -rf dest
+       rsync -a . --exclude build build
+       echo "Architecture: ${ARCH}" >> build/debian/control
+       echo "git clone git://git.proxmox.com/git/vncterm.git\\ngit checkout ${GIVERSION}" > build/debian/SOURCE
+       cd build; dpkg-buildpackage -rfakeroot -b -us -uc
        lintian ${DEB}  
 
 .PHONY: upload
@@ -78,7 +70,7 @@ upload: ${DEB}
 
 .PHONY: clean
 clean:
-       rm -rf vncterm vncterm.1 vncterm_*.deb genfont *~ ${VNCDIR} vncterm-*.tar.gz glyph.h.tmp
+       rm -rf vncterm vncterm.1 vncterm_*.deb genfont *~ ${VNCDIR} vncterm-*.tar.gz glyph.h.tmp build *.changes
 
 .PHONY: distclean
 distclean: clean
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..25a2b91
--- /dev/null
@@ -0,0 +1,130 @@
+vncterm (1.4-2) unstable; urgency=medium
+
+  * fix bound checking on cursor move
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 06 May 2017 08:09:29 +0200
+
+vncterm (1.4-1) unstable; urgency=medium
+
+  * recompile for Debian Stretch / PVE 5
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 10:19:48 +0100
+
+vncterm (1.3-2) unstable; urgency=medium
+
+  * bound check utf8 characters
+
+  * detect empty first parameter of escape codes
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 10:11:00 +0100
+
+vncterm (1.3-1) unstable; urgency=low
+
+  * update cipher suites to GnuTLS's NORMAL
+
+  * allow building with GnuTLS 3.5
+
+  * update LibVNCServer to 0.9.11
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 3 Feb 2017 08:52:31 +0100
+
+vncterm (1.2-1) unstable; urgency=low
+
+  * recompile for Debian Jessie / PVE 4
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 27 Feb 2015 20:00:46 +0100
+
+vncterm (1.1-8) unstable; urgency=low
+
+  * update applet signature (new code signing cert)
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 25 Jul 2014 06:57:46 +0200
+
+vncterm (1.1-7) unstable; urgency=low
+
+  *  new option -notls (for novnc)
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 23 Jun 2014 13:30:50 +0200
+
+vncterm (1.1-6) unstable; urgency=low
+
+  * set Caller-Allowable-Codebase and remove Trusted-Library. This avoids
+    security popups with latest Java 7u45. Also see:
+  
+    http://stackoverflow.com/questions/19393826/java-applet-manifest-allow-all-caller-allowable-codebase
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 08 Nov 2013 11:27:08 +0100
+
+vncterm (1.1-5) unstable; urgency=low
+
+  * use Comodo code sign cert for applet signature
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 08 Nov 2013 08:35:10 +0100
+
+vncterm (1.1-4) unstable; urgency=low
+
+  * Allow to add intermediate certificates to /etc/pve/local/pve-ssl.pem 
+  (users previously used apache option SSLCertificateChainFile for that).
+  
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 03 Jun 2013 08:26:59 +0200
+
+vncterm (1.1-3) unstable; urgency=low
+
+  *  re-enable javascript-events.patch (used for migrate/reload)
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 10 May 2013 07:56:35 +0200
+
+vncterm (1.1-2) unstable; urgency=low
+
+  * recompile VnCViewer.jar with openJDK
+  
+  * set trusted-lib to avoid security popup
+  
+  * disable unused javascript-events.patch
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 20 Apr 2013 16:05:41 +0200
+
+vncterm (1.1-1) unstable; urgency=low
+
+  * recompile for wheezy
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 15 Mar 2013 08:26:04 +0100
+
+vncterm (1.0-3) unstable; urgency=low
+
+  * fix focus traversal
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Aug 2012 09:14:04 +0200
+
+vncterm (1.0-2) unstable; urgency=low
+
+  * do not create a new process group (with setsid), so
+  we can kill the whole pve task if used inside fork_worker().
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 13 Sep 2011 10:49:32 +0200
+
+vncterm (1.0-1) unstable; urgency=low
+
+  * use TigerVNC java sources
+  
+  * implement TLS encryption and vencrypt password auth
+  
+  * removed support for -passwdfile option
+
+ -- root <root@maui.maurer-it.com>  Mon, 24 Jan 2011 10:46:25 +0100
+
+vncterm (0.9-2) unstable; urgency=low
+
+  * compiled for debian etch
+  
+  * use memmove instead of rfbDoCopyRect (avoid SIGSEGV when
+  called with negative dy)
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 22 Apr 2009 10:02:08 +0200
+
+vncterm (0.9-1) stable; urgency=low
+
+  * initial import
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Dec 2007 05:57:17 +0100
+
diff --git a/debian/changelog.Debian b/debian/changelog.Debian
deleted file mode 100644 (file)
index 25a2b91..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-vncterm (1.4-2) unstable; urgency=medium
-
-  * fix bound checking on cursor move
-
- -- Proxmox Support Team <support@proxmox.com>  Sat, 06 May 2017 08:09:29 +0200
-
-vncterm (1.4-1) unstable; urgency=medium
-
-  * recompile for Debian Stretch / PVE 5
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 10:19:48 +0100
-
-vncterm (1.3-2) unstable; urgency=medium
-
-  * bound check utf8 characters
-
-  * detect empty first parameter of escape codes
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 10:11:00 +0100
-
-vncterm (1.3-1) unstable; urgency=low
-
-  * update cipher suites to GnuTLS's NORMAL
-
-  * allow building with GnuTLS 3.5
-
-  * update LibVNCServer to 0.9.11
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 3 Feb 2017 08:52:31 +0100
-
-vncterm (1.2-1) unstable; urgency=low
-
-  * recompile for Debian Jessie / PVE 4
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 27 Feb 2015 20:00:46 +0100
-
-vncterm (1.1-8) unstable; urgency=low
-
-  * update applet signature (new code signing cert)
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 25 Jul 2014 06:57:46 +0200
-
-vncterm (1.1-7) unstable; urgency=low
-
-  *  new option -notls (for novnc)
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 23 Jun 2014 13:30:50 +0200
-
-vncterm (1.1-6) unstable; urgency=low
-
-  * set Caller-Allowable-Codebase and remove Trusted-Library. This avoids
-    security popups with latest Java 7u45. Also see:
-  
-    http://stackoverflow.com/questions/19393826/java-applet-manifest-allow-all-caller-allowable-codebase
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 08 Nov 2013 11:27:08 +0100
-
-vncterm (1.1-5) unstable; urgency=low
-
-  * use Comodo code sign cert for applet signature
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 08 Nov 2013 08:35:10 +0100
-
-vncterm (1.1-4) unstable; urgency=low
-
-  * Allow to add intermediate certificates to /etc/pve/local/pve-ssl.pem 
-  (users previously used apache option SSLCertificateChainFile for that).
-  
- -- Proxmox Support Team <support@proxmox.com>  Mon, 03 Jun 2013 08:26:59 +0200
-
-vncterm (1.1-3) unstable; urgency=low
-
-  *  re-enable javascript-events.patch (used for migrate/reload)
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 10 May 2013 07:56:35 +0200
-
-vncterm (1.1-2) unstable; urgency=low
-
-  * recompile VnCViewer.jar with openJDK
-  
-  * set trusted-lib to avoid security popup
-  
-  * disable unused javascript-events.patch
-
- -- Proxmox Support Team <support@proxmox.com>  Sat, 20 Apr 2013 16:05:41 +0200
-
-vncterm (1.1-1) unstable; urgency=low
-
-  * recompile for wheezy
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 15 Mar 2013 08:26:04 +0100
-
-vncterm (1.0-3) unstable; urgency=low
-
-  * fix focus traversal
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Aug 2012 09:14:04 +0200
-
-vncterm (1.0-2) unstable; urgency=low
-
-  * do not create a new process group (with setsid), so
-  we can kill the whole pve task if used inside fork_worker().
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 13 Sep 2011 10:49:32 +0200
-
-vncterm (1.0-1) unstable; urgency=low
-
-  * use TigerVNC java sources
-  
-  * implement TLS encryption and vencrypt password auth
-  
-  * removed support for -passwdfile option
-
- -- root <root@maui.maurer-it.com>  Mon, 24 Jan 2011 10:46:25 +0100
-
-vncterm (0.9-2) unstable; urgency=low
-
-  * compiled for debian etch
-  
-  * use memmove instead of rfbDoCopyRect (avoid SIGSEGV when
-  called with negative dy)
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 22 Apr 2009 10:02:08 +0200
-
-vncterm (0.9-1) stable; urgency=low
-
-  * initial import
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Dec 2007 05:57:17 +0100
-
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..ec63514
--- /dev/null
@@ -0,0 +1 @@
+9
diff --git a/debian/conffiles b/debian/conffiles
deleted file mode 100644 (file)
index e69de29..0000000
index 9d9c2c9..d5e9830 100644 (file)
@@ -1,9 +1,18 @@
+Source: vncterm
+Maintainer: Proxmox Support Team <support@proxmox.com>
+Build-Depends:
+    debhelper (>= 8.0.0),
+    zlib1g-dev,
+    libjpeg-dev,
+    libpng-dev,
+    libglib2.0-dev,
+    libgnutls28-dev,
+Standards-Version: 3.9.3
+
 Package: vncterm
-Version: 1.4-1
 Section: x11
 Priority: optional
-Depends: libc6 (>= 2.7-18), libjpeg62, zlib1g (>= 1:1.2.1), libgnutls-deb0-28 | libgnutls30, libpng16-16
-Maintainer: Proxmox Support Team <support@proxmox.com>
+Depends: libc6 (>= 2.7-18), libjpeg62, zlib1g (>= 1:1.2.1), libgnutls-deb0-28 | libgnutls30, libpng16-16, ${shlibs:Depends}
 Description: VNC Terminal Emulator
  With vncterm you can start commands and export its standard input and
  output to any VNC client (simulating a xterm Terminal).
diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..8696672
--- /dev/null
@@ -0,0 +1 @@
+debian/SOURCE
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..2d33f6a
--- /dev/null
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+       dh $@