diff -u checkinstall-1.6.1/debian/changelog checkinstall-1.6.1/debian/changelog --- checkinstall-1.6.1/debian/changelog +++ checkinstall-1.6.1/debian/changelog @@ -1,3 +1,11 @@ +checkinstall (1.6.1-8ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #258727) + - Use /usr/bin/which instead of which. + * Removed patch 18fix-locale-charset.diff to fix FTBFS. + + -- Bhavani Shankar Sun, 07 Sep 2008 20:30:48 +0530 + checkinstall (1.6.1-8) unstable; urgency=low * Recommend make since it's the most used install tool. (Closes: #487964). @@ -8,6 +16,15 @@ -- Felipe Sateler Thu, 24 Jul 2008 14:34:06 -0400 +checkinstall (1.6.1-7ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes (LP: #243132): + - Use /usr/bin/which instead of which. + - add make to Depends, checkinstall doesn't work without it. + - Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Nathan Handler Thu, 10 Jul 2008 13:44:30 -0500 + checkinstall (1.6.1-7) unstable; urgency=high * Use mktemp instead of awk magic to create temporary directories. @@ -30,6 +47,16 @@ -- Felipe Sateler Thu, 12 Jun 2008 08:57:53 -0400 +checkinstall (1.6.1-5ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Use /usr/bin/which instead of which. (LP: #4423) + - add make to Depends, checkinstall doesn't work without it. (LP: #3142) + - Modify Maintainer value to match Debian-Maintainer-Field Spec + * Debian version fixes LP: #160475 + + -- Albin Tonnerre Sun, 18 Nov 2007 14:05:51 +0100 + checkinstall (1.6.1-5) unstable; urgency=low * Fix typo: striping -> stripping. @@ -41,6 +68,16 @@ -- Felipe Sateler Tue, 13 Nov 2007 10:29:15 -0300 +checkinstall (1.6.1-4ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Use /usr/bin/which instead of which. (LP: #4423) + - add make to Depends, checkinstall doesn't work without it. (LP: #3142) + - Modify Maintainer value to match Debian-Maintainer-Field Spec + * Debian version fixes LP: #115107 + + -- Albin Tonnerre Wed, 22 Aug 2007 11:59:23 +0200 + checkinstall (1.6.1-4) unstable; urgency=low * Fix access() filtering in checkinstall. @@ -53,6 +90,15 @@ -- Felipe Sateler Fri, 10 Aug 2007 20:56:47 -0400 +checkinstall (1.6.1-3ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Use /usr/bin/which instead of which. (LP: #4423) + - add make to Depends, checkinstall doesn't work without it. (LP: #3142) + - Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Albin Tonnerre Mon, 7 May 2007 22:56:46 +0200 + checkinstall (1.6.1-3) unstable; urgency=low * Fix FTBFS in some archs, by fixing the build dependencies. @@ -60,6 +106,16 @@ -- Felipe Sateler Fri, 04 May 2007 13:17:01 -0400 +checkinstall (1.6.1-2ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Use /usr/bin/which instead of which. (Malone: #4423) + - add make to Depends, checkinstall doesn't work without it. + (Malone: #3142) + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Albin Tonnerre Wed, 2 May 2007 10:45:03 +0200 + checkinstall (1.6.1-2) unstable; urgency=low * Avoid shell command reinterpretation. @@ -86,6 +142,15 @@ -- Felipe Sateler Sat, 21 Apr 2007 16:12:41 -0400 +checkinstall (1.6.1-1ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Use /usr/bin/which instead of which. (Malone: #4423) + - add make to Depends, checkinstall doesn't work without it. + (Malone: #3142) + + -- Timo Aaltonen Wed, 20 Dec 2006 17:39:31 +0200 + checkinstall (1.6.1-1) unstable; urgency=low * New upstream release. @@ -97,6 +162,12 @@ -- Felipe Sateler Wed, 6 Dec 2006 00:02:32 -0300 +checkinstall (1.6.0-2ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Steve Kowalik Sat, 26 Aug 2006 21:04:39 +1000 + checkinstall (1.6.0-2) unstable; urgency=low * Fix temporary script deletion (Thanks to David Jarvie for the patch) @@ -118,6 +189,12 @@ -- Felipe Sateler Mon, 21 Aug 2006 20:18:19 -0400 +checkinstall (1.6.0-1ubuntu1) edgy; urgency=low + + * Merge from Debian unstable. + + -- Steve Kowalik Thu, 6 Jul 2006 16:20:50 +1000 + checkinstall (1.6.0-1) unstable; urgency=low * Taken over checkinstall and installwatch. @@ -138,6 +215,23 @@ -- Felipe Sateler Tue, 10 Jan 2006 21:19:26 -0300 +checkinstall (1.5.3-3ubuntu2) dapper; urgency=low + + * Use /usr/bin/which instead of which. (Malone: #4423) + * Correct path for installwatch.so. (Malone: #29536) + + -- Steve Kowalik Sat, 22 Apr 2006 17:28:22 +1000 + +checkinstall (1.5.3-3ubuntu1) dapper; urgency=low + + * debian/control: + -added make to Depends, checkinstall doesn't work without it. + (Closes: Malone #3142) + -added Homepage to description + -bumped Standards-Version to 3.6.2 + + -- Loic Pefferkorn Fri, 28 Oct 2005 14:57:08 +0200 + checkinstall (1.5.3-3) unstable; urgency=medium * Applied patch from "Martin H" to fix doc installation @@ -201,6 +295,7 @@ (Closes: Bug#122914) -- Matt Hope Sat, 29 Jun 2002 15:38:08 +1000 + checkinstall (1.5.3-2) unstable; urgency=low * Default installation type is now debian in /etc/checkinstall @@ -254,0 +350 @@ + diff -u checkinstall-1.6.1/debian/control checkinstall-1.6.1/debian/control --- checkinstall-1.6.1/debian/control +++ checkinstall-1.6.1/debian/control @@ -1,7 +1,8 @@ Source: checkinstall Section: admin Priority: optional -Maintainer: Felipe Sateler +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Felipe Sateler Build-Depends: debhelper (>= 4.0.0), gettext, docbook-to-man, libc6-dev (>= 2.5) [!alpha !ia64 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libc6.1-dev (>= 2.5) [alpha ia64], quilt Standards-Version: 3.8.0 Vcs-Git: git://git.debian.org/git/collab-maint/checkinstall.git @@ -11,7 +12,6 @@ Package: checkinstall Architecture: any Depends: ${shlibs:Depends}, file, findutils (>= 4.2), dpkg-dev -Recommends: make Suggests: gettext Replaces: installwatch Conflicts: installwatch diff -u checkinstall-1.6.1/debian/patches/series checkinstall-1.6.1/debian/patches/series --- checkinstall-1.6.1/debian/patches/series +++ checkinstall-1.6.1/debian/patches/series @@ -20,3 +20,2 @@ 17dont-strip-installwatch.diff -18fix-locale-charset.diff 19safe-temp-dir.diff reverted: --- checkinstall-1.6.1/debian/patches/18fix-locale-charset.diff +++ checkinstall-1.6.1.orig/debian/patches/18fix-locale-charset.diff @@ -1,26 +0,0 @@ -Index: checkinstall/locale/checkinstall-de.po -=================================================================== ---- checkinstall.orig/locale/checkinstall-de.po 2008-06-25 20:10:42.000000000 -0400 -+++ checkinstall/locale/checkinstall-de.po 2008-06-25 20:11:04.000000000 -0400 -@@ -16,7 +16,7 @@ - "Last-Translator: Andreas Muck \n" - "Language-Team: DE \n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=CHARSET\n" -+"Content-Type: text/plain; charset=iso-8859-15\n" - "Content-Transfer-Encoding: 8bit\n" - - msgid " This software is released under the GNU GPL." -Index: checkinstall/locale/checkinstall-es.po -=================================================================== ---- checkinstall.orig/locale/checkinstall-es.po 2008-06-25 20:10:16.000000000 -0400 -+++ checkinstall/locale/checkinstall-es.po 2008-06-25 20:10:37.000000000 -0400 -@@ -11,7 +11,7 @@ - "Last-Translator: Felipe Eduardo Sanchez Diaz Duran \n" - "Language-Team: ES \n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=CHARSET\n" -+"Content-Type: text/plain; charset=iso-8859-1\n" - "Content-Transfer-Encoding: 8bit\n" - - msgid " This software is released under the GNU GPL." only in patch2: unchanged: --- checkinstall-1.6.1.orig/checkinstall +++ checkinstall-1.6.1/checkinstall @@ -893,7 +893,7 @@ if [ -x "$EDITOR" ]; then VISUAL=$EDITOR else - VISUAL=`which vi` + VISUAL=`/usr/bin/which vi` fi fi @@ -905,7 +905,7 @@ if [ "$TAR" ]; then ! [ -x "$TAR" ] && BADTAR=1 else - TAR=`which tar-1.13 2> /dev/null` + TAR=`/usr/bin/which tar-1.13 2> /dev/null` fi if ! [ -x "$TAR" ]; then @@ -1826,7 +1826,7 @@ if [ $INSTALL -gt 0 ]; then # Verify that we have the "installpkg" command in our path - INSTALLPKG_PATH=`which installpkg 2> /dev/null` + INSTALLPKG_PATH=`/usr/bin/which installpkg 2> /dev/null` if ! [ -x "$INSTALLPKG_PATH" ]; then echo @@ -2033,7 +2033,7 @@ # Verify that we have the rpm command in our path -RPM_PATH=`which rpm 2> /dev/null` +RPM_PATH=`/usr/bin/which rpm 2> /dev/null` if ! [ -x "$RPM_PATH" ]; then echo @@ -2083,7 +2083,7 @@ RPMBUILD="rpm" fi -if [ "$RPMBUILD" = "rpmbuild" -a ! -x "`which rpmbuild 2> /dev/null`" ]; then +if [ "$RPMBUILD" = "rpmbuild" -a ! -x "`/usr/bin/which rpmbuild 2> /dev/null`" ]; then echo echo "*** The \"rpmbuild\" program is not in your PATH!" echo @@ -2311,7 +2311,7 @@ # Verify that we have the dpkg command in our path -DPKG_PATH=`which dpkg 2> /dev/null` +DPKG_PATH=`/usr/bin/which dpkg 2> /dev/null` if ! [ -x "$DPKG_PATH" ]; then echo only in patch2: unchanged: --- checkinstall-1.6.1.orig/locale/checkinstall-de.po +++ checkinstall-1.6.1/locale/checkinstall-de.po @@ -16,7 +16,7 @@ "Last-Translator: Andreas Muck \n" "Language-Team: DE \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8bit\n" msgid " This software is released under the GNU GPL." only in patch2: unchanged: --- checkinstall-1.6.1.orig/locale/checkinstall-es.po +++ checkinstall-1.6.1/locale/checkinstall-es.po @@ -11,7 +11,7 @@ "Last-Translator: Felipe Eduardo Sanchez Diaz Duran \n" "Language-Team: ES \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" msgid " This software is released under the GNU GPL."