]> git.proxmox.com Git - vncterm.git/commitdiff
buildsys: fix debug symbol package name master
authorThomas Lamprecht <t.lamprecht@proxmox.com>
Mon, 29 May 2023 16:07:16 +0000 (18:07 +0200)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Mon, 29 May 2023 16:07:16 +0000 (18:07 +0200)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
LibVNCServer-0.9.13.tar.gz [deleted file]
LibVNCServer-0.9.14.tar.gz [new file with mode: 0644]
Makefile
copyright [deleted file]
debian/changelog
debian/compat [deleted file]
debian/control
debian/copyright [new file with mode: 0644]
debian/source/format [new file with mode: 0644]

diff --git a/LibVNCServer-0.9.13.tar.gz b/LibVNCServer-0.9.13.tar.gz
deleted file mode 100644 (file)
index e0d6242..0000000
Binary files a/LibVNCServer-0.9.13.tar.gz and /dev/null differ
diff --git a/LibVNCServer-0.9.14.tar.gz b/LibVNCServer-0.9.14.tar.gz
new file mode 100644 (file)
index 0000000..e28d003
Binary files /dev/null and b/LibVNCServer-0.9.14.tar.gz differ
index 8f8611f45de728459d13f231d18003a7f50f8b43..ff12551208a837752dc603897bcf7f6d357c3bf5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,18 @@ include /usr/share/dpkg/pkg-info.mk
 include /usr/share/dpkg/architecture.mk
 
 PACKAGE=vncterm
-GITVERSION:=$(shell cat .git/refs/heads/master)
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 
-VNCVER=0.9.13
-VNCREL=LibVNCServer-${VNCVER}
-VNCDIR=libvncserver-${VNCREL}
-VNCSRC=${VNCREL}.tar.gz
-VNCLIB=${VNCDIR}/libvncserver.a
+VNCVER=0.9.14
+VNCREL=LibVNCServer-$(VNCVER)
+VNCDIR=libvncserver-$(VNCREL)
+VNCSRC=$(VNCREL).tar.gz
+VNCLIB=$(VNCDIR)/libvncserver.a
 
-DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
+DSC = $(PACKAGE)_$(DEB_VERSION).dsc
+
+DEB=$(PACKAGE)_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb
+DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb
 
 CPPFLAGS += -O2 -g -Wall -Wno-deprecated-declarations -D_GNU_SOURCE -I $(VNCDIR)
 
@@ -26,13 +29,13 @@ genfont2: genfont2.c
        gcc -g -O2 -o $@ genfont2.c -Wall -Wextra -D_GNU_SOURCE -lz
 
 .PHONY: vnc
-vnc: ${VNCLIB}
-${VNCLIB}: ${VNCSRC}
-       rm -rf ${VNCDIR}
-       tar xf ${VNCSRC}
-       ln -s ../vncpatches ${VNCDIR}/patches
-       cd ${VNCDIR}; quilt push -a
-       cd ${VNCDIR}; cmake -D WITH_GNUTLS=OFF -D WITH_OPENSSL=OFF -D WITH_WEBSOCKETS=OFF -D WITH_SYSTEMD=OFF -D WITH_TIGHTVNC_FILETRANSFER=OFF -D WITH_GCRYPT=OFF -D WITH_LZO=OFF -D BUILD_SHARED_LIBS=OFF .; cmake --build .
+vnc: $(VNCLIB)
+$(VNCLIB): $(VNCSRC)
+       rm -rf $(VNCDIR)
+       tar xf $(VNCSRC)
+       ln -s ../vncpatches $(VNCDIR)/patches
+       cd $(VNCDIR); quilt push -a
+       cd $(VNCDIR); cmake -D WITH_GNUTLS=OFF -D WITH_OPENSSL=OFF -D WITH_WEBSOCKETS=OFF -D WITH_SYSTEMD=OFF -D WITH_TIGHTVNC_FILETRANSFER=OFF -D WITH_GCRYPT=OFF -D WITH_LZO=OFF -D BUILD_SHARED_LIBS=OFF .; cmake --build .
 
 vncterm: vncterm.c wchardata.c $(VNCLIB)
        $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(VNC_LIBS)
@@ -42,39 +45,55 @@ wchardata.c:
 
 .PHONY: install
 install: vncterm vncterm.1 font.data
-       mkdir -p ${DESTDIR}/usr/share/doc/${PACKAGE}
-       install -m 0644 copyright ${DESTDIR}/usr/share/doc/${PACKAGE}
-       mkdir -p ${DESTDIR}/usr/share/${PACKAGE}
-       install -m 0644 font.data ${DESTDIR}/usr/share/${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
+       mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)
+       install -m 0644 font.data $(DESTDIR)/usr/share/$(PACKAGE)
+       mkdir -p $(DESTDIR)/usr/share/man/man1
+       install -m 0644 vncterm.1 $(DESTDIR)/usr/share/man/man1
+       mkdir -p $(DESTDIR)/usr/bin
+       install -m 0755 vncterm $(DESTDIR)/usr/bin
 
 .PHONY: dinstall
-dinstall: ${DEB}
-       dpkg -i ${DEB}
+dinstall: $(DEB)
+       dpkg -i $(DEB)
 
 vncterm.1: vncterm.pod
        rm -f $@
-       pod2man -n $< -s 1 -r ${DEB_VERSION_UPSTREAM} <$< >$@
+       pod2man -n $< -s 1 -r $(DEB_VERSION_UPSTREAM) <$< >$@
+
+$(BUILDDIR):
+       rm -rf $@ $@.tmp
+       rsync -a . $@.tmp
+       echo "git clone git://git.proxmox.com/git/vncterm.git\\ngit checkout $$(git rev-parse HEAD)" > $@.tmp/debian/SOURCE
+       mv $@.tmp $@
 
 .PHONY: deb
 deb: $(DEB)
-${DEB}:
-       $(MAKE) clean
-       rsync -a . --exclude build build
-       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}
+$(DEB): $(BUILDDIR)
+       cd $(BUILDDIR); dpkg-buildpackage -rfakeroot -b -us -uc
+       lintian $(DEB)
+
+.PHONY: dsc
+dsc: $(DSC)
+       rm -rf $(BUILDDIR) $(DSC)
+       $(MAKE) $(DSC)
+       lintian $(DSC)
+
+$(DSC): $(BUILDDIR)
+       cd $(BUILDDIR); dpkg-buildpackage -S -us -uc
+
+sbuild: $(DSC)
+       sbuild $<
 
 .PHONY: upload
-upload: ${DEB}
-       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pmg,pve --dist buster
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
+upload: $(DEB)
+       tar cf - $(DEB) $(DBG_DEB) | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist $(UPLOAD_DIST)
 
 .PHONY: clean
 clean:
-       rm -rf vncterm vncterm.1 vncterm_*.deb genfont genfont2 *~ ${VNCDIR} vncterm-*.tar.gz glyph.h.tmp build *.changes wchardata.c font.data.tmp font.data *.buildinfo
+       rm -f *.dsc *.deb $(PACKAGE)*.tar* *.changes *.build *.buildinfo
+       rm -f vncterm vncterm.1 genfont genfont2 *~ *.tmp wchardata.c font.data
+       rm -rf $(VNCDIR) $(PACKAGE)-[0-9]*/
 
 .PHONY: distclean
 distclean: clean
diff --git a/copyright b/copyright
deleted file mode 100644 (file)
index 62ea05a..0000000
--- a/copyright
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (C) 2007 Proxmox Server Solutions GmbH
-
-Copyright: vncterm is under GNU GPL, the GNU General Public License.
-
-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, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-The complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
index 75a4009879683939c44a472aa33ee6fa0ae24afe..809bd491b7069636c2d02c7bd349b384c38492e8 100644 (file)
@@ -1,3 +1,17 @@
+vncterm (1.8.0) bookworm; urgency=medium
+
+  * re-build for Debian 12 Bookworm based releases
+
+  * update libvncserver to 0.9.14
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 29 May 2023 17:10:38 +0200
+
+vncterm (1.7-1) bullseye; urgency=medium
+
+  * rebuild for Debian 11 Bullseye based releases
+
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 16 May 2021 19:06:09 +0200
+
 vncterm (1.6-2) pve pmg; urgency=medium
 
   * import libvncserver 0.9.13 upstream release
diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index f599e28..0000000
+++ /dev/null
@@ -1 +0,0 @@
-10
index cb6c7b2f1726236c46929ed034469f7cf2d82d1d..5b24295ac4395ae607d283e72b74326da1b1800d 100644 (file)
@@ -1,26 +1,27 @@
 Source: vncterm
+Section: admin
+Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: cmake,
-               debhelper (>= 10~),
+               debhelper-compat (= 12),
                libglib2.0-dev,
                libgnutls28-dev,
                libjpeg62-turbo-dev,
                libpng-dev,
                quilt,
-               tar,
                unifont,
                zlib1g-dev,
-Standards-Version: 4.1.3
+Standards-Version: 4.6.1
 
 Package: vncterm
 Architecture: any
 Section: x11
 Priority: optional
-Depends: libc6 (>= 2.7-18),
-         libgnutls-deb0-28 | libgnutls30,
+Depends: libgnutls-deb0-28 | libgnutls30,
          libjpeg62-turbo,
          libpng16-16,
          zlib1g (>= 1:1.2.1),
+         ${misc:Depends},
          ${shlibs:Depends},
 Description: VNC Terminal Emulator
  With vncterm you can start commands and export its standard input and
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..af59a74
--- /dev/null
@@ -0,0 +1,43 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: git://git.proxmox.com/git/vncterm.git
+
+Files:
+ *
+Copyright: 2007 - 2023, Proxmox Support Team <support@proxmox.com>
+License: AGPL-3.0-or-later
+ This program is free software: you can redistribute it and/or modify it under
+ the terms of the GNU Affero General Public License as published by the Free
+ Software Foundation, either version 3 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 Affero General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU Affero General Public License along
+ with this program. If not, see <https://www.gnu.org/licenses/>.
+Comment:
+ The authors take the provided option to use the LibVNC as GPL 2 *or later*,
+ and use it as GPL 3, allowing combination with our AGPLv3 code.
+
+Files:
+ LibVNCServer-*.tar*
+Copyright: 2001-2003, Johannes E. Schindelin
+           2001 - 2022, The LibVNC Authors
+License: GPL-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 package; if not, see &lt;https://www.gnu.org/licenses/&gt;.
+Comment:
+ 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/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..89ae9db
--- /dev/null
@@ -0,0 +1 @@
+3.0 (native)