diff options
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rwxr-xr-x | debian/rules | 7 |
2 files changed, 13 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 0c19fd24a..55c7287fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,10 +8,6 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * Add patch 604_nx-X11_recent-freetype-API.full.patch. Fix FTBFS against recent (>= 2.5.0) libfreetype6 API. - * debian/source/format: - + Switch to format 1.0. - * debian/control: - + Add libfreetype6-dev to Build-Depends: field. * Refresh patch: 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. * Improve patch: 601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch. @@ -20,6 +16,12 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low libraries. * Rename patch: 302_nxagent_configurable-keystrokes.full.patch to 320_nxagent_configurable-keystrokes.full.patch. + * debian/source/format: + + Switch to format 1.0. + * debian/control: + + Add libfreetype6-dev to Build-Depends: field. + * debian/rules: + + Remove bundled libraries from source tree before building the package. * nx-libs.spec: + Ship nx-libs.spec (RPM package definitions) in upstream project. (Thanks to the Fedora package maintainers). File differs from the Fedora file diff --git a/debian/rules b/debian/rules index d8315b4a8..c6bc4b15b 100755 --- a/debian/rules +++ b/debian/rules @@ -27,6 +27,7 @@ override_dh_auto_install: PREFIX=/usr dh_auto_install -Smakefile override_dh_auto_build: + # create copies of upstream changelogs so that names apply to Debian policy... cp -a nx-X11/CHANGELOG nx-X11/changelog cp -a nxcomp/CHANGELOG nxcomp/changelog @@ -42,6 +43,12 @@ override_dh_auto_build: ln -s ../debian/keystrokes.cfg etc/keystrokes.cfg ln -s debian/rgb ln -s debian/VERSION.x2goagent + + # remove bundled libraries (keep this in sync with roll-tarball.sh) + rm -Rf nx-X11/extras/{drm,expat,fontconfig,freetype2,fonts,ogl-sample,regex,rman,ttf2pt1,x86emu,zlib} + rm -Rf nx-X11/lib/{expat,fontconfig,fontenc,font/FreeType,font/include/fontenc.h,freetype2,regex,zlib} + rm -Rf nx-X11/lib/{FS,ICE,SM,Xaw,Xft,Xt,Xmu,Xmuu} + LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt --parallel override_dh_strip: |