Bug#224255: patch
tag 355500 patch
thanks
A patch fixing most of these bugs is attached; there seems to be a new
upstream release from 2005 which I'm working on, which also fixes the
grave "crashes no matter what bug #152128. I'd like to include some
derivation of their obfuscated source, but not sure how best to
integrate any changes they've made with the old, unobfuscated files.
Their obfuscation can be nearly defeated with the following:
perl -p0 -e 's,/\*.*?\*/,,gs' step1.c |indent |sed -e 's/;;$/;/'
It would also be nice to
sed -e s/obfuscated_static_function_names/useful_names
and to put back the removed comments.
Justin
--- demo/Makefile 2006-03-05 23:11:08.000000000 -0500
+++ demo-Makefile 2006-03-05 23:11:29.000000000 -0500
@@ -175,13 +175,8 @@
# We do not install everything but only the useful tools
#
install: $(INSTALLBINARIES)
- - $(INSTALLDIR) $(BINDIR)
- for i in $(INSTALLBINARIES) ;\
- do \
- m=`echo $(INSTALL) | $(SED) -e "s/dummy/$$i/g"`; \
- $$m; \
- done
-
+ install -d $(BINDIR)
+ install -m 0755 $(INSTALLBINARIES) $(BINPATH)
makefiles: Makefile
--- man/Makefile 2003-02-20 16:06:27.000000000 -0500
+++ man-Makefile 2006-03-05 23:18:49.000000000 -0500
@@ -103,18 +103,8 @@
# We do not install everything but only the useful tools
#
install: $(MANFILES)
- -$(INSTALLDIR) $(MANDIR)
- $(CP) vcg.man xvcg.man
- for i in $(INSTALLMANPAGES) xvcg;\
- do \
- case "$(MANEXT)" in \
- man) ;; \
- *) $(RM) -f $$i.$(MANEXT); $(CP) $$i.man $$i.$(MANEXT) ;;\
- esac; \
- m=`echo $(INSTALLMAN) | $(SED) -e "s/dummy/$$i.$(MANEXT)/g"`; \
- $$m; \
- done
-
+ install -d $(MANDIR)
+ install -m 644 xvcg.$(MANEXT) $(MANDIR)
makefiles: Makefile
--- src/Makefile 2003-02-20 16:06:28.000000000 -0500
+++ src-Makefile 2006-03-05 23:13:04.000000000 -0500
@@ -262,12 +262,8 @@
# We do not install everything but only the useful tools
#
install: $(INSTALLBINARIES)
- -$(INSTALLDIR) $(BINDIR)
- for i in $(INSTALLBINARIES) ;\
- do \
- m=`echo $(INSTALL) | $(SED) -e "s/dummy/$$i/g"`; \
- $$m; \
- done
+ install -d $(BINDIR)
+ install -m 0755 $(INSTALLBINARIES) $(BINDIR)
makefiles: Makefile
--- debian/rules 2006-03-05 15:43:39.000000000 -0500
+++ ./rules.2 2006-03-05 22:53:45.000000000 -0500
@@ -27,7 +27,7 @@
binary-arch: build
dh_clean
- dh_installdirs usr/bin usr/sbin
+ dh_installdirs usr/bin
$(MAKE) install \
SED=/bin/sed \
BINDIR=`pwd`/debian/$(package)/usr/bin \
--- debian/control 2006-03-05 22:23:14.000000000 -0500
+++ ./control.2 2006-03-05 22:56:38.000000000 -0500
@@ -17,4 +17,5 @@
language of the VCG tool is nearly compatible to GRL, the
language of the edge tool, but contains many extensions. The
VCG tool allows folding of dynamically or statically specified
- regions of the graph. It uses colors and runs on X11.
+ regions of the graph. xvcg uses colors and runs on X11.
+ Homepage: http://www.cs.uni-sb.de/RW/users/sander/html/gsvcg1.html
--- debian/changelog 2006-03-05 22:42:30.000000000 -0500
+++ ./changelog.2 2006-03-05 23:23:09.000000000 -0500
@@ -1,3 +1,24 @@
+vcg (1.30debian-3.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * [./debian/copyright]
+ Include the copyright holders, license text, and comment on the
+ previously-obfuscated sourcecode (thanks to Ahmed Baizid
+ <ahmed@baizid.org> for the suggested text.
+ Closes: 224255, 355500
+ * [./debian/control]
+ Steal the homepage from the copyright file.
+ Mention xvcg in description.
+ Closes: 202537
+ * [./debian/rules]
+ Stop installing unused /usr/sbin.
+ Closes: 355462
+ * [demo/Makefile man/Makefile src/Makefile]
+ Don't call install in a loop; incidentally stop building on failures
+ Closes: 270899
+
+ -- Justin Pryzby <justinpryzby@users.sourceforge.net> Sun, 5 Mar 2006 23:21:11 -0500
+
vcg (1.30debian-3) unstable; urgency=low
* QA upload. Switch to debhelper and do some cleanup.
--- debian/copyright 2006-03-05 15:43:39.000000000 -0500
+++ ./copyright.2 2006-03-05 22:48:19.000000000 -0500
@@ -2,9 +2,52 @@
Mon, 3 Apr 2000 17:04:18 +0100.
It was downloaded from ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/vcg.tgz
-Website: http://www.cs.uni-sb.de/RW/users/sander/html/gsvcg1.html
-Copyright:
+ Copyright (C) 1993--1995 by Iris Lemke, Georg Sander, and
+ the Compare Consortium
-vcg is released under the GNU General Public License (GPL) version 2.
-On Debian systems, the GPL can be found at /usr/share/common-licenses/GPL
+ This work is supported by the ESPRIT project 5399 Compare.
+ We thank the Compare Consortium for the permission to distribute
+ this software and documentation freely. You can redistribute
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ The members of the Compare Consortium are ACE Associated Computer
+ Experts bv, GMD Forschungsstelle an der Universitaet Karlsruhe,
+ Harlequin Limited, INRIA, STERIA, Stichting Mathematisch Centrum (CWI),
+ and Universitaet des Saarlandes.
+
+ The Compare Consortium will neither assume responsibility for any
+ damages caused by the use of its products, nor accept warranty or
+ update claims. This product 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 General Public License for more details.
+
+A SPECIAL REMARK ABOUT LICENSE CONDITIONS
+ We would certainly like to continue to distribute the documented
+ sources freely, but currently we have the situation that we cannot
+ continue in this programmer-friendly way as before.
+
+ Thus, we have uglified some of the files in the distribution: these
+ are the graph layout modules. These files are not anymore readable
+ for human being, but they are readeable for the compiler. Thus you
+ can compile the sources as before, but you cannot find out anymore
+ how the details of the layout algorithms work.
+
+ This is a compromise. I think this is a better solution than to
+ distribute binaries, because the users still can adapt the tool to
+ their computer system. (In the layout modules, normally no adaption
+ is necessary). Further, we did not spent too much time with
+ uglification, thus the result should not be too ugly ;-)
+
+For the Debian package:
+
+ VCG is distributed under GPL but some upstream source files are
+ obfuscated. The following were replaced with older, un-uglified
+ versions:
+
+ src/step1.c, src/step2.c, src/step3.c, src/step4.c and src/tree.c
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
Reply to: