diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-02-27 04:08:51 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-27 04:08:51 +0100 |
| commit | 0a5d26d121a8420feb25bd68c8f1623edf50e0a8 (patch) | |
| tree | 104d1f0ff7e856a3c2e54433046e52346e80d356 /debian | |
| parent | e1f2902bb1ad29f852f97dc08a3e3e29ad88c384 (diff) | |
| parent | fff875549f70b5f16f9e15cb8fdb4022939bf806 (diff) | |
| download | nx-libs-0a5d26d121a8420feb25bd68c8f1623edf50e0a8.tar.gz nx-libs-0a5d26d121a8420feb25bd68c8f1623edf50e0a8.tar.bz2 nx-libs-0a5d26d121a8420feb25bd68c8f1623edf50e0a8.zip | |
Merge branch 'sunweaver-pr/hard-code-rgb-colors' into 3.6.x
Attributes GH PR #319: https://github.com/ArcticaProject/nx-libs/pull/319
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/nxagent.install | 2 | ||||
| -rwxr-xr-x | debian/nxagent.postinst | 8 | ||||
| -rwxr-xr-x | debian/nxagent.postrm | 8 | ||||
| -rwxr-xr-x | debian/nxagent.preinst | 8 | ||||
| -rw-r--r-- | debian/patches/016_nx-X11_install-location.debian.patch | 4 |
6 files changed, 28 insertions, 4 deletions
diff --git a/debian/control b/debian/control index eb0d68904..a98f7f6f0 100644 --- a/debian/control +++ b/debian/control @@ -39,6 +39,8 @@ Vcs-Browser: https://github.com/ArcticaProject/nx-libs/ Package: nx-x11-common Architecture: all Multi-Arch: foreign +Pre-Depends: + dpkg (>= 1.15.7.2), Depends: ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), diff --git a/debian/nxagent.install b/debian/nxagent.install index 5f6a9de35..34f5c3a76 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -1,6 +1,4 @@ etc/nxagent/keystrokes.cfg -etc/nxagent/rgb -usr/share/nx/rgb usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* usr/lib/*/nx/bin/nxagent diff --git a/debian/nxagent.postinst b/debian/nxagent.postinst new file mode 100755 index 000000000..8ad000e9b --- /dev/null +++ b/debian/nxagent.postinst @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile \ + /etc/nxagent/rgb "2:3.5.99.4-999" nxagent -- "$@" + +#DEBHELPER# diff --git a/debian/nxagent.postrm b/debian/nxagent.postrm new file mode 100755 index 000000000..8ad000e9b --- /dev/null +++ b/debian/nxagent.postrm @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile \ + /etc/nxagent/rgb "2:3.5.99.4-999" nxagent -- "$@" + +#DEBHELPER# diff --git a/debian/nxagent.preinst b/debian/nxagent.preinst new file mode 100755 index 000000000..8ad000e9b --- /dev/null +++ b/debian/nxagent.preinst @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile \ + /etc/nxagent/rgb "2:3.5.99.4-999" nxagent -- "$@" + +#DEBHELPER# diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch index c758a3cfe..c8458311d 100644 --- a/debian/patches/016_nx-X11_install-location.debian.patch +++ b/debian/patches/016_nx-X11_install-location.debian.patch @@ -14,7 +14,7 @@ Last-Update: 2017-02-08 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl -@@ -730,7 +730,7 @@ +@@ -725,7 +725,7 @@ #define AlternateUsrLibDir YES #endif #else @@ -23,7 +23,7 @@ Last-Update: 2017-02-08 #ifndef AlternateUsrLibDir #define AlternateUsrLibDir NO #endif -@@ -748,7 +748,7 @@ +@@ -743,7 +743,7 @@ #define AlternateUsrDataDir YES #endif #else |