[Pkg-wmaker-commits] [wmcube] 03/67: Imported Debian patch 0.98-6
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Tue Aug 25 03:22:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmcube.
commit 3c2f14c656176106ffa126ea855927fcddb86050
Author: Filip Van Raemdonck <mechanix at debian.org>
Date: Thu Dec 26 22:13:26 2002 +0100
Imported Debian patch 0.98-6
---
3dObjects/X-lines.wmc | 65 +++++++++++++++++++++++++++++++++++++++++++++++
3dObjects/X-planes.wmc | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++
debian/changelog | 8 ++++++
debian/control | 2 +-
debian/copyright | 2 +-
debian/rules | 28 ++++++++++++++++-----
wmcube/Makefile | 4 +--
7 files changed, 167 insertions(+), 10 deletions(-)
diff --git a/3dObjects/X-lines.wmc b/3dObjects/X-lines.wmc
new file mode 100644
index 0000000..8c1600f
--- /dev/null
+++ b/3dObjects/X-lines.wmc
@@ -0,0 +1,65 @@
+WMCUBE_COORDINATES
+1 30 -30 -10
+2 10 -30 -10
+3 -3 -10 -10
+4 -20 -30 -10
+5 -30 -30 -10
+6 -8 -3 -10
+7 -30 30 -10
+8 -10 30 -10
+9 3 10 -10
+10 20 30 -10
+11 30 30 -10
+12 8 3 -10
+13 30 -30 10
+14 10 -30 10
+15 -3 -10 10
+16 -20 -30 10
+17 -30 -30 10
+18 -8 -3 10
+19 -30 30 10
+20 -10 30 10
+21 3 10 10
+22 20 30 10
+23 30 30 10
+24 8 3 10
+
+WMCUBE_LINES
+1 2
+2 3
+3 4
+4 5
+5 6
+6 7
+7 8
+8 9
+9 10
+10 11
+11 12
+12 1
+
+13 14
+14 15
+15 16
+16 17
+17 18
+18 19
+19 20
+20 21
+21 22
+22 23
+23 24
+24 13
+
+1 13
+2 14
+3 15
+4 16
+5 17
+6 18
+7 19
+8 20
+9 21
+10 22
+11 23
+12 24
diff --git a/3dObjects/X-planes.wmc b/3dObjects/X-planes.wmc
new file mode 100644
index 0000000..a4d6769
--- /dev/null
+++ b/3dObjects/X-planes.wmc
@@ -0,0 +1,68 @@
+WMCUBE_COORDINATES
+1 30 -30 -10
+2 10 -30 -10
+3 -3 -10 -10
+4 -20 -30 -10
+5 -30 -30 -10
+6 -8 -3 -10
+7 -30 30 -10
+8 -10 30 -10
+9 3 10 -10
+10 20 30 -10
+11 30 30 -10
+12 8 3 -10
+13 30 -30 10
+14 10 -30 10
+15 -3 -10 10
+16 -20 -30 10
+17 -30 -30 10
+18 -8 -3 10
+19 -30 30 10
+20 -10 30 10
+21 3 10 10
+22 20 30 10
+23 30 30 10
+24 8 3 10
+
+WMCUBE_PLANES
+1 2 7
+7 8 1
+4 5 10
+10 11 4
+
+13 20 19
+19 14 13
+23 22 17
+17 16 23
+
+1 12 24
+24 13 1
+12 11 23
+23 24 12
+
+3 2 14
+14 15 3
+4 3 15
+15 16 4
+
+7 6 18
+18 19 7
+6 5 17
+17 18 6
+
+8 20 21
+21 9 8
+9 21 22
+22 10 9
+
+1 13 14
+14 2 1
+
+4 16 17
+17 5 4
+
+10 22 23
+23 11 10
+
+7 19 20
+20 8 7
diff --git a/debian/changelog b/debian/changelog
index 5025b73..65b9a19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wmcube (0.98-6) unstable; urgency=low
+
+ * Add two new objects (X-lines & X-planes). Thanks Mathias Czapla.
+ * Update Standards-Version:; support noopt and nostrip build options.
+ * Update upstream URL in debian/copyright.
+
+ -- Filip Van Raemdonck <mechanix at debian.org> Thu, 26 Dec 2002 22:13:26 +0100
+
wmcube (0.98-5) unstable; urgency=high
* Fix smp support which broke due to the source fixes in previous upload.
diff --git a/debian/control b/debian/control
index b28edd9..241b361 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Filip Van Raemdonck <mechanix at debian.org>
Build-Depends: debhelper, xlibs-dev
-Standards-Version: 3.5.6.0
+Standards-Version: 3.5.8.0
Package: wmcube
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 98bf86e..b2bf670 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
This package was debianized by Edward C. Lang
<edlang at debian.org> on Fri, 14 Apr 2000 17:40:59 +1000
-It was downloaded from http://boombox.campus.luth.se/projects/
+It was downloaded from http://kling.mine.nu/kling/.
wmCube is licensed through the GNU General Public License.
diff --git a/debian/rules b/debian/rules
index 78c5ab3..28683f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,13 +7,29 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+CFLAGS = -Wall -g
+INSTALL = install
+INSTALL_FILE = $(INSTALL) -p -o root -g root -m 0644
+INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 0755
+INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 0755
+INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 0755
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+INSTALL_PROGRAM += -s
+endif
+
debian_patches = datapath secfix
build: patched-stamp build-stamp
build-stamp:
dh_testdir
# perl -pi -e 's/-DX_LOCALE//g;' Makefile
- $(MAKE) -C wmcube
+ $(MAKE) -C wmcube CFLAGS="$(CFLAGS)"
touch build-stamp
clean: reverse-patches
@@ -35,12 +51,12 @@ binary-arch: build
dh_testroot
dh_clean -k
dh_installdirs
- install -s -m 0755 wmcube/wmcube `pwd`/debian/tmp/usr/bin/wmcube
- install -m 0644 3dObjects/*.wmc `pwd`/debian/tmp/usr/share/wmcube
- install -m 0644 debian/wmcube.1 debian/tmp/usr/share/man/man1
+ $(INSTALL_PROGRAM) wmcube/wmcube $(CURDIR)/debian/tmp/usr/bin/wmcube
+ $(INSTALL_FILE) 3dObjects/*.wmc $(CURDIR)/debian/tmp/usr/share/wmcube
+ $(INSTALL_FILE) debian/wmcube.1 debian/tmp/usr/share/man/man1
dh_installdocs
- install -m 0644 3dObjects/README `pwd`/debian/tmp/usr/share/doc/wmcube/README.3dObjects
- install -m 0644 3dObjects/CONTRIBUTE `pwd`/debian/tmp/usr/share/doc/wmcube
+ $(INSTALL_FILE) 3dObjects/README $(CURDIR)/debian/tmp/usr/share/doc/wmcube/README.3dObjects
+ $(INSTALL_FILE) 3dObjects/CONTRIBUTE $(CURDIR)/debian/tmp/usr/share/doc/wmcube
# ( cd XPM ; tar cf - . ) | \
# ( cd debian/tmp/usr/doc/wmcdplay/examples ; tar xvf - )
# mv debian/tmp/usr/doc/wmcdplay/examples/*.art \
diff --git a/wmcube/Makefile b/wmcube/Makefile
index 1410b29..2e5e2e3 100644
--- a/wmcube/Makefile
+++ b/wmcube/Makefile
@@ -9,7 +9,7 @@ INCDIR = -I/usr/X11R6/share/include
OSLIBS =
LIBS = -lXpm -lXext -lX11 -lm $(OSLIBS)
-CFLAGS = -Wall -O2 $(OS)
+CFLAGS = -Wall -O2
OBJS = wmcube.o \
../wmgeneral/wmgeneral.o \
@@ -17,7 +17,7 @@ OBJS = wmcube.o \
../wmgeneral/list.o
.c.o:
- $(CC) $(CFLAGS) $(INCDIR) -c $< -o $*.o
+ $(CC) $(CFLAGS) $(OS) $(INCDIR) -c $< -o $*.o
wmcube: $(OBJS)
$(CC) -o wmcube $^ -lXext $(LIBDIR) $(LIBS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmcube.git
More information about the Pkg-wmaker-commits
mailing list