diff -pruN /tmp/icewm-1.2.30/debian/changelog icewm-1.2.30.ubuntu/debian/changelog --- /tmp/icewm-1.2.30/debian/changelog 2007-01-14 22:15:03.000000000 +0100 +++ icewm-1.2.30.ubuntu/debian/changelog 2007-01-14 22:10:10.000000000 +0100 @@ -1,3 +1,10 @@ +icewm (1.2.30-1ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - keep calling dh_iconcache + + -- Lionel Porcheron Sun, 14 Jan 2007 22:09:23 +0100 + icewm (1.2.30-1) unstable; urgency=medium * New upstream release @@ -9,6 +16,13 @@ icewm (1.2.30-1) unstable; urgency=mediu -- Eduard Bloch Tue, 9 Jan 2007 20:23:12 +0100 +icewm (1.2.28-4ubuntu1) feisty; urgency=low + + * Merge from debian unstable: + - keep calling dh_iconcache + + -- Gauvain Pocentek Sun, 10 Dec 2006 10:15:37 +0100 + icewm (1.2.28-4) unstable; urgency=low * cvs_fixes.dpatch: @@ -39,6 +53,13 @@ icewm (1.2.28-2) unstable; urgency=mediu -- Eduard Bloch Sat, 28 Oct 2006 21:35:44 +0200 +icewm (1.2.28-1ubuntu1) edgy; urgency=low + + * Merge from debian unstable: + - Call dh_iconcache in debian/rules + + -- Gauvain Pocentek Mon, 18 Sep 2006 00:46:43 +0100 + icewm (1.2.28-1) unstable; urgency=low * New upstream release @@ -49,6 +70,13 @@ icewm (1.2.28-1) unstable; urgency=low -- Eduard Bloch Sun, 17 Sep 2006 19:17:14 +0200 +icewm (1.2.27-1ubuntu1) edgy; urgency=low + + * Merge from debian unstable: + - Call dh_iconcache in debian/rules + + -- Gauvain Pocentek Thu, 10 Aug 2006 01:13:42 +0100 + icewm (1.2.27-1) unstable; urgency=low * New upstream release @@ -61,6 +89,19 @@ icewm (1.2.26-3) unstable; urgency=low -- Eduard Bloch Fri, 26 May 2006 12:41:50 +0200 +icewm (1.2.26-2ubuntu2) edgy; urgency=low + + * Clean the .diff.gz a bit to let the blade_fixes patch apply correctly and + avoid FTBFS + + -- Gauvain Pocentek Wed, 26 Jul 2006 10:46:21 +0200 + +icewm (1.2.26-2ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Brandon Holtsclaw Mon, 18 Jul 2006 21:15:22 -0500 + icewm (1.2.26-2) unstable; urgency=low * versioned build-dep on libxpm-dev to work around buggy version, build-dep @@ -112,6 +153,12 @@ icewm (1.2.24-1) unstable; urgency=low -- Eduard Bloch Thu, 26 Jan 2006 20:54:11 +0100 +icewm (1.2.23-3ubuntu1) dapper; urgency=low + + * Added dh_iconcache + + -- Brandon Holtsclaw Fri, 28 Apr 2006 06:08:34 -0500 + icewm (1.2.23-3) unstable; urgency=low * Fixed more icon locations in menu and toolbar files. Enabled _our_ toolbar @@ -1408,4 +1455,3 @@ icewm (0.8.8-1) unstable; urgency=low -- Ben J. Ciaccio Wed, 18 Sep 1997 00:50:20 -0800 - diff -pruN /tmp/icewm-1.2.30/debian/rules icewm-1.2.30.ubuntu/debian/rules --- /tmp/icewm-1.2.30/debian/rules 2007-01-14 22:15:03.000000000 +0100 +++ icewm-1.2.30.ubuntu/debian/rules 2007-01-14 22:03:55.000000000 +0100 @@ -229,6 +229,7 @@ binary-arch: build install dh_link -picewm-experimental usr/share/doc/icewm-common usr/share/doc/icewm-experimental dh_installmenu + dh_iconcache dh_installchangelogs -picewm-common CHANGES