Package: xearth Version: 1.1-10.2 Severity: normal Tags: patch Hi,
Attached is the diff for my NMU 1.1-10.3. I removed debian/conffiles. Kind regards, Adriaan Peeters
diff -ur xearth-1.1/debian/changelog unstable/xearth-1.1/debian/changelog --- xearth-1.1/debian/changelog 2006-07-21 13:00:39.000000000 +0200 +++ unstable/xearth-1.1/debian/changelog 2006-07-24 20:07:03.000000000 +0200 @@ -1,3 +1,18 @@ +xearth (1.1-10.3) unstable; urgency=low + + * Non-maintainer upload. + * Rebuild with the new imake which installs in /usr/bin instead of + /usr/X11R6/bin (Closes: #362916). + * Adapt debian/menu to include the new path. + * Bumped Standards-Version to 3.7.2, no changed needed. + * Set correct section for man page: 1x instead of 1 (Closes: #379325). + * debian/rules: + - Bumped debhelper version from 1 to 5 (Closes: #379324). + - Adapted rules to use debian/xearth instead of debian/tmp + * Removed debian/conffiles: debhelper handles this. + + -- Adriaan Peeters <[EMAIL PROTECTED]> Fri, 21 Jul 2006 11:00:46 +0200 + xearth (1.1-10.2) unstable; urgency=low * Non-maintainer upload. Only in xearth-1.1/debian: conffiles diff -ur xearth-1.1/debian/control unstable/xearth-1.1/debian/control --- xearth-1.1/debian/control 2006-07-21 13:00:39.000000000 +0200 +++ unstable/xearth-1.1/debian/control 2006-07-24 20:07:03.000000000 +0200 @@ -2,8 +2,8 @@ Section: non-free/games Priority: optional Maintainer: Tomohiro KUBOTA <[EMAIL PROTECTED]> -Build-Depends: debhelper, xutils, libx11-dev, libxt-dev, x-dev, libpng12-dev -Standards-Version: 3.6.1 +Build-Depends: debhelper (>= 5.0.0), xutils, libx11-dev, libxt-dev, libpng12-dev +Standards-Version: 3.7.2 Package: xearth Architecture: any diff -ur xearth-1.1/debian/menu unstable/xearth-1.1/debian/menu --- xearth-1.1/debian/menu 2006-07-21 13:00:39.000000000 +0200 +++ unstable/xearth-1.1/debian/menu 2006-07-24 20:07:03.000000000 +0200 @@ -1,2 +1,2 @@ ?package(xearth):needs="X11" section="Games/Toys"\ - title="xearth" command="/usr/X11R6/bin/xearth" + title="xearth" command="/usr/bin/xearth" diff -ur xearth-1.1/debian/rules unstable/xearth-1.1/debian/rules --- xearth-1.1/debian/rules 2006-07-21 13:00:39.000000000 +0200 +++ unstable/xearth-1.1/debian/rules 2006-07-24 20:07:03.000000000 +0200 @@ -6,7 +6,7 @@ #export DH_VERBOSE=1 # This is the debhelper compatability version to use. -export DH_COMPAT=1 +export DH_COMPAT=5 CDEBUGFLAGS=-g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -49,12 +49,10 @@ dh_clean -k dh_installdirs - # Add here commands to install the package into debian/tmp. - $(MAKE) install DESTDIR=`pwd`/debian/tmp - $(MAKE) install.man DESTDIR=`pwd`/debian/tmp - cp debian/apm `pwd`/debian/tmp/etc/apm/event.d/xearth -# remove unnecessary directory(causes lintian error) - -rm -rf `pwd`/debian/tmp/usr/X11R6/lib + # Add here commands to install the package into debian/xearth. + $(MAKE) install DESTDIR=`pwd`/debian/xearth + $(MAKE) install.man DESTDIR=`pwd`/debian/xearth + cp debian/apm `pwd`/debian/xearth/etc/apm/event.d/xearth # Build architecture-independent files here. binary-indep: build install @@ -80,7 +78,7 @@ dh_strip dh_compress dh_fixperms - chmod 755 `pwd`/debian/tmp/etc/apm/event.d/xearth + chmod 755 `pwd`/debian/xearth/etc/apm/event.d/xearth # You may want to make some executables suid here. # dh_suidregister # dh_makeshlibs diff -ur xearth-1.1/xearth.man unstable/xearth-1.1/xearth.man --- xearth-1.1/xearth.man 2006-07-21 13:00:39.000000000 +0200 +++ unstable/xearth-1.1/xearth.man 2006-07-24 20:07:03.000000000 +0200 @@ -1,4 +1,4 @@ -.TH xearth 1 "October 2000" "KLJ" +.TH xearth 1x "October 2000" "KLJ" .SH NAME xearth - displays a shaded image of the Earth in an X window diff -ur xearth-1.1/xearth.man.ja unstable/xearth-1.1/xearth.man.ja --- xearth-1.1/xearth.man.ja 2006-07-21 13:00:39.000000000 +0200 +++ unstable/xearth-1.1/xearth.man.ja 2006-07-24 20:07:03.000000000 +0200 @@ -1,4 +1,4 @@ -.TH xearth 1 "November 1999" "KLJ" +.TH xearth 1x "November 1999" "KLJ" .SH 名称 xearth - Xウインドウに地球のイメージを表示します
signature.asc
Description: This is a digitally signed message part