aboutsummaryrefslogtreecommitdiff
path: root/nx-libs.spec
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-14 15:23:59 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-14 16:14:30 +0100
commit1a824cfb54fa4a60a50b75923e4b32a2458d9404 (patch)
tree200b40a2ea99913d308120b0d0131091e4d792e4 /nx-libs.spec
parentce531230f148a8c586a6e29c340e2db03d7bd3bb (diff)
downloadnx-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 'nx-libs.spec')
-rw-r--r--nx-libs.spec6
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-libs.spec b/nx-libs.spec
index c037a2662..897c1d29d 100644
--- 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.