Hello, Attached is the diff for my wmcpu 1.3-4.2 NMU.
-- Julien Danjou // Λ̊ <[EMAIL PROTECTED]> http://julien.danjou.info // 9A0D 5FD9 EB42 22F6 8974 C95C A462 B51E C2FE E5CD // There is nothing under this line.
diff -u wmcpu-1.3/debian/wmcpu.1x wmcpu-1.3/debian/wmcpu.1x
--- wmcpu-1.3/debian/wmcpu.1x
+++ wmcpu-1.3/debian/wmcpu.1x
@@ -1,4 +1,4 @@
-.TH wmCPU(1.2-debian) 1
+.TH wmCPU(1.2-debian) 1x
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
.SH NAME
diff -u wmcpu-1.3/debian/changelog wmcpu-1.3/debian/changelog
--- wmcpu-1.3/debian/changelog
+++ wmcpu-1.3/debian/changelog
@@ -1,3 +1,14 @@
+wmcpu (1.3-4.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Don't use /usr/X11R6 (Closes: #376422)
+ * Bump standards version
+ * Quote menu entry
+ * Use dh compat 4
+ * Fix manpage entry
+
+ -- Julien Danjou <[EMAIL PROTECTED]> Thu, 13 Jul 2006 18:13:16 +0200
+
wmcpu (1.3-4.1) unstable; urgency=low
* Non-maintainer upload to help with xlibs-dev transition.
diff -u wmcpu-1.3/debian/dirs wmcpu-1.3/debian/dirs
--- wmcpu-1.3/debian/dirs
+++ wmcpu-1.3/debian/dirs
@@ -1,2 +1 @@
-usr/X11R6/bin
-usr/X11R6/man/man1
+usr/bin
diff -u wmcpu-1.3/debian/menu wmcpu-1.3/debian/menu
--- wmcpu-1.3/debian/menu
+++ wmcpu-1.3/debian/menu
@@ -1,2 +1,2 @@
-?package(wmcpu):needs=X11 section=Apps/Tools\
- title="wmCPU" command="/usr/X11R6/bin/wmcpu"
+?package(wmcpu):needs="X11" section="Apps/Tools"\
+ title="wmCPU" command="/usr/bin/wmcpu"
diff -u wmcpu-1.3/debian/control wmcpu-1.3/debian/control
--- wmcpu-1.3/debian/control
+++ wmcpu-1.3/debian/control
@@ -2,8 +2,8 @@
Section: x11
Priority: optional
Maintainer: Warren A. Layton <[EMAIL PROTECTED]>
-Build-Depends: debhelper, libx11-dev, libxext-dev, libxpm-dev
-Standards-Version: 3.5.9.0
+Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, libxpm-dev
+Standards-Version: 3.7.2
Package: wmcpu
Architecture: any
diff -u wmcpu-1.3/debian/rules wmcpu-1.3/debian/rules
--- wmcpu-1.3/debian/rules
+++ wmcpu-1.3/debian/rules
@@ -34,10 +34,7 @@
dh_installdirs
# Add here commands to install the package into debian/tmp.
- install -d `pwd`/debian/tmp/usr/X11R6/bin
- install -d `pwd`/debian/tmp/usr/X11R6/man/man1
- install wmcpu `pwd`/debian/tmp/usr/X11R6/bin
- install debian/wmcpu.1x `pwd`/debian/tmp/usr/X11R6/man/man1
+ install wmcpu `pwd`/debian/wmcpu/usr/bin
touch install-stamp
@@ -50,7 +47,7 @@
dh_testdir
dh_testroot
dh_installmenu
- dh_installmanpages wmcpu.1x
+ dh_installman debian/wmcpu.1x
dh_installdocs
dh_installchangelogs
dh_strip
only in patch2:
unchanged:
--- wmcpu-1.3.orig/Makefile
+++ wmcpu-1.3/Makefile
@@ -1,11 +1,11 @@
CC = gcc
CFLAGS = -O3 -Wall -W
-LDFLAGS = -L/usr/X11R6/lib -lXpm -lXext -lX11
+LDFLAGS = -L/usr/lib -lXpm -lXext -lX11
OBJS = wmcpu.o
# where to install this program (also for packaging stuff)
DESTDIR =
-PREFIX = $(DESTDIR)/usr/X11R6
+PREFIX = $(DESTDIR)/usr
INSTALL = -m 755
wmcpu: $(OBJS)
only in patch2:
unchanged:
--- wmcpu-1.3.orig/debian/compat
+++ wmcpu-1.3/debian/compat
@@ -0,0 +1 @@
+4
signature.asc
Description: Digital signature
