diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 14:02:52 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 14:02:52 +0200 |
commit | a3a295288189d1312f5abef0e7b4cc57b948e7d3 (patch) | |
tree | d3f008069f724c2e9d3b152a62b6505a8c2da6f7 /debian | |
parent | 8307d4f330cde01a1f048598be184aa4bfa54501 (diff) | |
parent | 12ca29bf5418f0a7c4d7de57c5cd34c9151adac3 (diff) | |
download | nx-libs-a3a295288189d1312f5abef0e7b4cc57b948e7d3.tar.gz nx-libs-a3a295288189d1312f5abef0e7b4cc57b948e7d3.tar.bz2 nx-libs-a3a295288189d1312f5abef0e7b4cc57b948e7d3.zip |
Merge branch 'sunweaver-pr/debian-packaging-updates' into 3.6.x
Attributes GH PR: https://github.com/ArcticaProject/nx-libs/pull/151
Self-reviewed: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -- Fri, 01 Jul 2016 14:03:44 +0200
Diffstat (limited to 'debian')
-rw-r--r-- | debian/CODE-REDUCTION_CLEANUP-BACKUPFILES | 0 | ||||
-rw-r--r-- | debian/CODE-REDUCTION_CLEANUP-BRUTAL | 0 | ||||
-rw-r--r-- | debian/CODE-REDUCTION_CLEANUP-UNUSED | 0 | ||||
-rw-r--r-- | debian/CODE-REDUCTION_PRESERVE-INCLUDED | 0 | ||||
-rw-r--r-- | debian/CODE-REDUCTION_PRESERVE-NEEDED | 0 | ||||
-rw-r--r-- | debian/CODE-REDUCTION_PRESERVE-SYMLINKED | 0 | ||||
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/compat | 2 | ||||
-rw-r--r-- | debian/control | 591 | ||||
-rw-r--r-- | debian/libnx-x11-6.install (renamed from debian/libnx-x11-6.install.in) | 0 | ||||
-rw-r--r-- | debian/libnx-x11-dev.install (renamed from debian/libnx-x11-dev.install.in) | 0 | ||||
-rw-r--r-- | debian/libnx-xau-dev.install (renamed from debian/libnx-xau-dev.install.in) | 0 | ||||
-rw-r--r-- | debian/libnx-xau6.install (renamed from debian/libnx-xau6.install.in) | 0 | ||||
-rw-r--r-- | debian/libnx-xext-dev.install (renamed from debian/libnx-xext-dev.install.in) | 0 | ||||
-rw-r--r-- | debian/libnx-xext6.install (renamed from debian/libnx-xext6.install.in) | 0 | ||||
-rw-r--r-- | debian/libxcomp-dev.install (renamed from debian/libxcomp-dev.install.in) | 0 | ||||
-rw-r--r-- | debian/libxcomp3.install (renamed from debian/libxcomp3.install.in) | 0 | ||||
-rw-r--r-- | debian/libxcompext-dev.install (renamed from debian/libxcompext-dev.install.in) | 0 | ||||
-rw-r--r-- | debian/libxcompext3.install (renamed from debian/libxcompext3.install.in) | 0 | ||||
-rw-r--r-- | debian/libxcompext3.symbols | 103 | ||||
-rw-r--r-- | debian/libxcompshad-dev.install (renamed from debian/libxcompshad-dev.install.in) | 0 | ||||
-rw-r--r-- | debian/libxcompshad3.install (renamed from debian/libxcompshad3.install.in) | 0 | ||||
-rw-r--r-- | debian/nx-x11proto-composite-dev.install (renamed from debian/nx-x11proto-composite-dev.install.in) | 0 | ||||
-rw-r--r-- | debian/nx-x11proto-core-dev.install (renamed from debian/nx-x11proto-core-dev.install.in) | 0 | ||||
-rw-r--r-- | debian/nx-x11proto-damage-dev.install (renamed from debian/nx-x11proto-damage-dev.install.in) | 0 | ||||
-rw-r--r-- | debian/nx-x11proto-randr-dev.install (renamed from debian/nx-x11proto-randr-dev.install.in) | 0 | ||||
-rw-r--r-- | debian/nx-x11proto-render-dev.install (renamed from debian/nx-x11proto-render-dev.install.in) | 0 | ||||
-rw-r--r-- | debian/nx-x11proto-xext-dev.install (renamed from debian/nx-x11proto-xext-dev.install.in) | 0 | ||||
-rw-r--r-- | debian/nx-x11proto-xfixes-dev.install (renamed from debian/nx-x11proto-xfixes-dev.install.in) | 0 | ||||
-rw-r--r-- | debian/nx-x11proto-xinerama-dev.install (renamed from debian/nx-x11proto-xinerama-dev.install.in) | 0 | ||||
-rw-r--r-- | debian/nxagent.dirs | 3 | ||||
-rw-r--r-- | debian/nxproxy.dirs | 2 | ||||
-rwxr-xr-x | debian/roll-tarballs.sh | 156 | ||||
-rwxr-xr-x | debian/rules | 20 |
34 files changed, 166 insertions, 713 deletions
diff --git a/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES b/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES deleted file mode 100644 index e69de29bb..000000000 --- a/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES +++ /dev/null diff --git a/debian/CODE-REDUCTION_CLEANUP-BRUTAL b/debian/CODE-REDUCTION_CLEANUP-BRUTAL deleted file mode 100644 index e69de29bb..000000000 --- a/debian/CODE-REDUCTION_CLEANUP-BRUTAL +++ /dev/null diff --git a/debian/CODE-REDUCTION_CLEANUP-UNUSED b/debian/CODE-REDUCTION_CLEANUP-UNUSED deleted file mode 100644 index e69de29bb..000000000 --- a/debian/CODE-REDUCTION_CLEANUP-UNUSED +++ /dev/null diff --git a/debian/CODE-REDUCTION_PRESERVE-INCLUDED b/debian/CODE-REDUCTION_PRESERVE-INCLUDED deleted file mode 100644 index e69de29bb..000000000 --- a/debian/CODE-REDUCTION_PRESERVE-INCLUDED +++ /dev/null diff --git a/debian/CODE-REDUCTION_PRESERVE-NEEDED b/debian/CODE-REDUCTION_PRESERVE-NEEDED deleted file mode 100644 index e69de29bb..000000000 --- a/debian/CODE-REDUCTION_PRESERVE-NEEDED +++ /dev/null diff --git a/debian/CODE-REDUCTION_PRESERVE-SYMLINKED b/debian/CODE-REDUCTION_PRESERVE-SYMLINKED deleted file mode 100644 index e69de29bb..000000000 --- a/debian/CODE-REDUCTION_PRESERVE-SYMLINKED +++ /dev/null diff --git a/debian/changelog b/debian/changelog index 802ba1b33..e97d3cb01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nx-libs (2:3.5.99.0-0) UNRELEASED; urgency=medium +nx-libs (2:3.5.99.0-0.1) UNRELEASED; urgency=medium * Version bump, continuing NX 3.x development.. Targeting NX 3.6.x.y some time. diff --git a/debian/compat b/debian/compat index 7f8f011eb..ec635144f 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index e9e7f7d18..1a58cf6a7 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,11 @@ Section: x11 Priority: extra Maintainer: Artica Project <devs@lists.arctica-project.org> Uploaders: - Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, + Mike Gabriel <sunweaver@debian.org>, Mihai Moldovan <ionic@ionic.de> Build-Depends: - debhelper (>= 7.0.50~), + debhelper (>= 9), + dpkg-dev (>= 1.16.1.1), libpng-dev, libjpeg-dev, zlib1g-dev, @@ -29,7 +30,7 @@ Build-Depends: expat, libpixman-1-dev (>= 0.13.2), xutils-dev, -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: https://github.com/ArcticaProject/nx-libs/ Vcs-Git: https://github.com/ArcticaProject/nx-libs/ Vcs-Browser: https://github.com/ArcticaProject/nx-libs/ @@ -65,32 +66,34 @@ Description: nx-X11 core wire protocol and auxiliary headers for the core nx-X11 protocol, and also provides a number of utility headers, used to abstract OS-specific functions. -Package: libnx-x11 -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, - libnx-x11-6 (>= ${source:Version}), libnx-x11-6 (<< ${source:Version}.1), -Description: nx-X11 client-side library (transitional 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 is a transitional dummy package and can be safely removed - (inducing transition of libnx-x11 to libnx-x11-6). - Package: libnx-x11-6 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, nx-x11-common (>= ${source:Version}), nx-x11-common (<< ${source:Version}.1), Breaks: nxlibs (<= 3.5.1), libnx-x11 (<< 2:3.5.0.29-1~), + libnx-xcomposite1 (<< 2:3.6.0.0), + libnx-xdamage1 (<< 2:3.6.0.0), + libnx-xdmcp6 (<< 2:3.6.0.0), + libnx-xfixes3 (<< 2:3.6.0.0), + libnx-xinerama1 (<< 2:3.6.0.0), + libnx-xpm4 (<< 2:3.6.0.0), + libnx-xrandr2 (<< 2:3.6.0.0), + libnx-xrender1 (<< 2:3.6.0.0), + libnx-xtst6 (<< 2:3.6.0.0), Replaces: nxlibs, + libnx-xcomposite1, + libnx-xdamage1, + libnx-xdmcp6, + libnx-xfixes3, + libnx-xinerama1, + libnx-xpm4, + libnx-xrandr2, + libnx-xrender1, + libnx-xtst6, Description: nx-X11 client-side library NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -104,7 +107,25 @@ Provides: libnx-x11-6-dev Section: libdevel Architecture: any Breaks: nxlibs-dev (<=3.5.1), + libnx-xcomposite-dev (<< 2:3.6.0.0), + libnx-xdamage-dev (<< 2:3.6.0.0), + libnx-xdmcp-dev (<< 2:3.6.0.0), + libnx-xfixes-dev (<< 2:3.6.0.0), + libnx-xinerama-dev (<< 2:3.6.0.0), + libnx-xpm-dev (<< 2:3.6.0.0), + libnx-xrandr-dev (<< 2:3.6.0.0), + libnx-xrender-dev (<< 2:3.6.0.0), + libnx-xtst-dev (<< 2:3.6.0.0), Replaces: nxlibs-dev, + libnx-xcomposite-dev, + libnx-xdamage-dev, + libnx-xdmcp-dev, + libnx-xfixes-dev, + libnx-xinerama-dev, + libnx-xpm-dev, + libnx-xrandr-dev, + libnx-xrender-dev, + libnx-xtst-dev, Depends: libnx-x11-6 (= ${binary:Version}), ${misc:Depends}, @@ -119,14 +140,30 @@ Description: nx-X11 client-side library (development headers) Package: libnx-x11-6-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libnx-x11-6 (= ${binary:Version}), ${misc:Depends}, Section: debug Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), + libnx-xcomposite1-dbg (<< 2:3.6.0.0), + libnx-xdamage1-dbg (<< 2:3.6.0.0), + libnx-xdmcp6-dbg (<< 2:3.6.0.0), + libnx-xfixes3-dbg (<< 2:3.6.0.0), + libnx-xinerama1-dbg (<< 2:3.6.0.0), + libnx-xpm4-dbg (<< 2:3.6.0.0), + libnx-xrandr2-dbg (<< 2:3.6.0.0), + libnx-xrender1-dbg (<< 2:3.6.0.0), + libnx-xtst6-dbg (<< 2:3.6.0.0), Replaces: nx-x11-dbg, + libnx-xcomposite1-dbg, + libnx-xdamage1-dbg, + libnx-xdmcp6-dbg, + libnx-xfixes3-dbg, + libnx-xinerama1-dbg, + libnx-xpm4-dbg, + libnx-xrandr2-dbg, + libnx-xrender1-dbg, + libnx-xtst6-dbg, Description: nx-X11 client-side library (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -138,8 +175,6 @@ Description: nx-X11 client-side library (debug package) Package: libnx-xau6 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -178,8 +213,6 @@ Description: nx-X11 authorisation library (development headers) Package: libnx-xau6-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libnx-xau6 (= ${binary:Version}), ${misc:Depends}, @@ -196,42 +229,6 @@ Description: nx-X11 authorisation library (debug package) . This package contains debug symbols for this library. -Package: libnx-xcomposite1 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 Composite 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. - . - This package removes the obsoleted libNX_Xcomposite.so.1 library. With - recent versions of NX, the system-wide installed libXcomposite gets - used. - . - This package can be safely removed. - -Package: libnx-xcomposite-dev -Provides: libnx-xcomposite1-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Composite 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. - . - This package removes the obsoleted headers for the libNX_Xcomposite.so.1 - library. With recent versions of NX, the system-wide installed - libXcomposite gets used. - . - This package can be safely removed. - Package: nx-x11proto-composite-dev Section: libdevel Architecture: any @@ -249,60 +246,6 @@ Description: nx-X11 Composite extension wire protocol for the Composite extension in nx-X11, used to let arbitrary client programs control drawing of the final image. -Package: libnx-xcomposite1-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 Composite 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. - . - This package removes the debug symbols for the obsoleted - libNX_Xcomposite.so.1 library. With recent versions of NX, the - system-wide installed libXcomposite gets used. - . - This package can be safely removed. - -Package: libnx-xdamage1 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -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. - . - This package removes the obsoleted 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-xdamage-dev -Provides: libnx-xdamage1-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -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. - . - 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 can be safely removed. - Package: nx-x11proto-damage-dev Section: libdevel Architecture: any @@ -320,84 +263,9 @@ Description: nx-X11 Damage extension wire protocol (dummy package) . This package can be safely removed. -Package: libnx-xdamage1-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -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. - . - 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 can be safely removed. - -Package: libnx-xdmcp6 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 Display Manager Control Protocol 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. - . - This package removes the obsoleted libNX_Xdmcp.so.6 library. With - recent versions of NX, the system-wide installed libXdmcp gets used. - . - This package can be safely removed. - -Package: libnx-xdmcp-dev -Provides: libnx-xdmcp6-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Display Manager Control Protocol 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. - . - This package removes the obsoleted headers for the libNX_Xdmcp.so.6 - library. With recent versions of NX, the system-wide installed libXdmcp - gets used. - . - This package can be safely removed. - -Package: libnx-xdmcp6-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 Display Manager Control Protocol 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. - . - This package removes the obsoleted debug symbols for the libNX_Xdmcp.so.6 - library. With recent versions of NX, the system-wide installed libXdmcp - gets used. - . - This package can be safely removed. - Package: libnx-xext6 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -457,8 +325,6 @@ Description: nx-X11 miscellaneous extension wire protocol Package: libnx-xext6-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libnx-xext6 (= ${binary:Version}), ${misc:Depends}, @@ -474,41 +340,6 @@ Description: nx-X11 miscellaneous extension library (debug package) . This package contains debug symbols for this library. -Package: libnx-xfixes3 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 miscellaneous 'fixes' 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. - . - This package removes the obsoleted libNX_Xfixes.so.3 library. With - recent versions of NX, the system-wide installed libXfixes gets used. - . - This package can be safely removed. - -Package: libnx-xfixes-dev -Provides: libnx-xfixes3-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 miscellaneous 'fixes' 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. - . - This package removes the obsoleted headers for the libNX_Xfixes.so.3 - library. With recent versions of NX, the system-wide installed - libXfixes gets used. - . - This package can be safely removed. - Package: nx-x11proto-xfixes-dev Section: libdevel Architecture: any @@ -525,60 +356,6 @@ Description: nx-X11 'xfixes' extension wire protocol This package provides development headers describing the wire protocol for the XFIXES extension. -Package: libnx-xfixes3-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 miscellaneous 'fixes' 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. - . - This package removes the obsoleted debug symbols for the libNX_Xfixes.so.3 - library. With recent versions of NX, the system-wide installed libXfixes - gets used. - . - This package can be safely removed. - -Package: libnx-xinerama1 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 Xinerama extension library - 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 removes the obsoleted libNX_Xinerama.so.1 library. - Xinerama support in NX has been moved into nxagent whereas X-Clients - can now use the libXinerama library shipped with X.Org. - . - This package can be safely removed. - -Package: libnx-xinerama-dev -Provides: libnx-xinerama1-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Xinerama extension library (development headers) - 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 removes the obsoleted headers for the libNX_Xinerama.so.1 - library. - . - This package can be safely removed. - Package: nx-x11proto-xinerama-dev Section: libdevel Architecture: any @@ -595,119 +372,6 @@ Description: nx-X11 Xinerama extension wire protocol . This package can be safely removed. -Package: libnx-xinerama1-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - libnx-xinerama1 (= ${binary:Version}), - ${misc:Depends}, -Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), -Description: nx-X11 Xinerama extension library (debug 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_Xinerama provides an X Window System client interface to the XINERAMA - extension to the X protocol. - . - This package removes the obsoleted debug symbols for the libNX_Xinerama.so.1 - library. - . - This package can be safely removed. - -Package: libnx-xpm4 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 pixmap 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. - . - This package removes the obsoleted libNX_Xpm.so.4 library. With - recent versions of NX, the system-wide installed libXpm gets used. - . - This package can be safely removed. - -Package: libnx-xpm-dev -Provides: libnx-xpm4-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 pixmap library (development headers, 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 removes the obsoleted headers for the libNX_Xpm.so.4 - library. With recent versions of NX, the system-wide installed libXpm - gets used. - . - This package can be safely removed. - -Package: libnx-xpm4-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), -Description: nx-X11 pixmap library (debug package, 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 removes the obsoleted debug symbols for the libNX_Xpm.so.4 - library. With recent versions of NX, the system-wide installed libXpm - gets used. - . - This package can be safely removed. - -Package: libnx-xrandr2 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 RandR 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. - . - This package removes the obsoleted libNX_Xrandr.so.2 library. With - recent versions of NX, the system-wide installed libXrandr gets used. - . - This package can be safely removed. - -Package: libnx-xrandr-dev -Provides: libnx-xrandr2-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 RandR 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. - . - This package removes the obsoleted headers for the libNX_Xrandr.so.2 - library. With recent versions of NX, the system-wide installed libXrandr - gets used. - . - This package can be safely removed. - Package: nx-x11proto-randr-dev Section: libdevel Architecture: any @@ -725,60 +389,6 @@ Description: nx-X11 RandR extension wire protocol (dummy package) . This package can be safely removed. -Package: libnx-xrandr2-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 RandR 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. - . - This package removes the obsoleted debug symbols for the libNX_Xrandr.so.2 - library. With recent versions of NX, the system-wide installed libXrandr - gets used. - . - This package can be safely removed. - -Package: libnx-xrender1 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 Rendering Extension client 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. - . - This package removes the obsoleted libNX_Xrender.so.1 library. With - recent versions of NX, the system-wide installed libXrender gets used. - . - This package can be safely removed. - -Package: libnx-xrender-dev -Provides: libnx-xrender1-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Rendering Extension client 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. - . - This package removes the obsoleted headers for the libNX_Xrender.so.1 - library. With recent versions of NX, the system-wide installed libXrender - gets used. - . - This package can be safely removed. - Package: nx-x11proto-render-dev Section: libdevel Architecture: any @@ -796,79 +406,6 @@ Description: nx-X11 Render extension wire protocol (dummy package) . This package can be safely removed. -Package: libnx-xrender1-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 Rendering Extension client 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. - . - This package removes the obsoleted debug symbols for the libNX_Xrender.so.1 - library. With recent versions of NX, the system-wide installed libXrender - gets used. - . - This package can be safely removed. - -Package: libnx-xtst6 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 Testing -- Record 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. - . - This package removes the obsoleted libNX_Xtst.so.6 library. With - recent versions of NX, the system-wide installed libXtst gets used. - . - This package can be safely removed. - -Package: libnx-xtst-dev -Provides: libnx-xtst6-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Testing -- Record 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. - . - This package removes the obsoleted headers for the libNX_Xtst.so.6 - library. With recent versions of NX, the system-wide installed libXtst - gets used. - . - This package can be safely removed. - -Package: libnx-xtst6-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 Testing -- Record 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. - . - This package removes the obsoleted wire protocol headers for the - libNX_Xtst.so.6 library. With recent versions of NX, the system-wide - installed libXtst gets used. - . - This package can be safely removed. - Package: libnx-mesa-extras-dev Section: libdevel Architecture: any @@ -1005,8 +542,6 @@ Description: NX auth (debug package) Package: libxcomp3 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -1042,8 +577,6 @@ Description: nx-X11 compression library (development headers) Package: libxcomp3-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libxcomp3 (= ${binary:Version}), ${misc:Depends}, @@ -1061,8 +594,6 @@ Description: nx-X11 compression library (debug package) Package: libxcompext3 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -1097,8 +628,6 @@ Description: nx-X11 protocol compression extensions library (development headers Package: libxcompext3-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libxcompext3 (= ${binary:Version}), ${misc:Depends}, @@ -1116,8 +645,6 @@ Description: nx-X11 protocol compression extensions library (debug package) Package: libxcompshad3 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -1151,8 +678,6 @@ Description: nx-X11 shadowing library (development headers) Package: libxcompshad3-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libxcompshad3 (= ${binary:Version}), ${misc:Depends}, diff --git a/debian/libnx-x11-6.install.in b/debian/libnx-x11-6.install index 4912d749f..4912d749f 100644 --- a/debian/libnx-x11-6.install.in +++ b/debian/libnx-x11-6.install diff --git a/debian/libnx-x11-dev.install.in b/debian/libnx-x11-dev.install index 83e2def0e..83e2def0e 100644 --- a/debian/libnx-x11-dev.install.in +++ b/debian/libnx-x11-dev.install diff --git a/debian/libnx-xau-dev.install.in b/debian/libnx-xau-dev.install index 1bf954c00..1bf954c00 100644 --- a/debian/libnx-xau-dev.install.in +++ b/debian/libnx-xau-dev.install diff --git a/debian/libnx-xau6.install.in b/debian/libnx-xau6.install index 246377f12..246377f12 100644 --- a/debian/libnx-xau6.install.in +++ b/debian/libnx-xau6.install diff --git a/debian/libnx-xext-dev.install.in b/debian/libnx-xext-dev.install index 819c82013..819c82013 100644 --- a/debian/libnx-xext-dev.install.in +++ b/debian/libnx-xext-dev.install diff --git a/debian/libnx-xext6.install.in b/debian/libnx-xext6.install index 361d951f5..361d951f5 100644 --- a/debian/libnx-xext6.install.in +++ b/debian/libnx-xext6.install diff --git a/debian/libxcomp-dev.install.in b/debian/libxcomp-dev.install index e27e6ecf0..e27e6ecf0 100644 --- a/debian/libxcomp-dev.install.in +++ b/debian/libxcomp-dev.install diff --git a/debian/libxcomp3.install.in b/debian/libxcomp3.install index 9b8fa9f15..9b8fa9f15 100644 --- a/debian/libxcomp3.install.in +++ b/debian/libxcomp3.install diff --git a/debian/libxcompext-dev.install.in b/debian/libxcompext-dev.install index a31961b99..a31961b99 100644 --- a/debian/libxcompext-dev.install.in +++ b/debian/libxcompext-dev.install diff --git a/debian/libxcompext3.install.in b/debian/libxcompext3.install index b9ac8ebb9..b9ac8ebb9 100644 --- a/debian/libxcompext3.install.in +++ b/debian/libxcompext3.install diff --git a/debian/libxcompext3.symbols b/debian/libxcompext3.symbols new file mode 100644 index 000000000..0ca6ec6b8 --- /dev/null +++ b/debian/libxcompext3.symbols @@ -0,0 +1,103 @@ +libXcompext.so.3 libxcompext3 #MINVER# + AlphaCompressData@Base 3.5.0.29 + BitmapCompressData@Base 3.5.0.29 + CleanXYImage@Base 3.5.0.29 + CleanZImage@Base 3.5.0.29 + ColormapCompressData@Base 3.5.0.29 + CopyAndCleanImage@Base 3.5.0.29 + FindLSB@Base 3.5.0.29 + JpegCompressData@Base 3.5.0.29 + MaskImage@Base 3.5.0.29 + MaskInPlaceImage@Base 3.5.0.29 + NXAbortSplit@Base 3.5.0.29 + NXAllocColors@Base 3.5.0.29 + NXAllocSplit@Base 3.5.0.29 + NXAllocUnpack@Base 3.5.0.29 + NXCacheAddImage@Base 3.5.0.29 + NXCacheFindImage@Base 3.5.0.29 + NXCleanImage@Base 3.5.0.29 + NXCollectGrabPointer@Base 3.5.0.29 + NXCollectImage@Base 3.5.0.29 + NXCollectInputFocus@Base 3.5.0.29 + NXCollectProperty@Base 3.5.0.29 + NXCommitSplit@Base 3.5.0.29 + NXCreatePackedImage@Base 3.5.0.29 + NXCreatePalette16@Base 3.5.0.29 + NXCreatePalette32@Base 3.5.0.29 + NXDestroyPackedImage@Base 3.5.0.29 + NXDisplayCongestion@Base 3.5.0.29 + NXDisplayError@Base 3.5.0.29 + NXDisplayFlushable@Base 3.5.0.29 + NXDisplayReadable@Base 3.5.0.29 + NXEncodeAlpha@Base 3.5.0.29 + NXEncodeBitmap@Base 3.5.0.29 + NXEncodeColormap@Base 3.5.0.29 + NXEncodeColors@Base 3.5.0.29 + NXEncodeJpeg@Base 3.5.0.29 + NXEncodePng@Base 3.5.0.29 + NXEncodeRgb@Base 3.5.0.29 + NXEncodeRle@Base 3.5.0.29 + NXEndSplit@Base 3.5.0.29 + NXFinishSplit@Base 3.5.0.29 + NXFlushDisplay@Base 3.5.0.29 + NXForceDisplayError@Base 3.5.0.29 + NXFreeCache@Base 3.5.0.29 + NXFreeSplit@Base 3.5.0.29 + NXFreeUnpack@Base 3.5.0.29 + NXGetCollectGrabPointerResource@Base 3.5.0.29 + NXGetCollectImageResource@Base 3.5.0.29 + NXGetCollectInputFocusResource@Base 3.5.0.29 + NXGetCollectPropertyResource@Base 3.5.0.29 + NXGetCollectedGrabPointer@Base 3.5.0.29 + NXGetCollectedImage@Base 3.5.0.29 + NXGetCollectedInputFocus@Base 3.5.0.29 + NXGetCollectedProperty@Base 3.5.0.29 + NXGetControlParameters@Base 3.5.0.29 + NXGetFontParameters@Base 3.5.0.29 + NXGetShmemParameters@Base 3.5.0.29 + NXGetUnpackParameters@Base 3.5.0.29 + NXHandleDisplayError@Base 3.5.0.29 + NXImageCache@Base 3.5.0.29 + NXImageCacheHits@Base 3.5.0.29 + NXImageCacheOps@Base 3.5.0.29 + NXImageCacheSize@Base 3.5.0.29 + NXInPlacePackImage@Base 3.5.0.29 + NXInitCache@Base 3.5.0.29 + NXInitDisplay@Base 3.5.0.29 + NXMaskImage@Base 3.5.0.29 + NXPackImage@Base 3.5.0.29 + NXPutPackedImage@Base 3.5.0.29 + NXResetDisplay@Base 3.5.0.29 + NXSetCacheParameters@Base 3.5.0.29 + NXSetDisplayBlockHandler@Base 3.5.0.29 + NXSetDisplayBuffer@Base 3.5.0.29 + NXSetDisplayErrorPredicate@Base 3.5.0.29 + NXSetDisplayFlushHandler@Base 3.5.0.29 + NXSetDisplayPolicy@Base 3.5.0.29 + NXSetDisplayStatisticsHandler@Base 3.5.0.29 + NXSetDisplayWriteHandler@Base 3.5.0.29 + NXSetExposeParameters@Base 3.5.0.29 + NXSetLostSequenceHandler@Base 3.5.0.29 + NXSetUnpackAlpha@Base 3.5.0.29 + NXSetUnpackAlphaCompat@Base 3.5.0.29 + NXSetUnpackColormap@Base 3.5.0.29 + NXSetUnpackColormapCompat@Base 3.5.0.29 + NXSetUnpackGeometry@Base 3.5.0.29 + NXStartSplit@Base 3.5.0.29 + NXUnsetLibraryPath@Base 3.5.0.29 + PackImage@Base 3.5.0.29 + PngCompareColorTable@Base 3.5.0.29 + PngCompressData@Base 3.5.0.29 + RgbCompressData@Base 3.5.0.29 + RleCompressData@Base 3.5.0.29 + ZCompressData@Base 3.5.0.29 + ZInitEncoder@Base 3.5.0.29 + ZResetEncoder@Base 3.5.0.29 + _NXInternalInitEncoders@Base 3.5.0.29 + _NXInternalInitResources@Base 3.5.0.29 + _NXInternalResetEncoders@Base 3.5.0.29 + _NXInternalResetResources@Base 3.5.0.29 + color_type@Base 3.5.0.29 + info_ptr@Base 3.5.0.29 + palette@Base 3.5.0.29 + png_ptr@Base 3.5.0.29 diff --git a/debian/libxcompshad-dev.install.in b/debian/libxcompshad-dev.install index 2010f5950..2010f5950 100644 --- a/debian/libxcompshad-dev.install.in +++ b/debian/libxcompshad-dev.install diff --git a/debian/libxcompshad3.install.in b/debian/libxcompshad3.install index 6b452b2bd..6b452b2bd 100644 --- a/debian/libxcompshad3.install.in +++ b/debian/libxcompshad3.install diff --git a/debian/nx-x11proto-composite-dev.install.in b/debian/nx-x11proto-composite-dev.install index cf2c77e36..cf2c77e36 100644 --- a/debian/nx-x11proto-composite-dev.install.in +++ b/debian/nx-x11proto-composite-dev.install diff --git a/debian/nx-x11proto-core-dev.install.in b/debian/nx-x11proto-core-dev.install index 2e99909a8..2e99909a8 100644 --- a/debian/nx-x11proto-core-dev.install.in +++ b/debian/nx-x11proto-core-dev.install diff --git a/debian/nx-x11proto-damage-dev.install.in b/debian/nx-x11proto-damage-dev.install index 1503260cf..1503260cf 100644 --- a/debian/nx-x11proto-damage-dev.install.in +++ b/debian/nx-x11proto-damage-dev.install diff --git a/debian/nx-x11proto-randr-dev.install.in b/debian/nx-x11proto-randr-dev.install index 3b30f71d0..3b30f71d0 100644 --- a/debian/nx-x11proto-randr-dev.install.in +++ b/debian/nx-x11proto-randr-dev.install diff --git a/debian/nx-x11proto-render-dev.install.in b/debian/nx-x11proto-render-dev.install index f2222d234..f2222d234 100644 --- a/debian/nx-x11proto-render-dev.install.in +++ b/debian/nx-x11proto-render-dev.install diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install index f34e66519..f34e66519 100644 --- a/debian/nx-x11proto-xext-dev.install.in +++ b/debian/nx-x11proto-xext-dev.install diff --git a/debian/nx-x11proto-xfixes-dev.install.in b/debian/nx-x11proto-xfixes-dev.install index 91eae0306..91eae0306 100644 --- a/debian/nx-x11proto-xfixes-dev.install.in +++ b/debian/nx-x11proto-xfixes-dev.install diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install index 2e1efbc63..2e1efbc63 100644 --- a/debian/nx-x11proto-xinerama-dev.install.in +++ b/debian/nx-x11proto-xinerama-dev.install diff --git a/debian/nxagent.dirs b/debian/nxagent.dirs deleted file mode 100644 index 544d2fa34..000000000 --- a/debian/nxagent.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/lib/nx/bin -usr/share/nx
\ No newline at end of file diff --git a/debian/nxproxy.dirs b/debian/nxproxy.dirs deleted file mode 100644 index 7c8e1505c..000000000 --- a/debian/nxproxy.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/lib/nx/bin diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh deleted file mode 100755 index 24f7b07b0..000000000 --- a/debian/roll-tarballs.sh +++ /dev/null @@ -1,156 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012 by Reinhard Tartler <siretart@tauware.de> -# -# This is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -# Thanks to Jonas Smedegaard <dr@jones.dk> for inspiration... - -# Formatting/cleanups by siretart in December 2012 - -set -e - -usage() { - echo "To be called at the project root of an nx-libs checkout" - echo "usage: $(basename "$0") {<release-version>,HEAD} {server|client}" - exit 1 -} - -PROJECT="nx-libs" -NULL="" - -test -d ".git" || usage -RELEASE="$1" -test -n "${RELEASE}" || usage -CHECKOUT="$2" -test -n "$CHECKOUT" || usage - -if [ "x$CHECKOUT" = "xserver" ] || [ "x${CHECKOUT}" = "xfull" ]; then - MODE="full" - CHECKOUT="redist-server/${RELEASE}" - RELEASE_SUFFIX='-full' -elif [ "x$CHECKOUT" = "xclient" ] || [ "x${CHECKOUT}" = "xlite" ]; then - MODE="lite" - CHECKOUT="redist-client/${RELEASE}" - RELEASE_SUFFIX='-lite' -else - usage -fi - -if [ x"$RELEASE" == "xHEAD" ]; then - CHECKOUT="refs/heads/$(git rev-parse --abbrev-ref HEAD)" -fi - -if ! git rev-parse --verify -q "$CHECKOUT" >/dev/null; then - echo " '${RELEASE}' is not a valid release number because there is no git tag named ${CHECKOUT}." - echo " Please specify one of the following releases:" - echo "HEAD (on branch `git rev-parse --abbrev-ref HEAD`)" - git tag -l | grep "^redist" | cut -f2 -d"/" | sort -u - exit 1 -fi - -TARGETDIR=".." - -MANIFEST="$(mktemp)" -TEMP_DIR="$(mktemp -d)" - -trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 - -# create local copy of Git project at temp location -git archive --format=tar "${CHECKOUT}" --prefix="${PROJECT}-${RELEASE}/" | ( cd "$TEMP_DIR"; tar xf - ) -git --no-pager log --after "1972-01-01" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > "${TEMP_DIR}/${PROJECT}-${RELEASE}/ChangeLog" - -echo "Created tarball for $CHECKOUT" - -cd "${TEMP_DIR}/${PROJECT}-${RELEASE}/" - -# Replace symlinks by copies of the linked target files -# Note: We don't have symlinked directories!!! -find . -type "l" | while read link; do - TARGET="$(readlink "${link}")" - pushd "$(dirname "${link}")" >/dev/null - if [ -f "${TARGET}" ]; then - rm -f "$(basename "${link}")" - cp "${TARGET}" "$(basename "${link}")" - fi - popd >/dev/null -done - -mkdir -p "doc/applied-patches" - -# prepare patches for lite and full tarball -if [ "x$MODE" = "xfull" ]; then - cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.(full|full\+lite)\.patch)" | while read file - do - cp -v "debian/patches/$file" "doc/applied-patches/" - echo "${file##*/}" >> "doc/applied-patches/series" - done -else - rm -f "bin/"{nxagent,nxauth} - rm -Rf "nxcompshad"* - rm -Rf "nxcompext"* - rm -Rf "nx-X11"* - rm -Rf "etc"* - rm -Rf "doc/nx-X11_vs_XOrg69_patches"* - rm -f "README.keystrokes" - cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file - do - cp -v "debian/patches/$file" "doc/applied-patches/" - echo "${file##*/}" >> "doc/applied-patches/series" - done -fi - -# apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball -if [ -s "doc/applied-patches/series" ]; then - QUILT_PATCHES="doc/applied-patches" quilt --quiltrc /dev/null push -a -q -else - echo "No patches applied at all. Very old release?" -fi - -# remove folders that we do not want to roll into the tarball -rm -Rf ".pc/" -rm -Rf "debian/" -rm -Rf "nx-libs.spec" - -# very old release did not add any README -for f in $(ls README* 2>/dev/null); do - mv -v "$f" "doc/"; -done - -# remove files, that we do not want in the tarballs (build cruft) -rm -Rf nx*/configure nx*/autom4te.cache* - -cd "$OLDPWD" - -# create target location for tarball -mkdir -p "${TARGETDIR}/_releases_/source/${PROJECT}/" - -# roll the ball... -cd "$TEMP_DIR" -find "${PROJECT}-${RELEASE}" -type f | sort > "$MANIFEST" -cd "$OLDPWD" - -tar c -C "$TEMP_DIR" \ - --owner 0 \ - --group 0 \ - --numeric-owner \ - --no-recursion \ - --files-from "$MANIFEST" \ - --gzip \ - > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz" - -echo "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz is ready" diff --git a/debian/rules b/debian/rules index 275956c9a..e41f97c81 100755 --- a/debian/rules +++ b/debian/rules @@ -2,10 +2,9 @@ NULL = -export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk export LIBDIR = "/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" @@ -19,23 +18,10 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure - . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done - rm -fR .preserve/ dh_clean override_dh_install: - # handle builds for Debian squeeze (non multi-arch) - . ./replace.sh; set -x; if [ -z "$(DEB_BUILD_MULTIARCH)" ]; then \ - find debian/*.install.in | while read file; do \ - cat $$file | sed -e 's#/\*/#/#g' > $$(string_rep $$file .install.in .install); \ - done; \ - else \ - find debian/*.install.in | while read file; do \ - cat $$file > $$(string_rep $$file .install.in .install); \ - done; \ - fi - # remove static libs rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a |