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

Prepare for maintaing upstream changes in upstream ChangeLog.
1a824cfb · Mike Gabriel · ce531230 · 1a824cfb · 1a824cfb · 1a824cfb
Commit 1a824cfb authored Feb 14, 2015 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 24 deletions

ChangeLog ChangeLog +2 -0

roll-tarballs.sh debian/roll-tarballs.sh +0 -2

rules debian/rules +0 -19

nx-libs.spec nx-libs.spec +3 -3

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+Empty file that gets populated with first release of the 3.6.x NX series.
\ No newline at end of file
--- 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/"

--- 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

--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -954,7 +954,7 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama

 %files -n libXcompshad3
 %defattr(-,root,root)
-%doc nxcompshad/{CHANGELOG,COPYING,LICENSE}
+%doc nxcompshad/{COPYING,LICENSE}
 %_libdir/libXcompshad.so.3*

 %files devel
@@ -1116,5 +1116,5 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama


 %changelog
-* Thu Jan 29 2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 3.5.0.29
- See debian/changelog for details.
+* Thu Jan 29 2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 3.5.99.0
+- See upstream ChangeLog and debian/changelog for details.