The branch, master has been updated via 7a6cf42d4b47b9f33372470a35f2dfbfc95cfabe (commit) via e63819e64530f1b786e512e5f4e433ad845979b7 (commit) via 78fba02719b629d4cbc804d27a579773777741d3 (commit) from c26e4bd825826462fc73242f94369555ae0f44fe (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 7a6cf42d4b47b9f33372470a35f2dfbfc95cfabe Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 16 19:38:48 2012 +0100 another last patch with .diff suffix commit e63819e64530f1b786e512e5f4e433ad845979b7 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 16 19:35:28 2012 +0100 Fix faulty patch name suffix (has to be .patch, not .diff). commit 78fba02719b629d4cbc804d27a579773777741d3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 16 19:31:08 2012 +0100 Apply patches for the Debian package as the last patches in the series. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ ...l.diff => 030_nx-X11_configure-args.full.patch} | 0 ...ll.diff => 031_nx-X11_parallel-make.full.patch} | 0 ....diff => 301_nx-X11_use-shared-libs.full.patch} | 0 debian/patches/series | 11 +++++------ 5 files changed, 7 insertions(+), 6 deletions(-) rename debian/patches/{030_nx-X11_configure-args.full.diff => 030_nx-X11_configure-args.full.patch} (100%) rename debian/patches/{031_nx-X11_parallel-make.full.diff => 031_nx-X11_parallel-make.full.patch} (100%) rename debian/patches/{301_nx-X11_use-shared-libs.full.diff => 301_nx-X11_use-shared-libs.full.patch} (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3139119..8148af0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low Inspired by Jan Engelhardt's so-version.diff patch. However, the version name change requested in that patch has been rejected for NX (redistributed). + * Apply patches for the Debian package as the last patches in the series. + * Fix faulty patch name suffix (has to be .patch, not .diff). [ Jan Engelhardt ] * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of diff --git a/debian/patches/030_nx-X11_configure-args.full.diff b/debian/patches/030_nx-X11_configure-args.full.patch similarity index 100% rename from debian/patches/030_nx-X11_configure-args.full.diff rename to debian/patches/030_nx-X11_configure-args.full.patch diff --git a/debian/patches/031_nx-X11_parallel-make.full.diff b/debian/patches/031_nx-X11_parallel-make.full.patch similarity index 100% rename from debian/patches/031_nx-X11_parallel-make.full.diff rename to debian/patches/031_nx-X11_parallel-make.full.patch diff --git a/debian/patches/301_nx-X11_use-shared-libs.full.diff b/debian/patches/301_nx-X11_use-shared-libs.full.patch similarity index 100% rename from debian/patches/301_nx-X11_use-shared-libs.full.diff rename to debian/patches/301_nx-X11_use-shared-libs.full.patch diff --git a/debian/patches/series b/debian/patches/series index 5360b6b..cf194f1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,7 +15,6 @@ 014_nxcompshad_makefile-uninstall+autoconf.full.patch 015_nxproxy_makefile-uninstall.full+lite.patch 016_nx-x11_install-location.full.patch -016_nx-X11_install-location.debian.patch 017_nx-x11_update-autotools-helper-files.full.patch 018_nx-x11_update-libtool-ltmain-script.full.patch 019_nx-x11_expat-build-against-system-libxmltok.full.patch @@ -23,12 +22,11 @@ 021_add-nxauth-wrapper.full.patch 022_add-nxproxy-wrapper.full+lite.patch 023_add-x2goagent-wrapper.full.patch -030_nx-X11_configure-args.full.diff -031_nx-X11_parallel-make.full.diff +030_nx-X11_configure-args.full.patch +031_nx-X11_parallel-make.full.patch 032_no-x11r6.full.patch 101_nxagent_set-rgb-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch -102_xserver-xext_set-securitypolicy-path.debian.patch 103_nxagent_set-X0-config-path.full.patch 105_nxagent_export-remote-keyboard-config.full.patch 106_nxagent_utf8-copy-clipboard.full.patch @@ -41,7 +39,8 @@ 202_nx-x11_enable-xinerama.full.patch 209_x2goagent-add-man-page.full.patch 300_nxagent_set-wm-class.full.patch -301_nx-X11_use-shared-libs.full.diff +301_nx-X11_use-shared-libs.full.patch 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch - +016_nx-X11_install-location.debian.patch +102_xserver-xext_set-securitypolicy-path.debian.patch hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 (redistributed)).