Hi,

please find attached the source debdiff for my NMU.

Mraw,
KiBi.
diff -u libnjb-2.2.5/debian/control libnjb-2.2.5/debian/control
--- libnjb-2.2.5/debian/control
+++ libnjb-2.2.5/debian/control
@@ -2,13 +2,13 @@
 Section: libs
 Priority: optional
 Maintainer: John Bovey <[email protected]>
-Build-Depends: libusb-dev, doxygen, debhelper
+Build-Depends: libusb-dev, doxygen, debhelper (>= 4), autotools-dev, chrpath
 Standards-Version: 3.6.2.2
 
 Package: libnjb5
 Section: libs
 Architecture: any
-Depends: udev | hotplug, ${shlibs:Depends}
+Depends: udev [linux-any], ${shlibs:Depends}
 Conflicts: libnjb-hotplug
 Replaces: libnjb-hotplug
 Description: Creative Labs Nomad Jukebox library
@@ -20,7 +20,7 @@
 Package: libnjb-dev
 Section: libdevel
 Architecture: any
-Depends: libnjb5 (= ${Source-Version}), libusb-dev (>> 0.1.7)
+Depends: libnjb5 (= ${binary:Version}), libusb-dev (>> 0.1.7)
 Description: Creative Labs Nomad Jukebox library development files
  A library for communicating with the Creative Nomad Jukebox MP3
  player. More information can be found at the libnjb web site:
@@ -47,3 +47,3 @@
  This package contains the example binaries each performing a simple
- function, such as transfering a track to the jukebox. The source code
+ function, such as transferring a track to the jukebox. The source code
  for these examples is in the package libnjb-doc.
diff -u libnjb-2.2.5/debian/rules libnjb-2.2.5/debian/rules
--- libnjb-2.2.5/debian/rules
+++ libnjb-2.2.5/debian/rules
@@ -2,6 +2,8 @@
 
 build: build-stamp
 build-stamp:
+	cp /usr/share/misc/config.guess .
+	cp /usr/share/misc/config.sub   .
 	./configure --prefix=/usr --mandir=/usr/share/man \
 		--with-hotplugowner=root:audio --with-hotplugperms=0666
 	$(MAKE)
@@ -18,11 +20,14 @@
 install: build
 	dh_clean -k
 	$(MAKE) DESTDIR=`pwd`/debian/tmp install
+	find debian/tmp/usr/lib -name '*.so.*' -exec chrpath -d {} ';'
+	find debian/tmp/usr/bin -exec chrpath -d {} ';'
 
 clean:
 	rm -f build-stamp
+	rm -f config.guess config.sub
+	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean
-	-$(MAKE) distclean
 
 binary-indep: build
 	dh_install -i
diff -u libnjb-2.2.5/debian/watch libnjb-2.2.5/debian/watch
--- libnjb-2.2.5/debian/watch
+++ libnjb-2.2.5/debian/watch
@@ -1,3 +1,2 @@
-# Homepage/Pattern Version Action
-version=2
-http://heanet.dl.sourceforge.net/sourceforge/libnjb/libnjb-(.*)\.tar\.gz debian uupdate
+version=3
+http://sf.net/libnjb/libnjb-(.*)\.tar\.gz
diff -u libnjb-2.2.5/debian/changelog libnjb-2.2.5/debian/changelog
--- libnjb-2.2.5/debian/changelog
+++ libnjb-2.2.5/debian/changelog
@@ -1,3 +1,26 @@
+libnjb (2.2.5-4.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix uninstallability on GNU/kFreeBSD (Closes: #545962): Mark udev as
+    Linux-specific in Depends, and get rid of hotplug entirely, which
+    disappeared a while ago. Thanks to Petr Salinger.
+  * Fix FTBFS on avr32 (Closes: #529458):
+     - Update config.{guess,sub} before running configure.
+     - Remove them in the clean target to keep the Debian diff clean.
+     - Add autotools-dev to Build-Depends accordingly.
+     - Thanks to Bradley Smith for his report.
+  * Fix some lintian warnings and errors:
+     - Stop ignoring errors in make distclean.
+     - Use ${binary:Version} instead of obsolete ${Source-Version}.
+     - Declare the needed version for debhelper in Build-Depends.
+     - Use the SF redirector for debian/watch.
+     - Fix “transferring” typo in long description.
+     - Strip the RPATH in all binaries. At least right now, all of them
+       point to /usr/lib, so there's no reason not to get rid of them
+       AFAICT. Use chrpath for that, and add it to Build-Depends.
+
+ -- Cyril Brulebois <[email protected]>  Mon, 21 Dec 2009 09:50:03 +0100
+
 libnjb (2.2.5-4.2) unstable; urgency=low
 
   * Non-maintainer upload.

Attachment: signature.asc
Description: Digital signature

Reply via email to