tag 375404 + patch pending
tag 314488 + patch pending
thanks
Package: cheops
Version: 0.61-13
Hi,
Attached is the diff for my cheops 0.61-13.1 NMU.
The fix for the FTBFS is generating gpl.c in this way
"blabla\n"
"blabla\n"
instead of the deprecated way
"blabla\
blabla\
"
Cheers,
--
Raphaël Hertzog
Premier livre français sur Debian GNU/Linux :
http://www.ouaza.com/livre/admin-debian/
reverted:
--- cheops-0.61/config.log
+++ cheops-0.61.orig/config.log
@@ -1,37 +0,0 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-configure:557: checking for gcc
-configure:670: checking whether the C compiler (gcc ) works
-configure:686: gcc -o conftest conftest.c 1>&5
-configure:712: checking whether the C compiler (gcc ) is a cross-compiler
-configure:717: checking whether we are using GNU C
-configure:745: checking whether gcc accepts -g
-configure:807: checking for a BSD compatible install
-configure:862: checking how to run the C preprocessor
-configure:942: checking for ANSI C header files
-configure:1049: checking for fcntl.h
-configure:1049: checking for sys/ioctl.h
-configure:1049: checking for sys/time.h
-configure:1049: checking for unistd.h
-configure:1087: checking for working const
-configure:1162: checking for size_t
-configure:1195: checking whether time.h and sys/time.h may both be included
-configure:1272: checking for Snmp libraries support
-configure:1277: checking for net-snmp-config
-configure:1378: checking for gtk
-configure:1417: checking for dn_expand in -lc
-configure:1463: checking for dlopen in -ldl
-configure:1503: checking for snmp_add_var in -lsnmp
-configure:1543: checking for g_module_open in -lgmodule
-configure:1600: checking if struct ip has member ip_csum
-configure:1629: checking if struct ip has member ip_sum
-configure:1694: checking whether gcc needs -traditional
-configure:1742: checking for gethostname
-configure:1742: checking for select
-configure:1742: checking for socket
-configure:1742: checking for strcspn
-configure:1742: checking for strdup
-configure:1742: checking for strstr
-configure:1742: checking for strtol
-configure:1742: checking for strtoul
diff -u cheops-0.61/generate-gpl.sh cheops-0.61/generate-gpl.sh
--- cheops-0.61/generate-gpl.sh
+++ cheops-0.61/generate-gpl.sh
@@ -2,3 +2,3 @@
-echo "char *gpl_text = \"\\n\\"
-cat COPYING | sed 's/"/\\"/g'| sed 's/$/\\n\\/'
-echo "\";"
+echo "char *gpl_text = \"\\n\""
+cat COPYING | sed 's/"/\\"/g; s/$/\\n"/; s/^/"/'
+echo ";"
reverted:
--- cheops-0.61/debian/substvars
+++ cheops-0.61.orig/debian/substvars
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3.5-1), libglib1.2 (>= 1.2.0), libgtk1.2 (>=
1.2.10-4), libsnmp4.2, libx11-6, libxext6, libxi6
diff -u cheops-0.61/debian/control cheops-0.61/debian/control
--- cheops-0.61/debian/control
+++ cheops-0.61/debian/control
@@ -2,12 +2,12 @@
Section: net
Priority: optional
Maintainer: Javier Fernandez-Sanguino Pen~a <[EMAIL PROTECTED]>
-Build-Depends: libsnmp-dev, libgtk1.2-dev, debhelper, libwrap0-dev
+Build-Depends: libsnmp9-dev | libsnmp-dev, libgtk1.2-dev, debhelper,
libwrap0-dev
Standards-Version: 3.6.10
Package: cheops
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, xterm
Suggests: vncviewer
Description: Network swiss army knife
Cheops is a combination of a variety of network tools to
diff -u cheops-0.61/debian/changelog cheops-0.61/debian/changelog
--- cheops-0.61/debian/changelog
+++ cheops-0.61/debian/changelog
@@ -1,3 +1,14 @@
+cheops (0.61-13.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix generate-gpl.sh to not generate multi-line strings. Closes: #375404
+ * Depends on xterm. Closes: #314488
+ * Build-Depends on libsnmp9-dev | libsnmp-dev so that libsnmp9-dev is
+ favored over libsnmp4.2-dev. Closes: #331619
+ (Was already closed but then lost by next maintainer upload)
+
+ -- Raphael Hertzog <[EMAIL PROTECTED]> Fri, 30 Jun 2006 21:17:00 +0200
+
cheops (0.61-13) unstable; urgency=low
* Remove xlibs-dev build-depends (Closes: #346622)
