diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-14 15:23:59 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-14 16:14:30 +0100 |
| commit | 1a824cfb54fa4a60a50b75923e4b32a2458d9404 (patch) | |
| tree | 200b40a2ea99913d308120b0d0131091e4d792e4 /debian | |
| parent | ce531230f148a8c586a6e29c340e2db03d7bd3bb (diff) | |
| download | nx-libs-1a824cfb54fa4a60a50b75923e4b32a2458d9404.tar.gz nx-libs-1a824cfb54fa4a60a50b75923e4b32a2458d9404.tar.bz2 nx-libs-1a824cfb54fa4a60a50b75923e4b32a2458d9404.zip | |
Prepare for maintaing upstream changes in upstream ChangeLog.
This makes it obsolete to add changes to debian/changelog. We document
our changes in Git (3.6.x branch and other related branches). On
release, we generate an upstream ChangeLog from Git history.
Only on the 3.5.0.x, we continue maintaining our changes in
debian/changelog (to be compliant with current nx-libs release workflow
in X2Go).
The following packaging scripts needed adaptations to this change:
debian/roll-tarballs.sh
debian/rules
nx-libs.spec
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/roll-tarballs.sh | 2 | ||||
| -rwxr-xr-x | debian/rules | 19 |
2 files changed, 0 insertions, 21 deletions
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 03ab6778b..37c897a66 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -130,8 +130,6 @@ else test -f etc/keystrokes.cfg || test -f debian/keystrokes.cfg && cp -v debian/keystrokes.cfg etc/keystrokes.cfg fi -mv -v debian/changelog doc/changelog - # remove folders that we do not want to roll into the tarball rm -Rf ".pc/" rm -Rf "debian/" diff --git a/debian/rules b/debian/rules index e0b4166f5..b17828231 100755 --- a/debian/rules +++ b/debian/rules @@ -19,21 +19,12 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure - rm -f nx*/changelog - rm -f doc/changelog - rm -f nx-X11/programs/Xserver/hw/nxagent/changelog - rm -f nx-X11/programs/nxauth/changelog . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done rm -fR bin etc/rgb etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard rm -f debian/libnx-xinerama1.postinst rm -fR .preserve/ dh_clean -override_dh_installchangelog: - - ### the doc/changelog file is the actual NX (redistributed) ChangeLog - dh_installchangelog doc/changelog - override_dh_install: # handle builds for Debian squeeze (non multi-arch) @@ -87,22 +78,12 @@ override_dh_auto_install: 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 - cp -a nxcompext/CHANGELOG nxcompext/changelog - cp -a nxcompshad/CHANGELOG nxcompshad/changelog - cp -a nx-X11/programs/Xserver/hw/nxagent/CHANGELOG nx-X11/programs/Xserver/hw/nxagent/changelog - cp -a nx-X11/programs/nxauth/CHANGELOG nx-X11/programs/nxauth/changelog - cp -a nxproxy/CHANGELOG nxproxy/changelog ln -s debian/wrappers bin mkdir -p etc/ ln -s ../debian/keystrokes.cfg etc/keystrokes.cfg ln -s ../debian/rgb etc/rgb ln -s ../debian/nxagent.keyboard etc/nxagent.keyboard ln -s ../debian/x2goagent.keyboard etc/x2goagent.keyboard - mkdir -p doc/ - ln -s ../debian/changelog doc/changelog # let's prep the libnx-xinerama1.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable sed debian/libnx-xinerama1.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-xinerama1.postinst |