[Pkg-db-devel] Bug#378735: diff for 4.2.52+dfsg-0.1 NMU

[Steinar H. Gunderson]

Package: db4.2
Version: 4.2.52-24
Severity: normal
Tags: patch

Hi,

Attached is the diff for my db4.2 4.2.52+dfsg-0.1 NMU. (I didn't include
the changes to do the repackaging; the diff would be 8MB...)
-------------- next part --------------
diff -Nru /tmp/cpFKJWpKuy/db4.2-4.2.52/debian/changelog /tmp/wF7GfU1E5S/db4.2-4.2.52+dfsg/debian/changelog
--- /tmp/cpFKJWpKuy/db4.2-4.2.52/debian/changelog	2006-07-18 18:12:46.000000000 +0200
+++ /tmp/wF7GfU1E5S/db4.2-4.2.52+dfsg/debian/changelog	2006-07-18 18:12:47.000000000 +0200
@@ -1,3 +1,11 @@
+db4.2 (4.2.52+dfsg-0.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Remove non-DFSG-free documentation from upstream package; do not
+    ship the db4.2-doc package anymore. (Closes: #256332, #357528)
+
+ -- Steinar H. Gunderson <sesse at debian.org>  Tue, 18 Jul 2006 17:23:57 +0200
+
 db4.2 (4.2.52-24) unstable; urgency=low
 
   * Include full set of Java build fixes from Matthias Klose:
diff -Nru /tmp/cpFKJWpKuy/db4.2-4.2.52/debian/control /tmp/wF7GfU1E5S/db4.2-4.2.52+dfsg/debian/control
--- /tmp/cpFKJWpKuy/db4.2-4.2.52/debian/control	2006-07-18 18:12:46.000000000 +0200
+++ /tmp/wF7GfU1E5S/db4.2-4.2.52+dfsg/debian/control	2006-07-18 18:12:47.000000000 +0200
@@ -6,14 +6,6 @@
 Standards-Version: 3.6.2
 Build-Depends: tcl8.4-dev, procps [!hurd-i386], java-gcj-compat-dev [!m68k !mips !mipsel !arm !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
 
-Package: db4.2-doc
-Architecture: all
-Section: libs
-Priority: optional
-Description: Berkeley v4.2 Database Documentation [html]
- Complete documentation for all of the API's and utilities provided by
- version 4.2 of Berkeley DB.
-
 Package: libdb4.2-dev
 Architecture: any
 Section: libdevel
diff -Nru /tmp/cpFKJWpKuy/db4.2-4.2.52/debian/rules /tmp/wF7GfU1E5S/db4.2-4.2.52+dfsg/debian/rules
--- /tmp/cpFKJWpKuy/db4.2-4.2.52/debian/rules	2006-07-18 18:12:46.000000000 +0200
+++ /tmp/wF7GfU1E5S/db4.2-4.2.52+dfsg/debian/rules	2006-07-18 18:12:47.000000000 +0200
@@ -98,23 +98,6 @@
 
 	touch install-stamp
 
-binary-indep: checkroot build install-stamp
-	$(checkdir)
-
-	rm -rf debian/$(package)-doc
-	$(INSTALL_DIR) debian/$(package)-doc/usr/share/doc debian/$(package)-doc/DEBIAN
-
-	cp -a debian/tmp/usr/docs debian/$(package)-doc/usr/share/doc/$(package)-doc
-
-	$(INSTALL_FILE) debian/copyright debian/$(package)-doc/usr/share/doc/$(package)-doc/copyright
-	$(INSTALL_FILE) debian/changelog debian/$(package)-doc/usr/share/doc/$(package)-doc/changelog.Debian
-	gzip -9frq debian/$(package)-doc/usr/share/doc/$(package)-doc/changelog.Debian
-
-	dpkg-gencontrol -isp -p$(package)-doc -Pdebian/$(package)-doc
-	chown -R root:root debian/$(package)-doc
-	chmod -R ugo=rX,u+w debian/$(package)-doc
-	dpkg --build debian/$(package)-doc ..
-
 binary-arch: checkroot build install-stamp
 	$(checkdir)
 
@@ -201,10 +184,10 @@
 	test -f debian/rules
 endef
 
-binary: binary-indep binary-arch
+binary: binary-arch
 
 checkroot:
 	$(checkdir)
 	test root = "`whoami`"
 
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: binary binary-arch clean checkroot
diff -Nru /tmp/cpFKJWpKuy/db4.2-4.2.52/dist/Makefile.in /tmp/wF7GfU1E5S/db4.2-4.2.52+dfsg/dist/Makefile.in
--- /tmp/cpFKJWpKuy/db4.2-4.2.52/dist/Makefile.in	2006-07-18 18:12:46.000000000 +0200
+++ /tmp/wF7GfU1E5S/db4.2-4.2.52+dfsg/dist/Makefile.in	2006-07-18 18:12:47.000000000 +0200
@@ -783,7 +783,7 @@
 library_install: install_setup
 library_install: install_include install_lib install_utilities
 
-uninstall: uninstall_include uninstall_lib uninstall_utilities uninstall_docs
+uninstall: uninstall_include uninstall_lib uninstall_utilities
 
 install_setup:
 	@test -d $(DESTDIR)$(prefix) || \