[med-svn] r5455 - trunk/packages/maqview/trunk/debian
Andreas Tille
tille at alioth.debian.org
Mon Nov 22 07:44:25 UTC 2010
Author: tille
Date: 2010-11-22 07:44:24 +0000 (Mon, 22 Nov 2010)
New Revision: 5455
Added:
trunk/packages/maqview/trunk/debian/docs
trunk/packages/maqview/trunk/debian/manpages
Modified:
trunk/packages/maqview/trunk/debian/changelog
trunk/packages/maqview/trunk/debian/control
trunk/packages/maqview/trunk/debian/copyright
trunk/packages/maqview/trunk/debian/get-orig-source
trunk/packages/maqview/trunk/debian/rules
Log:
We can not simply use Debian packages zlib because maqview uses internal header files of an older version; adjusted copyright
Modified: trunk/packages/maqview/trunk/debian/changelog
===================================================================
--- trunk/packages/maqview/trunk/debian/changelog 2010-11-22 05:51:18 UTC (rev 5454)
+++ trunk/packages/maqview/trunk/debian/changelog 2010-11-22 07:44:24 UTC (rev 5455)
@@ -1,4 +1,4 @@
-maqview (0.2.5-1) unstable; urgency=low
+maqview (0.2.5~zlibcopy-1) unstable; urgency=low
* Initial release
Modified: trunk/packages/maqview/trunk/debian/control
===================================================================
--- trunk/packages/maqview/trunk/debian/control 2010-11-22 05:51:18 UTC (rev 5454)
+++ trunk/packages/maqview/trunk/debian/control 2010-11-22 07:44:24 UTC (rev 5455)
@@ -5,7 +5,7 @@
DM-Upload-Allowed: yes
Uploaders: Andreas Tille <tille at debian.org>,
Charles Plessy <plessy at debian.org>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, automake, freeglut3-dev
+Build-Depends: debhelper (>= 7.1), quilt, autotools-dev, automake, freeglut3-dev
Standards-Version: 3.9.1
Homepage: http://maq.sourceforge.net/maqview.shtml
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/maqview/trunk/?rev=0&sc=0
Modified: trunk/packages/maqview/trunk/debian/copyright
===================================================================
--- trunk/packages/maqview/trunk/debian/copyright 2010-11-22 05:51:18 UTC (rev 5454)
+++ trunk/packages/maqview/trunk/debian/copyright 2010-11-22 07:44:24 UTC (rev 5455)
@@ -24,7 +24,75 @@
On Debian systems, the complete text of the GNU General Public License version
2 can be found in ‘/usr/share/common-licenses/GPL-2’.
+
+Files: adler32.c, crc32.c, infback.c, inffast.[ch], inflate.[ch], inftrees.[ch]
+Copyright: © 1995-2005 Mark Adler
+Files: compress.c, deflate.[ch], gzio.c, trees.c, uncompr.c, zconf.c, zutil.[ch]
+Copyright: © 1995-2005 Jean-loup Gailly
+Files: zlib.h:
+Copyright: © 1995-2005 Jean-loup Gailly and Mark Adler
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+
+Files: kstream.h
+Copyright: © 2008, Attractive Chaos <attractivechaos at aol.co.uk>
+Source: http://attractivechaos.wordpress.com/programs/
+License: The MIT License
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+Files: stdhash.[ch]*
+Copyright: © 2006, Heng Li <lh3lh3 at gmail.com>
+Remark: Copy of code in maq package
+License: LGPL 2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
+
Files: debian/*
-Copyright: 2010, Andreas Tille <tille at debian.org>
+Copyright: © 2010, Andreas Tille <tille at debian.org>
License: Same as MaqView itelf
(see above)
Added: trunk/packages/maqview/trunk/debian/docs
===================================================================
--- trunk/packages/maqview/trunk/debian/docs (rev 0)
+++ trunk/packages/maqview/trunk/debian/docs 2010-11-22 07:44:24 UTC (rev 5455)
@@ -0,0 +1,2 @@
+NEWS
+README
Modified: trunk/packages/maqview/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/maqview/trunk/debian/get-orig-source 2010-11-22 05:51:18 UTC (rev 5454)
+++ trunk/packages/maqview/trunk/debian/get-orig-source 2010-11-22 07:44:24 UTC (rev 5455)
@@ -1,6 +1,8 @@
#!/bin/sh
# script to download and repack source package of maqview
-# this is needed to remove a copy of zlib
+# It was intended to remove a copy of zlib which is not
+# a simple straightforeward because of use of internal features
+# Thus this script simply removes the .svn dir for the moment
PKG=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
VERSION=`uscan --verbose --force-download | \
@@ -16,13 +18,15 @@
tar -xzf ${UTAR}
cd $PKG
-# remove all files belonging to zlib
-rm -rf zutil.[ch] zlib.h zconf.h uncompr.c trees.[ch] inftrees.[ch] inflate.[ch] inffixed.h inffast.[ch] infback.c gzio.c deflate.[ch] crc32.[ch] compress.c adler32.c
+# It is not possible to simply remove the zlib code because it was used
+# the wrong way using internal implementation features which are changed
+# in current zlib in Debian
+# rm -rf zutil.[ch] zlib.h zconf.h uncompr.c trees.[ch] inftrees.[ch] inflate.[ch] inffixed.h inffast.[ch] infback.c gzio.c deflate.[ch] crc32.[ch] compress.c adler32.c
# remove useless SVN dir
rm -rf .svn
cd ..
-mv ${PKG} ${PKG}-${VERSION}~nozlibcopy
+mv ${PKG} ${PKG}-${VERSION}~zlibcopy
-GZIP=-9 tar -czf "$PKG"_"$VERSION~nozlibcopy".orig.tar.gz "${PKG}-${VERSION}~nozlibcopy"
-rm -rf "${PKG}-${VERSION}~nozlibcopy"
+GZIP="--best --no-name" tar -czf "$PKG"_"$VERSION~zlibcopy".orig.tar.gz "${PKG}-${VERSION}~zlibcopy"
+rm -rf "${PKG}-${VERSION}~zlibcopy"
Added: trunk/packages/maqview/trunk/debian/manpages
===================================================================
--- trunk/packages/maqview/trunk/debian/manpages (rev 0)
+++ trunk/packages/maqview/trunk/debian/manpages 2010-11-22 07:44:24 UTC (rev 5455)
@@ -0,0 +1 @@
+*.1
Modified: trunk/packages/maqview/trunk/debian/rules
===================================================================
--- trunk/packages/maqview/trunk/debian/rules 2010-11-22 05:51:18 UTC (rev 5454)
+++ trunk/packages/maqview/trunk/debian/rules 2010-11-22 07:44:24 UTC (rev 5455)
@@ -4,17 +4,18 @@
# GPL
%:
- dh $@ # --with quilt
+ dh $@ #--with quilt
override_dh_auto_configure:
./autogen.sh
dh_auto_configure
+ make -f Makefile.generic maqview.1
override_dh_auto_clean:
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_auto_clean
- rm -f maqindex maqindex_socks maqview zrio
- rm -f config.h config.log config.status Makefile stamp-h1
rm -f aclocal.m4 config.guess config.h.in config.sub configure depcomp install-sh Makefile.in missing
+ rm -f *.1
get-orig-source:
. debian/get-orig-source
More information about the debian-med-commit
mailing list