--- 9menu-1.8.orig/debian/changelog +++ 9menu-1.8/debian/changelog @@ -0,0 +1,141 @@ +9menu (1.8-1.1ubuntu1) dapper; urgency=low + + * Build-Depends: libxext-dev + + -- LaMont Jones Thu, 2 Feb 2006 21:40:10 -0700 + +9menu (1.8-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Split xlibs-dev build-dep (Closes: #346610). + + -- Luk Claes Thu, 12 Jan 2006 00:03:45 +0100 + +9menu (1.8-1) unstable; urgency=low + + * New upstream; popup-exec patch rolled in. + + -- Andrew Stribblehill Fri, 9 Sep 2005 16:21:54 +0100 + +9menu (1.7-2.1) unstable; urgency=low + + * Non-maintainer upload. + * The .orig.tar.gz is headed by a setgid directory, which can cause build + problems. Remove the setgid bit on clean (closes: #233320). + + -- Colin Watson Sun, 14 Mar 2004 12:30:25 +0000 + +9menu (1.7-2) unstable; urgency=low + + * Allow '-file -' to cause stdin to be read as the file. Thanks go to Peter + Bailey for the inspiration for the patch. + + -- Andrew Stribblehill Tue, 2 Sep 2003 12:06:09 +0100 + +9menu (1.7-1) unstable; urgency=low + + * New upstream release. Clarified with Arnold (upstream) that binaries + compiled from patched source may be distributed. (Closes: Bug#178992) + + -- Andrew Stribblehill Tue, 1 Jul 2003 12:37:47 +0100 + +9menu (1.6-3) unstable; urgency=low + + * New maintainer; thanks Stephen + * Patch so 9menu just execs not fork/exec + exit on popup + * Move binary to /usr/bin and manpage to /usr/share/man + * Use debhelper wholesale + + -- Andrew Stribblehill Sat, 14 Jun 2003 16:23:37 +0100 + +9menu (1.6-2) unstable; urgency=low + + * Fixed Build-Depends to include xutils. + + -- Stephen Frost Thu, 25 Apr 2002 08:30:21 -0400 + +9menu (1.6-1) unstable; urgency=low + + * New upstream version + + -- Stephen Frost Thu, 25 Apr 2002 01:05:04 -0400 + +9menu (1.5-2) unstable; urgency=low + + * Fixed Build-Depends line (added debhelper) + * Changed maintainer email address. + + -- Stephen Frost Wed, 4 Jul 2001 11:39:45 -0400 + +9menu (1.5-1) unstable; urgency=medium + + * New upstream version + * Added md5sums correctly + + -- Stephen Frost Thu, 7 Dec 2000 22:44:38 -0500 + +9menu (1.4-10.2) unstable; urgency=low + + * New Maintainer + * Fixed gcc warnings. + + -- Stephen Frost Thu, 7 Dec 2000 20:58:13 -0500 + +9menu (1.4-10.1) unstable; urgency=medium + + * Non-maintainer upload + * debian/postinst, debian/postrm: added missing "#!/bin/sh -e" line + (closes: bug #77413). + + -- An Thi-Nguyen Le Mon, 27 Nov 2000 18:46:45 -0600 + +9menu (1.4-10) unstable; urgency=low + + * /usr/doc -> /usr/share/doc + * Changed CFLAGS and INSTALL_PROGRAM in debian/rules according to + the new policy. + * Added build dependencies. + * Standards-Version: 3.2.1 + + -- Adrian Bunk Sat, 11 Nov 2000 22:37:30 +0100 + +9menu (1.4-9) unstable; urgency=low + + * Orphaned the package. + + -- Joel Klecker Wed, 2 Jun 1999 00:42:15 -0700 + +9menu (1.4-8) unstable; urgency=low + + * New maintainer. + + -- Joel Klecker Wed, 17 Dec 1997 09:59:05 -0800 + +9menu (1.4-7) unstable; urgency=low + + * Compile against libc6 + + -- Karl Sackett Mon, 3 Nov 1997 15:30:53 -0500 + +9menu (1.4-6) unstable; urgency=low + + * Changed maintainer's address. + + -- Karl Sackett Thu, 31 Oct 1996 09:34:48 -0600 + +9menu (1.4-5) unstable; urgency=low + + * Converted to new package standards. + + -- Karl Sackett Thu, 3 Oct 1996 10:28:01 -0500 + +1.4-4 + * support files now architecture-independent +1.4-3 + * Added Debian support files. + * Corrected prefix, exec_prefix in debian.rules. + * Moved man page from 9menu.1x to 9menu.1 + +Local variables: +mode: debian-changelog +End: --- 9menu-1.8.orig/debian/control +++ 9menu-1.8/debian/control @@ -0,0 +1,14 @@ +Source: 9menu +Section: x11 +Priority: optional +Maintainer: Andrew Stribblehill +Build-Depends: libx11-dev, x-dev, debhelper (>>4.0.0), xutils, dpatch, libxext-dev +Standards-Version: 3.6.2.0 + +Package: 9menu +Architecture: any +Depends: ${shlibs:Depends} +Description: Creates X menus from the shell + This is a simple program that allows you to create X menus from + the shell, where each menu item will run a command. 9menu is intended + for use with 9wm, but can be used with any other window manager. --- 9menu-1.8.orig/debian/rules +++ 9menu-1.8/debian/rules @@ -0,0 +1,53 @@ +#! /usr/bin/make -f + +include /usr/share/dpatch/dpatch.make + +CC = gcc +CFLAGS = -g -Wall + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +SHELL = /bin/sh + +build: build-stamp + +build-stamp: patch-stamp + dh_testdir + xmkmf + make CC="$(CC)" CCOPTIONS+="$(CFLAGS)" 9menu + touch stamp-build + +clean: unpatch + dh_testroot + dh_testdir + -make clean + rm -f Makefile changelog + rm -f stamp-build + -chmod -R g-s . # setgid bit in tarball can cause build problems + dh_clean + +binary-indep: +# Nothing to be done + +binary-arch: build + dh_testroot + dh_testdir + dh_install + dh_installman 9menu.1 + dh_installdocs README + sed -n '1,/\*\// {s/^.*\*[ /]\?//; s/9menu.c/Taken from &/; p}' 9menu.c > changelog + dh_installchangelogs changelog + dh_strip + dh_compress + dh_shlibdeps + dh_md5sums + dh_gencontrol + dh_builddeb + +binary: binary-indep binary-arch + +.PHONY: build clean binary binary-arch binary-indep --- 9menu-1.8.orig/debian/copyright +++ 9menu-1.8/debian/copyright @@ -0,0 +1,24 @@ +This is the Debian GNU/Linux prepackaged version of 9menu. + +This package was put together by Stephen Frost , +from sources obtained from: + + ftp://freefriends.org/arnold/Source/9menu-1.6.shar.gz + +Licence: + + 9menu is free software, and is Copyright (c) 1994 by David Hogan and + Arnold Robbins. Permission is granted to all sentient beings to use + this software, to make copies of it, and to distribute those copies, + provided that: + + (1) the copyright and licence notices are left intact + (2) the recipients are aware that it is free software + (3) any unapproved changes in functionality are either + (i) only distributed as patches + or (ii) distributed as a new program which is not called 9menu + and whose documentation gives credit where it is due + (4) the authors are not held responsible for any defects + or shortcomings in the software, or damages caused by it. + + There is no warranty for this software. Have a nice day. --- 9menu-1.8.orig/debian/patches/04_signedness.dpatch +++ 9menu-1.8/debian/patches/04_signedness.dpatch @@ -0,0 +1,54 @@ +#!/bin/sh -e +## 04_signedness.dpatch by Andrew Stribblehill +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- 9menu-1.7/9menu.c.orig 2005-08-15 09:35:36.000000000 +0100 ++++ 9menu-1.7/9menu.c 2005-08-15 09:41:24.000000000 +0100 +@@ -95,7 +95,7 @@ + /* the 9menu icon, for garish window managers */ + #define nine_menu_width 40 + #define nine_menu_height 40 +-static unsigned char nine_menu_bits[] = { ++static char nine_menu_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0x00, 0x00, 0x04, 0x00, + 0x80, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0xfc, 0xff, 0xff, 0x00, + 0x00, 0xfc, 0xff, 0xff, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x04, +@@ -769,7 +769,7 @@ + Window wdummy; + + if (XQueryPointer(dpy, menuwin, &wdummy, &wdummy, &x, &y, +- &dummy, &dummy, &dummy)) ++ &dummy, &dummy, (unsigned int *)&dummy)) + XMoveWindow(dpy, menuwin, x-wide/2, y-cur*high-high/2); + } + +@@ -788,7 +788,7 @@ + offset += 6; /* fudge factor */ + + if (XQueryPointer(dpy, menuwin, &wdummy, &wdummy, &savex, &savey, +- &dummy, &dummy, &dummy)) ++ &dummy, &dummy, (unsigned int *)&dummy)) + XWarpPointer(dpy, None, menuwin, 0, 0, 0, 0, + wide/2, cur*high-high/2+offset); + } --- 9menu-1.8.orig/debian/patches/01_popup-exec.dpatch +++ 9menu-1.8/debian/patches/01_popup-exec.dpatch @@ -0,0 +1,46 @@ +#! /bin/sh -e +## 01_popup-exec.dpatch by Andrew Stribblehill +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: New patch generated from diff.gz + +if [ $# -ne 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +--- 9menu-1.6.orig/9menu.c ++++ 9menu-1.6/9menu.c +@@ -412,17 +412,18 @@ + sh_base = shell; + } + +- if (strncmp(com, "exec ", 5) != 0) { ++ if (strncmp(com, "exec ", 5) == 0) { ++ popup++; ++ com += 5; ++ } ++ if (!popup) { + pid = fork(); + if (pid < 0) { + fprintf(stderr, "%s: can't fork\n", progname); + return; + } else if (pid > 0) + return; +- } else { +- com += 5; +- } +- ++ } + close(ConnectionNumber(dpy)); + execl(shell, sh_base, "-c", com, NULL); + execl("/bin/sh", "sh", "-c", com, NULL); --- 9menu-1.8.orig/debian/patches/00list +++ 9menu-1.8/debian/patches/00list @@ -0,0 +1,2 @@ +03_stdin +04_signedness --- 9menu-1.8.orig/debian/patches/02_manpage.dpatch +++ 9menu-1.8/debian/patches/02_manpage.dpatch @@ -0,0 +1,38 @@ +#!/bin/sh -e +## 02_manpage.dpatch by Andrew Stribblehill +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/wompom/ads/debian/9menu/9menu-1.7/9menu.1 9menu-1.7/9menu.1 +--- /home/wompom/ads/debian/9menu/9menu-1.7/9menu.1 2003-07-01 12:02:32.000000000 +0100 ++++ 9menu-1.7/9menu.1 2003-07-01 12:43:23.000000000 +0100 +@@ -195,7 +195,8 @@ + .SH VERSION + This man page documents + .I 9menu +-version 1.7. ++version 1.7. It has been modified for Debian; see the changelog and ++source package for details. + .PP + Source code is available from + .B ftp://ftp.freefriends.org/arnold/Source/9menu.shar.gz --- 9menu-1.8.orig/debian/patches/03_stdin.dpatch +++ 9menu-1.8/debian/patches/03_stdin.dpatch @@ -0,0 +1,53 @@ +#!/bin/sh -e +## 03_stdin.dpatch by Andrew Stribblehill +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/wompom/ads/debian/9menu/9menu-1.7/9menu.1 9menu-1.7/9menu.1 +--- /home/wompom/ads/debian/9menu/9menu-1.7/9menu.1 2003-07-01 12:02:32.000000000 +0100 ++++ 9menu-1.7/9menu.1 2003-09-02 12:01:52.000000000 +0100 +@@ -99,7 +99,7 @@ + in addition to any other command line arguments. This is intended for use + with + .B #! +-in scripts. ++in scripts. If the filename is "-" read from stdin. + .TP + .BI \-fg " foreground-color" + Set the foreground color to +diff -urNad /home/wompom/ads/debian/9menu/9menu-1.7/9menu.c 9menu-1.7/9menu.c +--- /home/wompom/ads/debian/9menu/9menu-1.7/9menu.c 2003-07-01 12:02:32.000000000 +0100 ++++ 9menu-1.7/9menu.c 2003-09-02 11:56:19.000000000 +0100 +@@ -258,7 +258,11 @@ + char fbuf[1024]; + FILE *fp; + +- fp = fopen(filename, "r"); ++ if (strcmp(filename, "-") == 0) { ++ fp = stdin; ++ } else { ++ fp = fopen(filename, "r"); ++ } + if (fp == NULL) { + fprintf(stderr, "%s: couldn't open '%s'\n", progname, + filename); --- 9menu-1.8.orig/debian/install +++ 9menu-1.8/debian/install @@ -0,0 +1 @@ +9menu usr/bin --- 9menu-1.8.orig/debian/compat +++ 9menu-1.8/debian/compat @@ -0,0 +1 @@ +4