diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-02-16 19:31:08 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-02-16 19:31:08 +0100 |
commit | 78fba02719b629d4cbc804d27a579773777741d3 (patch) | |
tree | 52467be50be594b394f754a0a05bba38c3984157 | |
parent | c26e4bd825826462fc73242f94369555ae0f44fe (diff) | |
download | nx-libs-78fba02719b629d4cbc804d27a579773777741d3.tar.gz nx-libs-78fba02719b629d4cbc804d27a579773777741d3.tar.bz2 nx-libs-78fba02719b629d4cbc804d27a579773777741d3.zip |
Apply patches for the Debian package as the last patches in the series.
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/patches/series | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 313911923..fd44c2151 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ 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. [ Jan Engelhardt ] * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of diff --git a/debian/patches/series b/debian/patches/series index 5360b6b00..d12226905 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 @@ -28,7 +27,6 @@ 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 @@ -44,4 +42,5 @@ 301_nx-X11_use-shared-libs.full.diff 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 |