diff options
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | debian/Makefile | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 47 | ||||
| -rw-r--r-- | debian/shlibs.libattr1 | 1 | ||||
| -rw-r--r-- | doc/CHANGES | 4 | ||||
| -rw-r--r-- | include/buildmacros | 1 |
8 files changed, 33 insertions, 31 deletions
@@ -3,5 +3,5 @@ # PKG_MAJOR=2 PKG_MINOR=4 -PKG_REVISION=29 +PKG_REVISION=30 PKG_BUILD=0 diff --git a/debian/Makefile b/debian/Makefile index 42e0fef..49fa1ec 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -6,7 +6,7 @@ TOPDIR = .. include $(TOPDIR)/include/builddefs LIBPKG = lib$(PKG_NAME)1 -LSRCFILES = changelog control copyright rules shlibs.$(LIBPKG) +LSRCFILES = changelog control copyright rules DEV_DOC_DIR = $(PKG_DOC_DIR)/../$(LIBPKG)-dev LIB_DOC_DIR = $(PKG_DOC_DIR)/../$(LIBPKG) diff --git a/debian/changelog b/debian/changelog index d9c38c4..81d59f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -attr (2.4.29-1) unstable; urgency=low +attr (2.4.30-1) unstable; urgency=low * New upstream release * Updated Polish translation. * Initial Swedish translation (closes: #349234) + * Switched from debmake to debhelper. - -- Nathan Scott <nathans@debian.org> Tue, 31 Jan 2006 13:35:39 +1100 + -- Nathan Scott <nathans@debian.org> Wed, 15 Feb 2006 20:43:49 +1100 attr (2.4.25-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 778df68..a806d48 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: attr Section: utils Priority: optional Maintainer: Nathan Scott <nathans@debian.org> -Build-Depends: autoconf, debmake, gettext, libtool +Build-Depends: autoconf, debhelper (>= 5), gettext, libtool Standards-Version: 3.5.9 Package: attr diff --git a/debian/rules b/debian/rules index 23f77d5..139911f 100755 --- a/debian/rules +++ b/debian/rules @@ -4,10 +4,10 @@ package = attr develop = lib$(package)1-dev library = lib$(package)1 -dirtmp = debian/tmp +dirme = debian/$(package) dirdev = debian/$(develop) dirlib = debian/$(library) -pkgtmp = DIST_ROOT=`pwd`/$(dirtmp); export DIST_ROOT; +pkgme = DIST_ROOT=`pwd`/$(dirme); export DIST_ROOT; pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT; pkglib = DIST_ROOT=`pwd`/$(dirlib); export DIST_ROOT; stdenv = @GZIP=-q; export GZIP; @@ -15,6 +15,7 @@ stdenv = @GZIP=-q; export GZIP; options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \ INSTALL_USER=root INSTALL_GROUP=root ; checkdir = test -f debian/rules +checkver = rm -f debian/compat && echo 5 > debian/compat build: built built: config @@ -34,36 +35,34 @@ clean: $(checkdir) -rm -f built .census $(MAKE) distclean - -rm -rf $(dirtmp) $(dirdev) $(dirlib) debian/*substvars debian/files* + -rm -rf $(dirme) $(dirdev) $(dirlib) + -rm -f debian/*substvars debian/files* debian/*.debhelper debian/compat binary-indep: -# Note1: dev pkg with .so symlinks to base pkg confuses debstd; -# so the .so 'Dangling symlink' message is benign, as is -# the message about not having executables/libraries. -# Note2: absolute symlinks (required by policy) confuse debstd; -# so we'll filter out symlink messages entirely now. -fixup_messages = egrep -v 'Dangling symlink|No executables or libraries' - binary-arch: checkroot built @echo "== dpkg-buildpackage: binary-arch" 1>&2 $(checkdir) - -rm -rf $(dirtmp) $(dirdev) $(dirlib) - $(pkgtmp) $(MAKE) -C . install + $(checkver) + -rm -rf $(dirme) $(dirdev) $(dirlib) + $(pkgme) $(MAKE) -C . install $(pkgdev) $(MAKE) -C . install-dev $(pkglib) $(MAKE) -C . install-lib - $(pkgtmp) $(MAKE) -C build src-manifest - @echo "== dpkg-buildpackage: debstd" 1>&2 - $(stdenv) debstd -m | $(fixup_messages) - dpkg-gencontrol -isp -p$(package) -P$(dirtmp) -Tdebian/substvars - dpkg-gencontrol -isp -p$(develop) -P$(dirdev) - dpkg-gencontrol -isp -p$(library) -P$(dirlib) -Tdebian/$(library).substvars - cp debian/shlibs.$(library) $(dirlib)/DEBIAN/shlibs - chown -R root.root $(dirtmp) $(dirdev) $(dirlib) - chmod -R go=rX $(dirtmp) $(dirdev) $(dirlib) - dpkg --build $(dirtmp) .. - dpkg --build $(dirdev) .. - dpkg --build $(dirlib) .. + $(pkgme) $(MAKE) -C build src-manifest + + dh_installdocs + dh_installchangelogs + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs -N $(library) + dh_makeshlibs -p $(library) -V 'libattr1 (>= 2.4.4-1)' + dh_installdeb + dh_shlibdeps + dh_gencontrol + + dh_md5sums + dh_builddeb binary: binary-indep binary-arch diff --git a/debian/shlibs.libattr1 b/debian/shlibs.libattr1 deleted file mode 100644 index 5eb59c5..0000000 --- a/debian/shlibs.libattr1 +++ /dev/null @@ -1 +0,0 @@ -libattr 1 libattr1 (>= 2.4.4-1) diff --git a/doc/CHANGES b/doc/CHANGES index 20b4176..e400842 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,3 +1,7 @@ +attr-2.4.30 (15 February 2006) + - Debian packaging updates (debmake out, debhelper in) + - Skip SGI DMF attributes when copying attrs between files. + attr-2.4.29 (31 January 2006) - Updated Polish translation. Thanks to Jakub Bogusz <qboosh@pld-linux.org> for this. diff --git a/include/buildmacros b/include/buildmacros index 41a4ef9..928f24f 100644 --- a/include/buildmacros +++ b/include/buildmacros @@ -56,7 +56,6 @@ INSTALL_LTLIB = \ cd $(TOPDIR)/$(LIBNAME)/.libs; \ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \ - test "$(PKG_DISTRIBUTION)" = debian || \ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR) endif |