x2go-commits October 2011

x2go-commits@lists.x2go.org

1 participants
131 discussions

x2goplasmabindings.git - build-main (branch) created: 3.0.1.2
by git-admin＠x2go.org 26 Oct '11

26 Oct '11

The branch, build-main has been created at 225349afbbf0fa11a28ed3b6aac1437da44b3ab2 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- x2goplasmabindings.git (Plasma/KDE4 Widget for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goplasmabindings.git" (Plasma/KDE4 Widget for X2go).

1 0

x2goplasmabindings.git - master (branch) updated: 225349afbbf0fa11a28ed3b6aac1437da44b3ab2
by git-admin＠x2go.org 26 Oct '11

26 Oct '11

The branch, master has been updated via 225349afbbf0fa11a28ed3b6aac1437da44b3ab2 (commit) from 6cc4dcb6cabe81e64215addcd79c3b1c4eed8a2e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 225349afbbf0fa11a28ed3b6aac1437da44b3ab2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 26 13:10:14 2011 +0200 release 3.0.1.2 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 99d076d..569bae4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goplasmabindings (3.0.1.2-0~x2go2) UNRELEASED; urgency=low +x2goplasmabindings (3.0.1.2-0~x2go2) unstable; urgency=low [ Mike Gabriel ] * New upstream version (3.0.1.2): @@ -15,7 +15,7 @@ x2goplasmabindings (3.0.1.2-0~x2go2) UNRELEASED; urgency=low - Use x2golistmounts from x2goserver. - Use x2goumount-session to umount X2go shares. - -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Tue, 11 Oct 2011 11:03:25 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 26 Oct 2011 13:09:13 +0200 x2goplasmoidbindings (3.0.1.1-0~x2go2) unstable; urgency=low hooks/post-receive -- x2goplasmabindings.git (Plasma/KDE4 Widget for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goplasmabindings.git" (Plasma/KDE4 Widget for X2go).

1 0

x2goserver.git - master (branch) updated: 3.0.99.6-6-g1c87d10
by git-admin＠x2go.org 26 Oct '11

26 Oct '11

The branch, master has been updated via 1c87d105f5607c6980219cd005de1bd1fed584a9 (commit) from 71b0dad76b60b87ea92bde1f6c18a4e19967bd9c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 769ad92..2f4e1f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -x2goserver (3.0.99.7-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.0.99.7-0~x2go1) unstable; urgency=low * New upstream version (3.0.99.7): - Move x2golistmounts script from x2goserver-extensions to x2goserver core. - X2go server extensions: fix regular expression when scanning modality dirs. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 13:17:38 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 26 Oct 2011 13:04:54 +0200 x2goserver (3.0.99.6-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - build-main (branch) updated: 3.0.99.6-6-g1c87d10
by git-admin＠x2go.org 26 Oct '11

26 Oct '11

The branch, build-main has been updated via 1c87d105f5607c6980219cd005de1bd1fed584a9 (commit) via 71b0dad76b60b87ea92bde1f6c18a4e19967bd9c (commit) via 55bef4636e37d6211c01254295cd6065b419fe36 (commit) via add936413c185eeee07d97bbbde731628cb0f152 (commit) via 3472dd0d3d822d586bd8fdd630d5bb0c4e0269d0 (commit) via 837f96c7c74020be48c16799decba42e3c0efa1e (commit) from 322d387aa0bc77f31f1f0a255551ec756a4ff58f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1c87d105f5607c6980219cd005de1bd1fed584a9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 26 13:06:29 2011 +0200 release 3.0.99.7 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 9 +++++++++ x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../bin/x2goserver-run-extensions | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver/VERSION.x2goserver | 2 +- .../bin/x2golistmounts | 0 x2goserver/bin/x2gomountdirs | 2 +- .../man/man8/x2golistmounts.8 | 0 9 files changed, 15 insertions(+), 6 deletions(-) rename {x2goserver-extensions => x2goserver}/bin/x2golistmounts (100%) rename {x2goserver-extensions => x2goserver}/man/man8/x2golistmounts.8 (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4dd9782..2f4e1f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +x2goserver (3.0.99.7-0~x2go1) unstable; urgency=low + + * New upstream version (3.0.99.7): + - Move x2golistmounts script from x2goserver-extensions to x2goserver + core. + - X2go server extensions: fix regular expression when scanning modality dirs. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 26 Oct 2011 13:04:54 +0200 + x2goserver (3.0.99.6-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 36a9e31..c89e6f8 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.0.99.6 \ No newline at end of file +3.0.99.7 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 36a9e31..c89e6f8 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.0.99.6 \ No newline at end of file +3.0.99.7 \ No newline at end of file diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions index 968167c..3a640a2 100755 --- a/x2goserver-extensions/bin/x2goserver-run-extensions +++ b/x2goserver-extensions/bin/x2goserver-run-extensions @@ -31,7 +31,7 @@ X2GO_SESSION=$1 X2GO_MODALITY=$2 # scan extensions and execute them -find /usr/lib/x2go/extensions/${X2GO_MODALITY}.d/ -maxdepth 1 -mindepth 1 | egrep "^[0-9]{3}_[:alnum:]+" | sort | while read x2go_extension; do +find /usr/lib/x2go/extensions/${X2GO_MODALITY}.d/ -maxdepth 1 -mindepth 1 | egrep "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with option $X2GO_SESSION" $x2go_extension $X2GO_SESSION &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension$(basename $0) for session $X2GO_SESSION has finished sucessfully" diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 36a9e31..c89e6f8 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.0.99.6 \ No newline at end of file +3.0.99.7 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 36a9e31..c89e6f8 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.0.99.6 \ No newline at end of file +3.0.99.7 \ No newline at end of file diff --git a/x2goserver-extensions/bin/x2golistmounts b/x2goserver/bin/x2golistmounts similarity index 100% rename from x2goserver-extensions/bin/x2golistmounts rename to x2goserver/bin/x2golistmounts diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 7f926df..7f65d07 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -262,7 +262,7 @@ for (my $i=0;$i<@dirs;$i++) $useplasmoid=1; } } - if (! $printspool && ! $mimeboxspool && ! $useplasmoid) + if (! $printspool && ! $mimeboxspool && ! $useplasmoid ) { my $fname="$ENV{'HOME'}/Desktop"; my $current_desktop = ""; diff --git a/x2goserver-extensions/man/man8/x2golistmounts.8 b/x2goserver/man/man8/x2golistmounts.8 similarity index 100% rename from x2goserver-extensions/man/man8/x2golistmounts.8 rename to x2goserver/man/man8/x2golistmounts.8 hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99.6-5-g71b0dad
by git-admin＠x2go.org 25 Oct '11

25 Oct '11

The branch, master has been updated via 71b0dad76b60b87ea92bde1f6c18a4e19967bd9c (commit) from 55bef4636e37d6211c01254295cd6065b419fe36 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 71b0dad76b60b87ea92bde1f6c18a4e19967bd9c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Oct 25 19:08:16 2011 +0200 X2go server extensions: fix regular expression when scanning modality dirs. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../bin/x2goserver-run-extensions | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 79ddb32..769ad92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2goserver (3.0.99.7-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.0.99.7): - Move x2golistmounts script from x2goserver-extensions to x2goserver core. + - X2go server extensions: fix regular expression when scanning modality dirs. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 13:17:38 +0200 diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions index 968167c..3a640a2 100755 --- a/x2goserver-extensions/bin/x2goserver-run-extensions +++ b/x2goserver-extensions/bin/x2goserver-run-extensions @@ -31,7 +31,7 @@ X2GO_SESSION=$1 X2GO_MODALITY=$2 # scan extensions and execute them -find /usr/lib/x2go/extensions/${X2GO_MODALITY}.d/ -maxdepth 1 -mindepth 1 | egrep "^[0-9]{3}_[:alnum:]+" | sort | while read x2go_extension; do +find /usr/lib/x2go/extensions/${X2GO_MODALITY}.d/ -maxdepth 1 -mindepth 1 | egrep "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with option $X2GO_SESSION" $x2go_extension $X2GO_SESSION &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension$(basename $0) for session $X2GO_SESSION has finished sucessfully" hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goplasmabindings.git - master (branch) updated: 6cc4dcb6cabe81e64215addcd79c3b1c4eed8a2e
by git-admin＠x2go.org 25 Oct '11

25 Oct '11

The branch, master has been updated via 6cc4dcb6cabe81e64215addcd79c3b1c4eed8a2e (commit) from ded3b9ec485f2dda81ef3685a99bf3a7bb91ab67 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6cc4dcb6cabe81e64215addcd79c3b1c4eed8a2e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Oct 25 18:48:02 2011 +0200 changelog typo fix ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 53a856f..99d076d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,7 +26,7 @@ x2goplasmoidbindings (3.0.1.1-0~x2go2) unstable; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 29 May 2011 23:13:31 +0200 -x2goplasmoibindings (3.0.1.0-0~x2go1) unstable; urgency=low +x2goplasmoidbindings (3.0.1.0-0~x2go1) unstable; urgency=low * Initial release (under original name x2goplasmoid) hooks/post-receive -- x2goplasmabindings.git (Plasma/KDE4 Widget for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goplasmabindings.git" (Plasma/KDE4 Widget for X2go).

1 0

x2goplasmabindings.git - master (branch) updated: ded3b9ec485f2dda81ef3685a99bf3a7bb91ab67
by git-admin＠x2go.org 25 Oct '11

25 Oct '11

The branch, master has been updated via ded3b9ec485f2dda81ef3685a99bf3a7bb91ab67 (commit) from a3655780a6bc15b0ecd4f8ef9fcbefab0f5e60e3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ded3b9ec485f2dda81ef3685a99bf3a7bb91ab67 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Oct 25 18:01:50 2011 +0200 Fix scaling of widget icon/applet when used with KDE > v4.4.x (appx.). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + plasma-applet-x2goplasmoid.desktop | 1 + plasmax2godialog.cpp | 1 + x2goplasmoid.cpp | 20 +++++++++++++------- 4 files changed, 16 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5330895..53a856f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x2goplasmabindings (3.0.1.2-0~x2go2) UNRELEASED; urgency=low - Tab'ified all project files. - Make X2go plasmoid aware of MIME box shared folders. - Add scalable X2go icon. + - Fix scaling of widget icon/applet when used with KDE > v4.4.x (appx.). * Renaming of source package and binary package. * Depend on x2goserver (>=3.0.99.7). diff --git a/plasma-applet-x2goplasmoid.desktop b/plasma-applet-x2goplasmoid.desktop index a4f465a..d49d8a0 100644 --- a/plasma-applet-x2goplasmoid.desktop +++ b/plasma-applet-x2goplasmoid.desktop @@ -83,6 +83,7 @@ Comment[zh_CN]=Plasma x2goplasmoid Comment[zh_TW]=Plasma x2goplasmoid Icon=x2go Type=Service +ServicesType=Plasma/Applet X-KDE-ServiceTypes=Plasma/Applet X-KDE-Library=plasma_applet_x2goplasmoid diff --git a/plasmax2godialog.cpp b/plasmax2godialog.cpp index ead61da..1e645d6 100644 --- a/plasmax2godialog.cpp +++ b/plasmax2godialog.cpp @@ -44,6 +44,7 @@ void PlasmaX2goDialog::initDialog() { m_widget=new QGraphicsWidget(m_applet); m_widget->installEventFilter(this); + m_widget->setMinimumSize(150,180); m_widget->setPreferredSize(250,300); QGraphicsLinearLayout* lay=new QGraphicsLinearLayout(Qt::Vertical, m_widget); diff --git a/x2goplasmoid.cpp b/x2goplasmoid.cpp index 7ba3c86..a4c785c 100644 --- a/x2goplasmoid.cpp +++ b/x2goplasmoid.cpp @@ -36,17 +36,24 @@ x2goplasmoid::x2goplasmoid ( QObject *parent, const QVariantList &args ) : Plasma::PopupApplet ( parent, args ), m_dialog(0) { - setBackgroundHints ( DefaultBackground ); - setHasConfigurationInterface ( true ); - //init widget - setMinimumSize(graphicsWidget()->minimumSize()); + setAspectRatioMode(Plasma::IgnoreAspectRatio); + resize(graphicsWidget()->minimumSize()); + setPopupIcon(DEFAULT_ICON_NAME); + sessionId=getenv("X2GO_SESSION"); if(sessionId.length()<=0) { - //setEnabled(false); - //m_dialog->dialog()->setEnabled(false); + // setEnabled(false); + // m_dialog->dialog()->setEnabled(false); return; } + + setBackgroundHints ( DefaultBackground ); + setHasConfigurationInterface ( true ); + + //init widget + setMinimumSize(22,22); + KUser user; stampFName="/tmp/"+user.loginName()+"_media/"+sessionId+".plasmoid"; slotUpdateStamp(); @@ -77,7 +84,6 @@ void x2goplasmoid::init() toolTip.setSubText(i18n("Manage X2Go shares\nSuspend session")); toolTip.setImage(KIcon(DEFAULT_ICON_NAME)); Plasma::ToolTipManager::self()->setContent(this,toolTip); - setPopupIcon(DEFAULT_ICON_NAME); } QGraphicsWidget* x2goplasmoid::graphicsWidget() hooks/post-receive -- x2goplasmabindings.git (Plasma/KDE4 Widget for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goplasmabindings.git" (Plasma/KDE4 Widget for X2go).

1 0

x2goplasmabindings.git - master (branch) updated: a3655780a6bc15b0ecd4f8ef9fcbefab0f5e60e3
by git-admin＠x2go.org 25 Oct '11

25 Oct '11

The branch, master has been updated via a3655780a6bc15b0ecd4f8ef9fcbefab0f5e60e3 (commit) from 8570c908d70b578ab4e84bfa508c4c05b9b6837b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a3655780a6bc15b0ecd4f8ef9fcbefab0f5e60e3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Oct 25 17:44:19 2011 +0200 Add scalable X2go icon. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + hisc-apps-x2go.svgz | Bin 0 -> 2607 bytes 2 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 hisc-apps-x2go.svgz The diff of changes is: diff --git a/debian/changelog b/debian/changelog index aeecf6c..5330895 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ x2goplasmabindings (3.0.1.2-0~x2go2) UNRELEASED; urgency=low * New upstream version (3.0.1.2): - Tab'ified all project files. - Make X2go plasmoid aware of MIME box shared folders. + - Add scalable X2go icon. * Renaming of source package and binary package. * Depend on x2goserver (>=3.0.99.7). diff --git a/hisc-apps-x2go.svgz b/hisc-apps-x2go.svgz new file mode 100644 index 0000000..1c5ca3e Binary files /dev/null and b/hisc-apps-x2go.svgz differ hooks/post-receive -- x2goplasmabindings.git (Plasma/KDE4 Widget for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goplasmabindings.git" (Plasma/KDE4 Widget for X2go).

1 0

nx-libs.git - test (branch) updated: a2674ead27db49a0330e93854dcb350695df53be
by git-admin＠x2go.org 25 Oct '11

25 Oct '11

The branch, test has been updated via a2674ead27db49a0330e93854dcb350695df53be (commit) from bb837ff692544d6fdec677b67420bd29e6f20c51 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a2674ead27db49a0330e93854dcb350695df53be Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Oct 25 09:42:37 2011 +0200 Remove .build-exports dir on dh_auto_clean. ----------------------------------------------------------------------- Summary of changes: debian/rules | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/rules b/debian/rules index cb9ecd0..c74636b 100755 --- a/debian/rules +++ b/debian/rules @@ -11,9 +11,14 @@ endif %: dh $@ -override_dh_auto_install: +override_dh_auto_clean: + rm -Rf nx-X11/.build-exports + dh_auto_clean override_dh_auto_build: debian/pre-build-nx.sh dh_auto_build - debian/post-build-nx.sh \ No newline at end of file + debian/post-build-nx.sh + +override_dh_auto_install: + hooks/post-receive -- nx-libs.git (NX libraries) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX libraries).

1 0

nx-libs.git - test (branch) updated: bb837ff692544d6fdec677b67420bd29e6f20c51
by git-admin＠x2go.org 25 Oct '11

25 Oct '11

The branch, test has been updated via bb837ff692544d6fdec677b67420bd29e6f20c51 (commit) from 0d9f994509a26a5230a3ed68134a0f7e1adef64f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bb837ff692544d6fdec677b67420bd29e6f20c51 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Oct 25 09:18:42 2011 +0200 Create composition of lib+include files that need to be packaged in Debian package. ----------------------------------------------------------------------- Summary of changes: debian/libnx-x11-dev.install | 2 +- debian/libnx-x11.install | 4 +--- debian/post-build-nx.sh | 23 +++++++++++++++++++++++ debian/pre-build-nx.sh | 3 +++ debian/rules | 4 ++++ 5 files changed, 32 insertions(+), 4 deletions(-) create mode 100755 debian/post-build-nx.sh create mode 100755 debian/pre-build-nx.sh The diff of changes is: diff --git a/debian/libnx-x11-dev.install b/debian/libnx-x11-dev.install index 6ed62c5..3a29fcb 100644 --- a/debian/libnx-x11-dev.install +++ b/debian/libnx-x11-dev.install @@ -1,2 +1,2 @@ -nx-X11/exports/include/* usr/include/nx/X11 +nx-X11/.build-exports/include/* usr/include/nx/X11 diff --git a/debian/libnx-x11.install b/debian/libnx-x11.install index bc60adb..9dda743 100644 --- a/debian/libnx-x11.install +++ b/debian/libnx-x11.install @@ -1,4 +1,2 @@ -nx-X11/lib/X11/lib* usr/lib/nx/X11 -nx-X11/lib/Xext/lib* usr/lib/nx/X11 -nx-X11/lib/Xrender/lib* usr/lib/nx/X11 +nx-X11/.build-exports/lib/* usr/lib/nx/X11 diff --git a/debian/post-build-nx.sh b/debian/post-build-nx.sh new file mode 100755 index 0000000..4c94956 --- /dev/null +++ b/debian/post-build-nx.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +set -ex + +# create nx-X11/.build-exports +mkdir -p nx-X11/.build-exports/include +mkdir -p nx-X11/.build-exports/lib + +# copy headers (libnx-x11-dev) +cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include + +# copy libs (libnx-x11) +find nx-X11/exports/lib/ | egrep "^.*\.so$" | while read libpath; do + libfile=$(basename $libpath) + libdir=$(dirname $libpath) + mkdir -p ${libdir//exports/.build-exports} + cp -L $libpath ${libdir//exports/.build-exports} + find $libdir/$libfile.* | while read symlink; do + ln -s $libfile ${libdir//exports/.build-exports}/$(basename $symlink) + done +done + +exit 0 \ No newline at end of file diff --git a/debian/pre-build-nx.sh b/debian/pre-build-nx.sh new file mode 100755 index 0000000..92b94c4 --- /dev/null +++ b/debian/pre-build-nx.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +exit 0 \ No newline at end of file diff --git a/debian/rules b/debian/rules index faaa775..cb9ecd0 100755 --- a/debian/rules +++ b/debian/rules @@ -13,3 +13,7 @@ endif override_dh_auto_install: +override_dh_auto_build: + debian/pre-build-nx.sh + dh_auto_build + debian/post-build-nx.sh \ No newline at end of file hooks/post-receive -- nx-libs.git (NX libraries) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX libraries).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits October 2011