From 704dd3846563e23ac0772e15fcddc4f4805cc16c Mon Sep 17 00:00:00 2001 From: mattias Date: Fri, 19 May 2017 14:22:11 +0000 Subject: [PATCH] debian: lazarus deb now builds without lintian errors git-svn-id: branches/fixes_1_8@55009 - --- .gitattributes | 2 + debian/changelog | 6 +++ images/icons/cheetah.icns | Bin tools/install/create_fpc_deb.sh | 4 +- tools/install/create_lazarus_deb.sh | 12 +++-- tools/install/create_lazarus_slacktgz.sh | 2 +- tools/install/debian_lazarus/changelog | 41 ------------------ tools/install/debian_lazarus/conffiles | 2 + tools/install/debian_lazarus/copyright | 2 + .../install/debian_lazarus/lintian.overrides | 3 ++ 10 files changed, 26 insertions(+), 48 deletions(-) mode change 100755 => 100644 images/icons/cheetah.icns delete mode 100644 tools/install/debian_lazarus/changelog create mode 100644 tools/install/debian_lazarus/conffiles create mode 100644 tools/install/debian_lazarus/lintian.overrides diff --git a/.gitattributes b/.gitattributes index 059c83b533..cd91d63daa 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10005,9 +10005,11 @@ tools/install/debian_fpc/changelog.Debian svneol=native#text/plain tools/install/debian_fpc/control svneol=native#text/plain tools/install/debian_fpc/copyright svneol=native#text/plain tools/install/debian_fpc/postinst svneol=native#text/plain +tools/install/debian_lazarus/conffiles svneol=native#text/plain tools/install/debian_lazarus/control svneol=native#text/plain tools/install/debian_lazarus/controlgtk svneol=native#text/plain tools/install/debian_lazarus/controlqt svneol=native#text/plain +tools/install/debian_lazarus/lintian.overrides svneol=native#text/plain tools/install/do_nothing.sh svneol=native#text/plain tools/install/file_filter.sh svneol=native#text/plain tools/install/freebsd_ports/Makefile svneol=native#text/plain diff --git a/debian/changelog b/debian/changelog index 883e9e9a2f..d0e5393629 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lazarus (1.9.0) unstable; urgency=low + + * Snapshot building. + + -- Mattias Gaertner Sat, 8 Apr 2017 00:01:22 +0200 + lazarus (1.8.0RC1) unstable; urgency=low * Snapshot building. diff --git a/images/icons/cheetah.icns b/images/icons/cheetah.icns old mode 100755 new mode 100644 diff --git a/tools/install/create_fpc_deb.sh b/tools/install/create_fpc_deb.sh index f7b5bd74e6..2ad2a01c8b 100755 --- a/tools/install/create_fpc_deb.sh +++ b/tools/install/create_fpc_deb.sh @@ -276,7 +276,7 @@ echo " -- Mattias Gaertner $Date" >> $File echo "" >> $File cat $ResourceDir/changelog >> $File rm -f $File.gz -gzip --best $File +gzip -n --best $File # create postinst if needed if [ -f "$ResourceDir/postinst" ] @@ -328,7 +328,7 @@ echo "creating changelog.Debian file ..." File=$DebianDocDir/changelog.Debian cp $ResourceDir/changelog.Debian $File rm -f $File.gz -gzip --best $File +gzip -n --best $File # create debian copyright file echo "creating copyright file ..." diff --git a/tools/install/create_lazarus_deb.sh b/tools/install/create_lazarus_deb.sh index 599d48c6df..9745081d9c 100755 --- a/tools/install/create_lazarus_deb.sh +++ b/tools/install/create_lazarus_deb.sh @@ -194,9 +194,13 @@ cp $DebianSrcDir/conffiles $LazBuildDir/DEBIAN/ echo "copying copyright and changelog files" LazBuildDocDir=$LazBuildDir/usr/share/doc/$PkgName mkdir -p $LazBuildDocDir -cp $DebianSrcDir/{copyright,changelog,changelog.Debian} $LazBuildDocDir/ -gzip --best $LazBuildDocDir/changelog -gzip --best $LazBuildDocDir/changelog.Debian +cp $DebianSrcDir/copyright $LazBuildDocDir/ +cat $LazSrcDir/debian/changelog | sed -e "s/^lazarus (/$PkgName (/" > $LazBuildDocDir/changelog +cp $LazBuildDocDir/changelog $LazBuildDocDir/changelog.Debian +gzip -n --best $LazBuildDocDir/changelog +gzip -n --best $LazBuildDocDir/changelog.Debian +mkdir -p $LazBuildDir/usr/share/lintian/overrides +cat $DebianSrcDir/lintian.overrides | sed -e "s/^lazarus:/$PkgName:/" > $LazBuildDir/usr/share/lintian/overrides/$PkgName # icons, links mkdir -p $LazBuildDir/usr/share/pixmaps @@ -213,7 +217,7 @@ ln -s $LazDestDirInstalled/lazbuild $LazBuildDir/usr/bin/lazbuild # docs mkdir -p $LazBuildDir/usr/share/man/man1 for exe in lazbuild lazarus-ide startlazarus lazres svn2revisioninc updatepofiles; do - cat $LazDestDir/install/man/man1/$exe.1 | gzip --best > $LazBuildDir/usr/share/man/man1/$exe.1.gz + cat $LazDestDir/install/man/man1/$exe.1 | gzip -n --best > $LazBuildDir/usr/share/man/man1/$exe.1.gz done # default configs diff --git a/tools/install/create_lazarus_slacktgz.sh b/tools/install/create_lazarus_slacktgz.sh index d012d47616..b15b23f80a 100755 --- a/tools/install/create_lazarus_slacktgz.sh +++ b/tools/install/create_lazarus_slacktgz.sh @@ -69,7 +69,7 @@ cp -arf $SrcDir/* $BuildRoot/usr/lib/lazarus/ ln -sf /usr/lib/lazarus/lazarus usr/bin/lazarus-ide ln -sf /usr/lib/lazarus/startlazarus usr/bin/startlazarus ln -sf /usr/lib/lazarus/lazbuild usr/bin/lazbuild - cat $SrcDir/install/man/man1/lazbuild.1 | gzip --best > $BuildRoot/usr/man/man1/lazbuild.1.gz + cat $SrcDir/install/man/man1/lazbuild.1 | gzip -n --best > $BuildRoot/usr/man/man1/lazbuild.1.gz /sbin/makepkg -l y -c y $SlackTGZ cd diff --git a/tools/install/debian_lazarus/changelog b/tools/install/debian_lazarus/changelog deleted file mode 100644 index ce707880b9..0000000000 --- a/tools/install/debian_lazarus/changelog +++ /dev/null @@ -1,41 +0,0 @@ -lazarus (1.7.0) unstable; urgency=low - - * Snapshot building. - - -- Mattias Gaertner Mon, 30 Nov 2016 20:01:22 +0100 - -lazarus (1.5.0) unstable; urgency=low - - * Snapshot building. - - -- Mattias Gaertner Sun, 11 Jan 2015 12:07:35 +0100 - -lazarus (1.3.0) unstable; urgency=low - - * Snapshot building. - - -- Mattias Gaertner Sun, 3 Nov 2013 10:11:12 +0100 - -lazarus (0.9.24) - -The Lazarus IDE is started with "startlazarus" or directly with "lazarus-ide". -Formerly "lazarus-ide" was "lazarus", but due to a conflict with the tct package -it has been renamed. That's why it is now "lazarus-ide". -Please check your desktop icons. - - -lazarus (0.9.22) - -The Lazarus IDE is started with "startlazarus" or directly with "lazarus". -Some other lazarus packages out there uses "lazarus-ide" to start. -If you are switching from such a package to this, please check your desktop -icons. - - -lazarus (0.9.4) - - * Started package - - -- Mattias Gaertner Sun, 13 Jul 2003 16:35:45 +0200 - - diff --git a/tools/install/debian_lazarus/conffiles b/tools/install/debian_lazarus/conffiles new file mode 100644 index 0000000000..d5df2d4ed4 --- /dev/null +++ b/tools/install/debian_lazarus/conffiles @@ -0,0 +1,2 @@ +/etc/lazarus/environmentoptions.xml +/etc/lazarus/editoroptions.xml diff --git a/tools/install/debian_lazarus/copyright b/tools/install/debian_lazarus/copyright index 082d6d9a19..83ce480e98 100644 --- a/tools/install/debian_lazarus/copyright +++ b/tools/install/debian_lazarus/copyright @@ -45,3 +45,5 @@ directory. They are under the GPL 2, with the following exceptions: transfermacros.pp, wordcompletion.pp, patheditordlg.pas, outputfilter.pas, inputfiledialog.pas, findreplacedialog.pp, findinfilesdlg.pas These files are under the modified LGPL as described in COPYING.modifiedLGPL. + +/usr/share/common-licenses/LGPL-2 diff --git a/tools/install/debian_lazarus/lintian.overrides b/tools/install/debian_lazarus/lintian.overrides new file mode 100644 index 0000000000..4c188dfdd4 --- /dev/null +++ b/tools/install/debian_lazarus/lintian.overrides @@ -0,0 +1,3 @@ +# ignore .o files in /usr/share +lazarus: arch-dependent-file-in-usr-share +lazarus: missing-dependency-on-libc