diff --git a/debian/changelog b/debian/changelog index b364398..8a91bdf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ * New upstream bugfix release + Remove show-redirect-page-corvid.diff (applied upstream) * Replace "dh_clean -k" with "dh_prep" + * Store dillo.png directly instead of uuencoded. + + Remove sharutils from build dependencies -- Axel Beckert Tue, 06 Dec 2011 22:33:02 +0100 diff --git a/debian/control b/debian/control index ea976ea..b827735 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: extra Maintainer: Axel Beckert Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 5), libfltk1.3-dev, libglib2.0-dev, libpng12-dev, zlib1g-dev, libjpeg8-dev | libjpeg-dev, autotools-dev, libssl-dev, sharutils +Build-Depends: debhelper (>= 5), libfltk1.3-dev, libglib2.0-dev, libpng12-dev, zlib1g-dev, libjpeg8-dev | libjpeg-dev, autotools-dev, libssl-dev Homepage: http://www.dillo.org/ Vcs-Git: git://anonscm.debian.org/collab-maint/dillo.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/dillo.git diff --git a/debian/dillo.png b/debian/dillo.png new file mode 100644 index 0000000..bcb89a3 Binary files /dev/null and b/debian/dillo.png differ diff --git a/debian/dillo.uuencode b/debian/dillo.uuencode deleted file mode 100644 index f5d7fe0..0000000 --- a/debian/dillo.uuencode +++ /dev/null @@ -1,126 +0,0 @@ -begin-base64 644 dillo.png -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 -KVNkj3XG/e0AAAAASUVORK5CYII= -==== diff --git a/debian/rules b/debian/rules index 8d472fe..5f1f410 100755 --- a/debian/rules +++ b/debian/rules @@ -49,9 +49,9 @@ -rm -rf debian/dillo debian/files* core debian/substvars debian/prerm.debhelper debian/*postinst.debhelper debian/*postrm.debhelper -rm -f `find . -name "*.o"` `find . -name "*.dpi"` `find . -name "*.a"` -rm -f `find . -name "*.gmo"` src/dillo dpid/dpid config/dillocfg - -rm -f config.log debian/dillo.png + -rm -f config.log #-rm -f `find . -name "Makefile.in"` config.guess config.sub configure - #-rm -f depcomp install-sh missing aclocal.m4 debian/dillo.png + #-rm -f depcomp install-sh missing aclocal.m4 [ ! -f Makefile ] || $(MAKE) clean [ ! -f config.h.in.backup ] || mv -v config.h.in.backup config.h.in dh_autotools-dev_restoreconfig @@ -77,8 +77,6 @@ dh_installmenu dh_installman doc/dillo.1 install -m644 -D debian/dillo.desktop debian/dillo/usr/share/applications/dillo.desktop - # Decode png icon - uudecode debian/dillo.uuencode -o debian/dillo.png # Install icons install -m644 -D debian/dillo.xpm debian/dillo/usr/share/pixmaps/dillo.xpm install -m644 -D debian/dillo.png debian/dillo/usr/share/pixmaps/dillo.png