tags 470975 + patch thanks Here's a somewhat larger nmudiff that fixes the obvious Lintian complaints while I'm at it. Upload whichever you prefer.
Thanks,
Simon
diff -u bakery2.4-2.4.0/debian/changelog bakery2.4-2.4.0/debian/changelog
--- bakery2.4-2.4.0/debian/changelog
+++ bakery2.4-2.4.0/debian/changelog
@@ -1,3 +1,16 @@
+bakery2.4 (2.4.0-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add #include <cstring> to keep g++ 4.3 happy. (Closes: #470975)
+ * Keep lintian happier:
+ - don't ignore errors in make distclean
+ - make binNMUable (Source-Version -> binary:Version, source:Version)
+ - move docs from Apps/Programming to Programming
+ - relax unnecessarily strict build dependencies that look at Debian
+ revision
+
+ -- Simon McVittie <[EMAIL PROTECTED]> Sat, 05 Apr 2008 14:08:59 +0000
+
bakery2.4 (2.4.0-2) unstable; urgency=low
* Build-dep on doxygen (Closes: #384421)
diff -u bakery2.4-2.4.0/debian/control bakery2.4-2.4.0/debian/control
--- bakery2.4-2.4.0/debian/control
+++ bakery2.4-2.4.0/debian/control
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Bradley Bell <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4), libgtkmm-2.4-dev (>> 1:2.8.0), libgconfmm-2.6-dev (>= 2.10.0-3), libglademm-2.4-dev (>= 2.6.1-1), libgnome-vfsmm-2.6-dev (>= 2.10.0-1), libxml++2.6-dev (>> 2.8.0), libxml-parser-perl, doxygen
+Build-Depends: debhelper (>= 4), libgtkmm-2.4-dev (>> 1:2.8.0), libgconfmm-2.6-dev (>= 2.10.0-3), libglademm-2.4-dev (>= 2.6.1), libgnome-vfsmm-2.6-dev (>= 2.10.0), libxml++2.6-dev (>> 2.8.0), libxml-parser-perl, doxygen
Standards-Version: 3.7.2
Package: libbakery-2.4-dev
@@ -10,7 +10,7 @@
Architecture: any
Conflicts: libbakery-2.3-dev
Replaces: libbakery-2.3-dev
-Depends: libbakery-2.4-1 (= ${Source-Version}), libgtkmm-2.4-dev (>> 1:2.8.0), libgconfmm-2.6-dev (>= 2.10.0-3), libglademm-2.4-dev (>= 2.6.1-1), libgnome-vfsmm-2.6-dev (>= 2.10.0-1), libxml++2.6-dev (>> 2.8.0)
+Depends: libbakery-2.4-1 (= ${binary:Version}), libgtkmm-2.4-dev (>> 1:2.8.0), libgconfmm-2.6-dev (>= 2.10.0-3), libglademm-2.4-dev (>= 2.6.1-1), libgnome-vfsmm-2.6-dev (>= 2.10.0-1), libxml++2.6-dev (>> 2.8.0)
Description: A C++ Application Framework (development files)
Bakery is a C++ Framework for creating GTK+ or GNOME applications
using gtkmm and gnomemm.
@@ -34,7 +34,7 @@
Architecture: any
Conflicts: libbakery-2.3-11, libbakery-2.3-11c2, libbakery-2.3-11c2a
Replaces: libbakery-2.3-11, libbakery-2.3-11c2, libbakery-2.3-11c2a
-Depends: libbakery-common (>= ${Source-Version}), ${shlibs:Depends}
+Depends: libbakery-common (>= ${source:Version}), ${shlibs:Depends}
Description: A C++ Application Framework (shared libraries)
Bakery is a C++ Framework for creating GTK+ or GNOME applications
using gtkmm and gnomemm.
diff -u bakery2.4-2.4.0/debian/rules bakery2.4-2.4.0/debian/rules
--- bakery2.4-2.4.0/debian/rules
+++ bakery2.4-2.4.0/debian/rules
@@ -55,14 +55,16 @@
rm -f build-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
- -rm -rf docs/reference/xml
- -rm intltool-extract intltool-merge intltool-update
-
- -test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub config.sub
- -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess config.guess
+ test ! -f Makefile || $(MAKE) distclean
+ rm -rf docs/reference/xml
+ rm -f intltool-extract intltool-merge intltool-update
+
+ if test -r /usr/share/misc/config.sub; then \
+ cp -f /usr/share/misc/config.sub config.sub; \
+ fi
+ if test -r /usr/share/misc/config.guess; then \
+ cp -f /usr/share/misc/config.guess config.guess; \
+ fi
dh_clean
diff -u bakery2.4-2.4.0/debian/libbakery-2.4-dev.doc-base.bakery2.4-misc bakery2.4-2.4.0/debian/libbakery-2.4-dev.doc-base.bakery2.4-misc
--- bakery2.4-2.4.0/debian/libbakery-2.4-dev.doc-base.bakery2.4-misc
+++ bakery2.4-2.4.0/debian/libbakery-2.4-dev.doc-base.bakery2.4-misc
@@ -2,7 +2,7 @@
Title: Bakery Documentation
Author: Murray Cumming <[EMAIL PROTECTED]>
Abstract: Miscellaneous documentation about Bakery
-Section: Apps/Programming
+Section: Programming
Format: HTML
Index: /usr/share/doc/libbakery-2.4-dev/index.html
diff -u bakery2.4-2.4.0/debian/libbakery-2.4-dev.doc-base.bakery2.4-reference bakery2.4-2.4.0/debian/libbakery-2.4-dev.doc-base.bakery2.4-reference
--- bakery2.4-2.4.0/debian/libbakery-2.4-dev.doc-base.bakery2.4-reference
+++ bakery2.4-2.4.0/debian/libbakery-2.4-dev.doc-base.bakery2.4-reference
@@ -2,7 +2,7 @@
Title: Bakery Reference Manual
Author: Doxygen
Abstract: Reference manual for Bakery
-Section: Apps/Programming
+Section: Programming
Format: HTML
Index: /usr/share/doc/libbakery-2.4-dev/reference/html/index.html
only in patch2:
unchanged:
--- bakery2.4-2.4.0.orig/bakery/App/App_WithDoc_Gtk.cc
+++ bakery2.4-2.4.0/bakery/App/App_WithDoc_Gtk.cc
@@ -28,6 +28,7 @@
//#include <fstream>
#include <algorithm>
#include <libintl.h>
+#include <cstring>
//#include <gtk/gtkfilesel.h>
signature.asc
Description: Digital signature
