dpkg (1.13.6) experimental; urgency=low

  The "Just kidding about the God part" Release.

  * Fixed incorrect installation location of /etc/logrotate.d/dpkg caused
    by a mis-understanding of dh_install's abilities.

 -- Scott James Remnant <scott@netsplit.com>  Mon,  6 Jun 2005 05:58:36 +0100

diff --git a/ChangeLog b/ChangeLog
index 4697317197b7a07af59b9165d7928ea740fb046d..d8c0d00de8f6077992e8a0de67f75fd76486aec8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-06-06  Scott James Remnant  <scott@netsplit.com>
 
+       * debian/dpkg.install: Don't use dh_install to copy the logrotate
+       file because it can't rename things.
+       * debian/rules (binary-arch): Install and rename manually instead.
+       * configure.ac: Release 1.13.6 (Brown Paper Bag).
+
+       * configure.ac: Bump version to 1.13.6~.
+
        * configure.ac: Release 1.13.5.
 
 2005-06-06  Philippe Batailler  <philippe.batailler@free.fr>

diff --git a/configure b/configure
index 6cad0fe374371012a03f8e13961899495dc2705b..715b04cd171591e9c928e43145a2202c1527fd27 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dpkg 1.13.5.
+# Generated by GNU Autoconf 2.59 for dpkg 1.13.6.
 #
 # Report bugs to <debian-dpkg@lists.debian.org>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='dpkg'
 PACKAGE_TARNAME='dpkg'
-PACKAGE_VERSION='1.13.5'
-PACKAGE_STRING='dpkg 1.13.5'
+PACKAGE_VERSION='1.13.6'
+PACKAGE_STRING='dpkg 1.13.6'
 PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org'
 
 ac_unique_file="lib/dpkg.h"
@@ -816,7 +816,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dpkg 1.13.5 to adapt to many kinds of systems.
+\`configure' configures dpkg 1.13.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -883,7 +883,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dpkg 1.13.5:";;
+     short | recursive ) echo "Configuration of dpkg 1.13.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1037,7 +1037,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-dpkg configure 1.13.5
+dpkg configure 1.13.6
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1051,7 +1051,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dpkg $as_me 1.13.5, which was
+It was created by dpkg $as_me 1.13.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1841,7 +1841,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dpkg'
- VERSION='1.13.5'
+ VERSION='1.13.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15388,7 +15388,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by dpkg $as_me 1.13.5, which was
+This file was extended by dpkg $as_me 1.13.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15451,7 +15451,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-dpkg config.status 1.13.5
+dpkg config.status 1.13.6
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.ac b/configure.ac
index c49dac0ff9a5f6981b65b63665a432025ed7cb47..4ea68224684f8c9a6a0b0aa34f6ade60ffe8f734 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dpkg], [1.13.5], [debian-dpkg@lists.debian.org])
+AC_INIT([dpkg], [1.13.6], [debian-dpkg@lists.debian.org])
 AC_CONFIG_SRCDIR([lib/dpkg.h])
 AC_CONFIG_MACRO_DIR([m4])
 

diff --git a/debian/changelog b/debian/changelog
index 76fe513a7989135cc34f4b4414fc33cfdca4583c..2ba0f0428feae366f20b6d73d25bb9b0f5d1dc4c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dpkg (1.13.6) experimental; urgency=low
+  
+  The "Just kidding about the God part" Release.
+
+  * Fixed incorrect installation location of /etc/logrotate.d/dpkg caused
+    by a mis-understanding of dh_install's abilities.
+
+ -- Scott James Remnant <scott@netsplit.com>  Mon,  6 Jun 2005 05:58:36 +0100
+
 dpkg (1.13.5) experimental; urgency=low
   
   The "Flatulent Elm of West Ruislip" Release.

diff --git a/debian/dpkg.install b/debian/dpkg.install
index 0807920be3ccd7de9d1676aa5e4cd90ea19fe043..b9f80aaa770d83c8586753a554f9f306f6eaeaee 100644 (file)
--- a/debian/dpkg.install
+++ b/debian/dpkg.install
@@ -1,5 +1,4 @@
 ../dpkg.cfg etc/dpkg
-../dpkg.logrotate etc/logrotate.d/dpkg
 ../archtable usr/share/dpkg
 
 etc/alternatives

diff --git a/debian/rules b/debian/rules
index bff0d54acb9ffba12461ac50b8942eb978d6da42..cb9b41b01f40ee541cc5d94af89f2a1de1ec14ab 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -70,6 +70,8 @@ binary-arch: install
        dh_testdir -a
        dh_testroot -a
        dh_install --sourcedir=debian/tmp -a
+       install -d debian/dpkg/etc/logrotate.d
+       install -m 644 debian/dpkg.logrotate debian/dpkg/etc/logrotate.d/dpkg
 
        dh_installchangelogs -pdpkg ChangeLog
        dh_installdocs -pdpkg