[Pkg-wmaker-commits] [wmcube] 06/67: Imported Debian patch 0.98-8
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 f25eb83894f305c07adb56c477ece53bf2d1bac6
Author: Sandro Tosi <matrixhasu at gmail.com>
Date: Sun Oct 7 16:08:46 2007 +0200
Imported Debian patch 0.98-8
---
{3dObjects => debian/3dObjects}/X-lines.wmc | 0
{3dObjects => debian/3dObjects}/X-planes.wmc | 0
debian/changelog | 40 +++++
debian/control | 12 +-
debian/copyright | 89 +++++++++--
debian/docs | 2 -
debian/menu | 2 +-
debian/patches/00list | 3 +
debian/patches/10_datapath_old.dpatch | 19 +++
.../{secfix.dpatch => 20_secfix_old.dpatch} | 72 +++------
debian/patches/30_restore_pristine_code.dpatch | 167 +++++++++++++++++++++
debian/patches/datapath.dpatch | 32 ----
debian/patches/smpfix.dpatch | 47 ------
debian/postinst.debhelper | 5 -
debian/postrm.debhelper | 3 -
debian/rules | 93 +++---------
wmcube/Makefile | 4 +-
17 files changed, 356 insertions(+), 234 deletions(-)
diff --git a/3dObjects/X-lines.wmc b/debian/3dObjects/X-lines.wmc
similarity index 100%
rename from 3dObjects/X-lines.wmc
rename to debian/3dObjects/X-lines.wmc
diff --git a/3dObjects/X-planes.wmc b/debian/3dObjects/X-planes.wmc
similarity index 100%
rename from 3dObjects/X-planes.wmc
rename to debian/3dObjects/X-planes.wmc
diff --git a/debian/changelog b/debian/changelog
index eedce20..d1311db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+wmcube (0.98-8) unstable; urgency=low
+
+ * Adopting package (Closes: #414531)
+ * debian/control
+ - added myself as new maintainer
+ - little reformat of short and long description
+ - added dependency against dpatch
+ * debian/copyright
+ - set myself as new maintainer
+ - added copyright notes for wmgeneral files
+ - reformat of license note
+ * debian/docs
+ - removed since integrated into debian/rules
+ * debian/rules
+ - changed dh_installdocs call adding filenames as parameters
+ - removed some commented line here and there
+ - manpage installation done using dh_installman
+ - added install target
+ - 3dObjects/{README,CONTRIBUTE} moved from install to dh_installdocs
+ - removed "source diff" targe" target
+ - removed all those custom patch application code since we are now using
+ dpatch
+ - patches to apply is selected using debian/patches/00list and not using a
+ variable here
+ - fixing installation of 3dObjects files
+ - fixed a lintian warning on "make clean" call
+ * debian/menu
+ - changes section to Applications
+ * debian/post{inst,rm}.debhelper
+ - removed since menu updatation is done automatically now
+ * debian/patches/{10_datapath_old,20_secfix_old}.dpatch
+ - replases old dpatch-style patches
+ * debian/patches/smpfix.dpatch
+ - removed since already present in 20_secfix_old.dpatch
+ * debian/3dObjects/X-{lines,planes}.wmc
+ - moved from top level directory into debian since they are not present
+ into upstream release
+
+ -- Sandro Tosi <matrixhasu at gmail.com> Sun, 07 Oct 2007 16:08:46 +0200
+
wmcube (0.98-7) unstable; urgency=low
* QA upload.
diff --git a/debian/control b/debian/control
index 044b194..89957a7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
Source: wmcube
Section: x11
Priority: optional
-Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: debhelper (>= 5), libx11-dev, libxext-dev, libxpm-dev
+Maintainer: Sandro Tosi <matrixhasu at gmail.com>
+Build-Depends: debhelper (>= 5), libx11-dev, libxext-dev, libxpm-dev, dpatch
Standards-Version: 3.7.2
Package: wmcube
@@ -11,10 +11,10 @@ Section: x11
Priority: optional
Depends: ${shlibs:Depends}
Suggests: wmaker
-Description: Spinning 3D object that shows the current CPU load
+Description: spinning 3D object that shows the current CPU load
wmcube is a dockapp that displays a realtime rotating 3D object which
- indicates current CPU load. The higher the load, the faster the object
- spins. On SMP machines one instance can be run for each processor.
+ indicates current CPU load. The higher the load, the faster the
+ object spins. On SMP machines one instance can be run for each
+ processor.
.
Originally wmcube could spin only a cube, hence the name.
-
diff --git a/debian/copyright b/debian/copyright
index da573eb..1b401af 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,26 +1,97 @@
This package was debianized by Edward C. Lang
<edlang at debian.org> on Fri, 14 Apr 2000 17:40:59 +1000
+Is is now maintained by Sandro Tosi <matrixhasu at gmail.com>
+
It was downloaded from http://kling.mine.nu/kling/.
Upstream Author: Robert Kling <robkli-8 at student.luth.se>
-Copyright: Copyright (C) 2000/01 by Robert Kling
+Copyright: 2000,2001 by Robert Kling
License:
-This package is free software; you can redistribute it and/or modify
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+wmCube is licensed through the GNU General Public License, see
+/usr/share/common-licenses/GPL for more info.
+
+The following files have different copyright notes:
+
+wmgeneral/list.{c,h}:
+
+/* Generic single linked list to keep various information
+ Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+
+
+Author: Kresten Krab Thorup
+
+Many modifications by Alfredo K. Kojima
+
+
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 dated June, 1991.
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
-This package is distributed in the hope that it will be useful,
+GNU CC 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.
You should have received a copy of the GNU General Public License
-along with this package; if not, write to the Free Software Foundation,
-Inc., 51 Franklin St, Fifth Floor, Boston,
-MA 02110-1301, USA.
+along with GNU CC; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+MA 02110-1301, USA. */
+
+/* As a special exception, if you link this library with files compiled with
+ GCC to produce an executable, this does not cause the resulting executable
+ to be covered by the GNU General Public License. This exception does not
+ however invalidate any other reasons why the executable file might be
+ covered by the GNU General Public License. */
+
+
+wmgeneral/misc.c:
+
+/* dock.c- built-in Dock module for WindowMaker
+ *
+ * WindowMaker window manager
+ *
+ * Copyright (c) 1997 Alfredo K. Kojima
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+
+wmgeneral/wmgeneral.c:
+
+Author: Martijn Pieterse (pieterse at xs4all.nl)
-wmCube is licensed through the GNU General Public License, see
-/usr/share/common-licenses/GPL for more info.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index ba8894c..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-
diff --git a/debian/menu b/debian/menu
index b99f81b..51bc497 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,3 +1,3 @@
?package(wmcube):needs="x11" \
- section="Apps/System" title="wmcube"\
+ section="Applications/System" title="wmcube"\
command="/usr/bin/wmcube"
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..701d82d
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1,3 @@
+10_datapath_old
+20_secfix_old
+30_restore_pristine_code
diff --git a/debian/patches/10_datapath_old.dpatch b/debian/patches/10_datapath_old.dpatch
new file mode 100644
index 0000000..a7c2422
--- /dev/null
+++ b/debian/patches/10_datapath_old.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_datapath_old.dpatch by Sandro Tosi <matrixhasu at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad wmcube~/wmcube/wmcube.c wmcube/wmcube/wmcube.c
+--- wmcube~/wmcube/wmcube.c 2000-10-23 22:11:47.000000000 +0200
++++ wmcube/wmcube/wmcube.c 2007-10-07 12:51:20.000000000 +0200
+@@ -138,7 +138,7 @@
+
+ char *rotdiv = {"25"};
+ char *rotstep = {"1"};
+- char *obj_filename = {""};
++ char *obj_filename = {"/usr/share/wmcube/"};
+ int rot;
+ int cube_color = 1;
+ int c = 0;
diff --git a/debian/patches/secfix.dpatch b/debian/patches/20_secfix_old.dpatch
similarity index 56%
rename from debian/patches/secfix.dpatch
rename to debian/patches/20_secfix_old.dpatch
index ef2adc2..0e0f4b4 100644
--- a/debian/patches/secfix.dpatch
+++ b/debian/patches/20_secfix_old.dpatch
@@ -1,25 +1,14 @@
-#! /bin/sh -e
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_secfix_old.dpatch by Sandro Tosi <matrixhasu at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
-# DP: Modified
-
-if [ $# -ne 1 ]; then
- echo >&2 "$0: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f -p0 < $0;;
- -unpatch) patch -f -R -p0 < $0;;
- *)
- echo >&2 "$0: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
---- wmcube/wmcube.c.orig
-+++ wmcube/wmcube.c
-@@ -344,11 +344,11 @@
- void startup_seq()
- {
+ at DPATCH@
+diff -urNad wmcube~/wmcube/wmcube.c wmcube/wmcube/wmcube.c
+--- wmcube~/wmcube/wmcube.c 2007-10-07 12:52:24.000000000 +0200
++++ wmcube/wmcube/wmcube.c 2007-10-07 12:55:47.000000000 +0200
+@@ -346,7 +346,7 @@
char *tmp = malloc(32);
int oldzoff = 3600;
@@ -28,11 +17,7 @@ exit 0
RedrawWindow();
BlitString("WMCUBE",13,22);
- BlitString(tmp,15,31);
- RedrawWindow();
-@@ -562,11 +562,11 @@
- if (num > 999)
- {
+@@ -564,7 +564,7 @@
newx -= CHAR_WIDTH;
}
@@ -41,11 +26,7 @@ exit 0
BlitString(buf, newx, y);
}
-
- void line(int x1, int y1, int x2, int y2, int c)
-@@ -911,19 +911,19 @@
- if ((fp = fopen(filename,"rt")) == NULL) {
- printf("\nERROR: wmCube object-file not found (%s).\n\n",filename);
+@@ -913,7 +913,7 @@
exit(0);
}
@@ -54,7 +35,7 @@ exit 0
if (strcmp(tmp,"WMCUBE_COORDINATES") != 0) {
printf("\nError in objectfile: it must start with WMCUBE_COORDINATES\n\n");
- fclose(fp);
+@@ -921,7 +921,7 @@
exit(0);
}
@@ -63,11 +44,7 @@ exit 0
counter = atoi(tmp);
while ((strcmp(tmp,"WMCUBE_LINES") != 0) && (strcmp(tmp,"WMCUBE_PLANES") != 0)) {
-
- matrix = (float **)realloc(matrix,(i+1)*sizeof(float *)); mem_alloc_error(matrix);
-@@ -936,11 +936,11 @@
- printf("\nError in objectfile (WMCUBE_COORDINATES section):\n"
- "the coordinates must be listed in order 1..n\n\n");
+@@ -938,7 +938,7 @@
fclose(fp);
exit(0);
}
@@ -76,11 +53,7 @@ exit 0
if (feof(fp)) {
printf("\nError in objectfile: you must have a section WMCUBE_LINES or WMCUBE_PLANES\n\n");
- fclose(fp);
- exit(0);
-@@ -1038,29 +1038,32 @@
- FILE *fp;
- int i;
+@@ -1040,18 +1040,20 @@
char cpuid[6];
char check_cpu[6];
@@ -96,16 +69,15 @@ exit 0
+ if (which_cpu == -1) {
+ fclose (fp);
return 0;
--
+ }
-+
+
for (i = -2; i < which_cpu; i++) {
- fscanf(fp, "%s", cpuid);
-+ fscanf(fp, "%5s %*d %*d %*d %*d", cpuid);
++ fscanf(fp, "%5s %*d %*d %*d %*d", cpuid);
}
if (strcmp(check_cpu,cpuid) != 0) {
- fprintf(stderr, "ERROR: could not read cpu-load on %s. Are you "
+@@ -1059,6 +1061,7 @@
"sure you have an SMP system?\n",check_cpu);
return -1;
}
@@ -113,11 +85,7 @@ exit 0
return (0);
}
- int calc_cpu_total() {
- int total, used, t=0, i;
-@@ -1073,11 +1073,11 @@
- FILE *fp;
-
+@@ -1072,7 +1075,7 @@
fp = fopen("/proc/stat","rt");
for (i = -2; i < which_cpu; i++) {
@@ -126,5 +94,3 @@ exit 0
}
fclose(fp);
-
- used = cpu + system + use_nice*nice;
diff --git a/debian/patches/30_restore_pristine_code.dpatch b/debian/patches/30_restore_pristine_code.dpatch
new file mode 100644
index 0000000..f61fb68
--- /dev/null
+++ b/debian/patches/30_restore_pristine_code.dpatch
@@ -0,0 +1,167 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_restore_pristine_code.dpatch by Sandro Tosi <matrixhasu at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from wmcube 0.98-7 diff.gz
+
+ at DPATCH@
+
+--- wmcube-0.98.orig/3dObjects/X-lines.wmc
++++ wmcube-0.98/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
+--- wmcube-0.98.orig/3dObjects/X-planes.wmc
++++ wmcube-0.98/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
+--- wmcube-0.98.orig/wmcube/Makefile
++++ wmcube-0.98/wmcube/Makefile
+@@ -9,7 +9,7 @@
+
+ OSLIBS =
+ LIBS = -lXpm -lXext -lX11 -lm $(OSLIBS)
+-CFLAGS = -Wall -O2 $(OS)
++CFLAGS = -Wall -O2
+
+ OBJS = wmcube.o \
+ ../wmgeneral/wmgeneral.o \
+@@ -17,7 +17,7 @@
+ ../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)
diff --git a/debian/patches/datapath.dpatch b/debian/patches/datapath.dpatch
deleted file mode 100644
index 893d38d..0000000
--- a/debian/patches/datapath.dpatch
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh -e
-
-# DP: Modified
-
-if [ $# -ne 1 ]; then
- echo >&2 "$0: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f -p0 < $0;;
- -unpatch) patch -f -R -p0 < $0;;
- *)
- echo >&2 "$0: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
---- wmcube/wmcube.c.orig
-+++ wmcube/wmcube.c
-@@ -136,11 +136,11 @@
- int loop = 0;
- XEvent Event;
-
- char *rotdiv = {"25"};
- char *rotstep = {"1"};
-- char *obj_filename = {""};
-+ char *obj_filename = {"/usr/share/wmcube/"};
- int rot;
- int cube_color = 1;
- int c = 0;
- int invert_speed = 0;
-
diff --git a/debian/patches/smpfix.dpatch b/debian/patches/smpfix.dpatch
deleted file mode 100644
index 0b4843f..0000000
--- a/debian/patches/smpfix.dpatch
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh -e
-
-# DP: Modified
-
-if [ $# -ne 1 ]; then
- echo >&2 "$0: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f -p0 < $0;;
- -unpatch) patch -f -R -p0 < $0;;
- *)
- echo >&2 "$0: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
---- wmcube/wmcube.c.orig-bak
-+++ wmcube/wmcube.c
-@@ -1045,22 +1045,25 @@
- if ((fp = fopen("/proc/stat","rb")) == NULL) {
- perror("/proc/stat required for this system");
- return -1;
- }
-
-- if (which_cpu == -1)
-+ if (which_cpu == -1) {
-+ fclose (fp);
- return 0;
-+ }
-
- for (i = -2; i < which_cpu; i++) {
-- fscanf(fp, "%s", cpuid);
-+ fscanf(fp, "%5s %*d %*d %*d %*d", cpuid);
- }
-
- if (strcmp(check_cpu,cpuid) != 0) {
- fprintf(stderr, "ERROR: could not read cpu-load on %s. Are you "
- "sure you have an SMP system?\n",check_cpu);
- return -1;
- }
-+ fclose (fp);
- return (0);
- }
-
- int calc_cpu_total() {
- int total, used, t=0, i;
diff --git a/debian/postinst.debhelper b/debian/postinst.debhelper
deleted file mode 100644
index 8637a4e..0000000
--- a/debian/postinst.debhelper
+++ /dev/null
@@ -1,5 +0,0 @@
-# Automatically added by dh_installmenu
-if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then
- update-menus
-fi
-# End automatically added section
diff --git a/debian/postrm.debhelper b/debian/postrm.debhelper
deleted file mode 100644
index 2b4be4f..0000000
--- a/debian/postrm.debhelper
+++ /dev/null
@@ -1,3 +0,0 @@
-# Automatically added by dh_installmenu
-if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi
-# End automatically added section
diff --git a/debian/rules b/debian/rules
index f052a33..91c3541 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
+
CFLAGS = -Wall -g
INSTALL = install
INSTALL_FILE = $(INSTALL) -p -o root -g root -m 0644
@@ -23,47 +25,39 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-debian_patches = datapath secfix
-
-build: patched-stamp build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: patch-stamp
dh_testdir
-# perl -pi -e 's/-DX_LOCALE//g;' Makefile
$(MAKE) -C wmcube CFLAGS="$(CFLAGS)"
touch build-stamp
-clean: reverse-patches
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
- -$(MAKE) -C wmcube clean
-# -rm Makefile
+ [ ! -f Makefile ] || $(MAKE) -C wmcube clean
dh_clean
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs usr/share/wmcube
+ $(INSTALL_PROGRAM) wmcube/wmcube $(CURDIR)/debian/wmcube/usr/bin/wmcube
+ dh_install 3dObjects/*.wmc debian/3dObjects/*.wmc usr/share/wmcube
+
# Build architecture-independent files here.
-binary-indep: build
+binary-indep: build install
# We have nothing to do by default.
# Build architecture-dependent files here.
-binary-arch: build
-# dh_testversion
+binary-arch: build install
dh_testdir
dh_testroot
- dh_clean -k
- dh_installdirs
- $(INSTALL_PROGRAM) wmcube/wmcube $(CURDIR)/debian/wmcube/usr/bin/wmcube
- $(INSTALL_FILE) 3dObjects/*.wmc $(CURDIR)/debian/wmcube/usr/share/wmcube
- $(INSTALL_FILE) debian/wmcube.1 debian/wmcube/usr/share/man/man1
- dh_installdocs
- $(INSTALL_FILE) 3dObjects/README $(CURDIR)/debian/wmcube/usr/share/doc/wmcube/README.3dObjects
- $(INSTALL_FILE) 3dObjects/CONTRIBUTE $(CURDIR)/debian/wmcube/usr/share/doc/wmcube
-# ( cd XPM ; tar cf - . ) | \
-# ( cd debian/wmcube/usr/doc/wmcdplay/examples ; tar xvf - )
-# mv debian/wmcube/usr/doc/wmcdplay/examples/*.art \
-# debian/wmcube/usr/share/wmcdplay
# dh_installexamples `find XPM -type f`
dh_installmenu
-# dh_undocumented wmcube.1
+ dh_installdocs README TODO 3dObjects/README 3dObjects/CONTRIBUTE
+ dh_installman debian/wmcube.1
dh_installchangelogs
dh_strip
dh_compress
@@ -74,54 +68,5 @@ binary-arch: build
dh_md5sums
dh_builddeb
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
-
-# ---------------------------------------------------------------------------
-# various rules to unpack addons and (un)apply patches.
-# borrowed from egcs package
-
-patch_dir = debian/patches
-
-apply-patches: patched-stamp
-reverse-patches:
- @for stamp in none patched-*; do \
- case "$$stamp" in none|patched-stamp|patched-\*) continue; esac; \
- patch=`echo $$stamp | sed -e 's/patched-//'`; \
- echo "trying to revert patch $$patch ..."; \
- if [ -x $(patch_dir)/$$patch.dpatch ]; then true; else \
- chmod +x $(patch_dir)/$$patch.dpatch; fi; \
- if $(patch_dir)/$$patch.dpatch -unpatch; then \
- echo "reverted $$patch patch."; \
- rm -f $$stamp; \
- else \
- echo "error in reverting $$patch patch."; \
- exit 1; \
- fi; \
- done
- @echo "Removing patched-stamp"
- @rm -f patched-stamp
-
-patched-%: $(patch_dir)/%.dpatch
- @if [ -x $< ]; then true; else chmod +x $<; fi
- @if [ -f $@ ]; then \
- echo "$* patches already applied."; exit 1; \
- fi
- $< -patch
- @echo "$* patches applied." > $@
-
-patched-stamp: $(foreach p,$(debian_patches),patched-$(p))
- @echo -e "\nPatches applied:" >> pxxx
- @for i in none $(debian_patches); do \
- if [ -r debian/patches/$$i.dpatch ]; then \
- echo -e "\n$$i:" >> pxxx; \
- sed -n 's/^# *DP: */ /p' debian/patches/$$i.dpatch >> pxxx; \
- fi \
- done
- @echo "Writing patched-stamp"
- @mv -f pxxx patched-stamp
-
-# vi: ts=8 sw=8 ai nowrap
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/wmcube/Makefile b/wmcube/Makefile
index 2e5e2e3..1410b29 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
+CFLAGS = -Wall -O2 $(OS)
OBJS = wmcube.o \
../wmgeneral/wmgeneral.o \
@@ -17,7 +17,7 @@ OBJS = wmcube.o \
../wmgeneral/list.o
.c.o:
- $(CC) $(CFLAGS) $(OS) $(INCDIR) -c $< -o $*.o
+ $(CC) $(CFLAGS) $(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