aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-05-12 06:07:45 +0200
committerMihai Moldovan <ionic@ionic.de>2015-05-12 06:07:45 +0200
commitf7295831a0dd1b52fb68e41dd9e84e0850524835 (patch)
tree228931919b826ec3d1eb10df549c26a952f3e0ee /debian
parentb573cbba9416c8f87d7d399e383157ebd0446c8f (diff)
parent027f593fc78ea5bb53b1d6372aa7bf37e49e59f7 (diff)
downloadnx-libs-f7295831a0dd1b52fb68e41dd9e84e0850524835.tar.gz
nx-libs-f7295831a0dd1b52fb68e41dd9e84e0850524835.tar.bz2
nx-libs-f7295831a0dd1b52fb68e41dd9e84e0850524835.zip
Merge branch 'sunweaver-pr/libxdamage-cleanup' into arctica-3.6.x
Attributes GH PR #18: https://github.com/ArcticaProject/nx-libs/pull/18
Diffstat (limited to 'debian')
-rw-r--r--debian/control55
-rw-r--r--debian/libnx-xdamage-dev.install.in2
-rw-r--r--debian/libnx-xdamage1.install.in1
-rw-r--r--debian/libnx-xdamage1.symbols9
-rw-r--r--debian/nx-x11proto-damage-dev.install.in2
-rwxr-xr-xdebian/rules1
6 files changed, 21 insertions, 49 deletions
diff --git a/debian/control b/debian/control
index 4e4918999..0f575421f 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends:
libxpm-dev,
libxfont-dev,
libxdmcp-dev,
+ libxdamage-dev,
autoconf,
pkg-config,
x11proto-core-dev,
@@ -283,20 +284,16 @@ Multi-Arch: same
Pre-Depends:
${misc:Pre-Depends},
Depends:
- ${shlibs:Depends},
${misc:Depends},
-Breaks: nxlibs (<= 3.5.1),
- libnx-x11 (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 damaged region extension library
+Description: nx-X11 damaged region extension library (dummy package)
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one.
.
- libNX_Xdamage provides an X Window System client interface to the DAMAGE
- extension to the X protocol.
+ This package removes the obsoleted libNX_Xdamage.so.1 library. With
+ recent versions of NX, the system-wide installed libXdamage gets used.
.
- The Damage extension provides for notification of when on-screen regions have
- been 'damaged' (altered)
+ This package can be safely removed.
Package: libnx-xdamage-dev
Provides: libnx-xdamage1-dev
@@ -304,23 +301,17 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends:
- libnx-xdamage1 (= ${binary:Version}),
- nx-x11proto-damage-dev (= ${binary:Version}),
${misc:Depends},
-Breaks: nxlibs (<= 3.5.1),
- libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 damaged region extension library (development headers)
+Description: nx-X11 damaged region extension library (dummy package)
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one.
.
- libNX_Xdamage provides an X Window System client interface to the DAMAGE
- extension to the X protocol.
- .
- The Damage extension provides for notification of when on-screen regions have
- been 'damaged' (altered)
+ This package removes the obsoleted headers for the libNX_Xdamage.so.1
+ library. With recent versions of NX, the system-wide installed libXdamage
+ gets used.
.
- This package contains the development headers for this library.
+ This package can be safely removed.
Package: nx-x11proto-damage-dev
Section: libdevel
@@ -328,16 +319,16 @@ Architecture: any
Multi-Arch: same
Depends:
${misc:Depends},
-Breaks: nxlibs (<= 3.5.1),
- libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 Damage extension wire protocol
+Description: nx-X11 Damage extension wire protocol (dummy package)
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one.
.
- This package provides development headers describing the wire protocol
- for the Damage extension in nx-X11, used to notify clients of changes
- made to particular areas.
+ This package removes the obsoleted wire protocol headers for the
+ libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide
+ installed libXdamage gets used.
+ .
+ This package can be safely removed.
Package: libnx-xdamage1-dbg
Architecture: any
@@ -345,22 +336,18 @@ Multi-Arch: same
Pre-Depends:
${misc:Pre-Depends},
Depends:
- libnx-xdamage1 (= ${binary:Version}),
${misc:Depends},
Section: debug
-Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
-Description: nx-X11 damaged region extension library (debug package)
+Description: nx-X11 damaged region extension library (dummy package)
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one.
.
- libNX_Xdamage provides an X Window System client interface to the DAMAGE
- extension to the X protocol.
- .
- The Damage extension provides for notification of when on-screen regions have
- been 'damaged' (altered)
+ This package removes the obsoleted debug symbols for the
+ libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide
+ installed libXdamage gets used.
.
- This package contains debug symbols for this library.
+ This package can be safely removed.
Package: libnx-xdmcp6
Architecture: any
diff --git a/debian/libnx-xdamage-dev.install.in b/debian/libnx-xdamage-dev.install.in
deleted file mode 100644
index 068f3badd..000000000
--- a/debian/libnx-xdamage-dev.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libNX_Xdamage.so
-usr/include/*/nx/X11/extensions/Xdamage.h
diff --git a/debian/libnx-xdamage1.install.in b/debian/libnx-xdamage1.install.in
deleted file mode 100644
index 42bd90874..000000000
--- a/debian/libnx-xdamage1.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libNX_Xdamage.so.*
diff --git a/debian/libnx-xdamage1.symbols b/debian/libnx-xdamage1.symbols
deleted file mode 100644
index 09310e69a..000000000
--- a/debian/libnx-xdamage1.symbols
+++ /dev/null
@@ -1,9 +0,0 @@
-libNX_Xdamage.so.1 libnx-xdamage1 #MINVER#
- XDamageCreate@Base 3.5.0.29
- XDamageDestroy@Base 3.5.0.29
- XDamageExtensionInfo@Base 3.5.0.29
- XDamageExtensionName@Base 3.5.0.29
- XDamageFindDisplay@Base 3.5.0.29
- XDamageQueryExtension@Base 3.5.0.29
- XDamageQueryVersion@Base 3.5.0.29
- XDamageSubtract@Base 3.5.0.29
diff --git a/debian/nx-x11proto-damage-dev.install.in b/debian/nx-x11proto-damage-dev.install.in
deleted file mode 100644
index 949549f17..000000000
--- a/debian/nx-x11proto-damage-dev.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/*/nx/X11/extensions/damageproto.h
-usr/include/*/nx/X11/extensions/damagewire.h \ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 0da6db71a..16a09fb3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,7 +81,6 @@ override_dh_strip:
dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg
dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg
dh_strip -plibnx-xcomposite1 --dbg-package=libnx-xcomposite1-dbg
- dh_strip -plibnx-xdamage1 --dbg-package=libnx-xdamage1-dbg
dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg
dh_strip -plibnx-xfixes3 --dbg-package=libnx-xfixes3-dbg
dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg