From bd8df09b6d46288dde5f163ba3823f7ec5d81b8e Mon Sep 17 00:00:00 2001 From: Gustavo Homem Date: Thu, 21 Mar 2013 00:28:47 +0000 Subject: [PATCH] remove unused files, include arch info --- debian/changelog | 11 ------ debian/copyright | 50 ------------------------ debian/postinst | 24 ------------ debian/rules | 18 --------- xorg/debuild/debX11rdp.sh | 7 +++- xorg/debuild/x11rdp-files/DEBIAN/control | 2 +- 6 files changed, 7 insertions(+), 105 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/copyright delete mode 100644 debian/postinst delete mode 100644 debian/rules diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index ccfdc5e5..00000000 --- a/debian/changelog +++ /dev/null @@ -1,11 +0,0 @@ -xrdp (0.7.0-1) unstable; urgency=low - - * Initial release - - -- Angulo Solido Wed, 20 Mar 2013 19:46:06 +0100 - -xrdp (0.6.0-1) unstable; urgency=low - - * Initial release (Closes: #nnnn) - - -- Angulo Solido Mon, 22 Aug 2011 19:46:06 +0100 diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 723d3452..00000000 --- a/debian/copyright +++ /dev/null @@ -1,50 +0,0 @@ -This work was packaged for Debian by: - - Angulo Solido on Mon, 22 Aug 2011 19:46:06 +0100 - -It was downloaded from: - - - -Upstream Author(s): - - - - -Copyright: - - - - -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 3 of the License, or - (at your option) any later version. - - This package 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 . - -On Debian systems, the complete text of the GNU General -Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. - -The Debian packaging is: - - Copyright (C) 2011 Angulo Solido - -# Please chose a license for your packaging work. If the program you package -# uses a mainstream license, using the same license is the safest choice. -# Please avoid to pick license terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. -# If you just want it to be GPL version 3, leave the following line in. - -and is licensed under the GPL version 3, see above. - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. diff --git a/debian/postinst b/debian/postinst deleted file mode 100644 index de913aed..00000000 --- a/debian/postinst +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -e - -if ! ([ "$1" = "configure" ] || [ "$1" = "reconfigure" ]); then - exit 0 -fi - - -XRDP="xrdp" -ADDUSER="/usr/sbin/adduser" -XRDPLOG="/var/log/xrdp-sesman.log" -SESMANLOG="/var/log/xrdp-sesman.log" -RSAKEYS="/etc/xrdp/rsakeys.ini" - -[ -d /var/run/xrdp ] || mkdir -p /var/run/xrdp -$ADDUSER --system --disabled-password --disabled-login --home /var/run/xrdp \ - --no-create-home --quiet --group $XRDP - -touch $SESMANLOG $XRDPLOG -chown $XRDP:$XRDP $SESMANLOG -chown $XRDP:$XRDP $XRDPLOG -chgrp $XRDP $RSAKEYS -chmod g+r $RSAKEYS - -#DEBHELPER# diff --git a/debian/rules b/debian/rules deleted file mode 100644 index 2c29bebf..00000000 --- a/debian/rules +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- - -%: - dh $@ - -LDFLAGS = -lpthread - -override_dh_auto_configure: - ./bootstrap - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - find -name Makefile | while read i; do sed -e 's#\(XRDP_PID_PATH.*/run\)#\1/xrdp#g' -i "$$i"; done - - -override_dh_installdeb: - # Move rsakeys to documentation - mv debian/xrdp/etc/xrdp/rsakeys.ini debian/xrdp/usr/share/doc/xrdp - dh_installdeb -a diff --git a/xorg/debuild/debX11rdp.sh b/xorg/debuild/debX11rdp.sh index dd80cbe9..23b1428e 100755 --- a/xorg/debuild/debX11rdp.sh +++ b/xorg/debuild/debX11rdp.sh @@ -10,16 +10,21 @@ PKGDEST=$4 PACKDIR=x11rdp-files DESTDIR=$PACKDIR/opt NAME=x11rdp +ARCH=$( dpkg --print-architecture ) + sed -i -e "s/DUMMYVERINFO/$VERSION-$RELEASE/" $PACKDIR/DEBIAN/control +sed -i -e "s/DUMMYARCHINFO/$ARCH/" $PACKDIR/DEBIAN/control # need a different delimiter, since it has a path sed -i -e "s,DUMMYDIRINFO,$SRCDIR," $PACKDIR/DEBIAN/postinst mkdir -p $DESTDIR cp -Rf $SRCDIR $DESTDIR -dpkg-deb --build $PACKDIR $PKGDEST/${NAME}_$VERSION-$RELEASE.deb +dpkg-deb --build $PACKDIR $PKGDEST/${NAME}_$VERSION-${RELEASE}_${ARCH}.deb # revert to initial state rm -rf $DESTDIR sed -i -e "s/$VERSION-$RELEASE/DUMMYVERINFO/" $PACKDIR/DEBIAN/control +sed -i -e "s/$ARCH/DUMMYARCHINFO/" $PACKDIR/DEBIAN/control +# need a different delimiter, since it has a path sed -i -e "s,$SRCDIR,DUMMYDIRINFO," $PACKDIR/DEBIAN/postinst diff --git a/xorg/debuild/x11rdp-files/DEBIAN/control b/xorg/debuild/x11rdp-files/DEBIAN/control index 59a3f94d..149e9a83 100644 --- a/xorg/debuild/x11rdp-files/DEBIAN/control +++ b/xorg/debuild/x11rdp-files/DEBIAN/control @@ -2,6 +2,6 @@ Package: x11rdp Version: DUMMYVERINFO Section: unknown Priority: optional -Architecture: all +Architecture: DUMMYARCHINFO Maintainer: Angulo Solido Description: X11rdp backend for the xrdp remote access server