tags 485546 + patch
tags 515415 + patch
thanks
Dear maintainer,
I've prepared an NMU for xfishtank (versioned as 2.2-25.1). The diff
is attached to this message.
Regards.
diff -u xfishtank-2.2/debian/control xfishtank-2.2/debian/control
--- xfishtank-2.2/debian/control
+++ xfishtank-2.2/debian/control
@@ -1,13 +1,13 @@
Source: xfishtank
Section: x11
Priority: optional
-Build-Depends: debhelper, libx11-dev, x-dev, xutils, libxext-dev
+Build-Depends: debhelper(>= 7), libx11-dev, xutils-dev, libxext-dev
Maintainer: Eric Schwartz (Skif) <emsch...@debian.org>
Standards-Version: 3.5.9.0
Package: xfishtank
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: turns your X root into an aquarium
Enjoy an animated aquarium background on your screen, with a variety of
tropical fish swimming in it.
diff -u xfishtank-2.2/debian/changelog xfishtank-2.2/debian/changelog
--- xfishtank-2.2/debian/changelog
+++ xfishtank-2.2/debian/changelog
@@ -1,3 +1,14 @@
+xfishtank (2.2-25.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Correct build dependencies (Closes: #485546, #515415)
+ * Remove obsolete source and diff targets.
+ * Don't ignore errors by make clean.
+ * Add a dependency on misc:Depends
+ * Add a versioned dependency on debhelper 7
+
+ -- Raphael Geissert <geiss...@debian.org> Wed, 08 Jul 2009 03:01:55 -0500
+
xfishtank (2.2-25) unstable; urgency=low
* Maintainer Upload, incorporates NMU
diff -u xfishtank-2.2/debian/rules xfishtank-2.2/debian/rules
--- xfishtank-2.2/debian/rules
+++ xfishtank-2.2/debian/rules
@@ -15,7 +15,7 @@
dh_testdir
dh_testroot
rm -f build-stamp
- -$(MAKE) -i clean
+ [ ! -f Makefile ] || $(MAKE) clean
dh_clean Makefile
# Build architecture-independent files here.
@@ -44,7 +44,4 @@
dh_builddeb
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary
reverted:
--- xfishtank-2.2/debian/debhelper.log
+++ xfishtank-2.2.orig/debian/debhelper.log
@@ -1,15 +0,0 @@
-dh_installdirs
-dh_installdocs
-dh_installexamples
-dh_installmenu
-dh_installcron
-dh_installmanpages
-dh_installchangelogs
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_shlibdeps
-dh_gencontrol
-dh_md5sums
-dh_builddeb
reverted:
--- xfishtank-2.2/debian/postinst.debhelper
+++ xfishtank-2.2.orig/debian/postinst.debhelper
@@ -1,5 +0,0 @@
-# Automatically added by dh_installmenu
-if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then
- update-menus
-fi
-# End automatically added section
reverted:
--- xfishtank-2.2/debian/postrm.debhelper
+++ xfishtank-2.2.orig/debian/postrm.debhelper
@@ -1,3 +0,0 @@
-# Automatically added by dh_installmenu
-if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi
-# End automatically added section
reverted:
--- xfishtank-2.2/debian/substvars
+++ xfishtank-2.2.orig/debian/substvars
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.7-1), libx11-6, libxext6
--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
