diff -Nru comix-4.0.4/debian/changelog comix-4.0.4/debian/changelog --- comix-4.0.4/debian/changelog 2016-04-27 08:01:43.000000000 +0000 +++ comix-4.0.4/debian/changelog 2016-02-24 13:16:57.000000000 +0000 @@ -1,3 +1,23 @@ +comix (4.0.4-3) unstable; urgency=low + + * Didn't really add unar support, remove suggestion. + * Disable runtime dependency check at build time again, was enabled + accidentally on changing source format. (Closes: #815785) + + -- Emfox Zhou Wed, 24 Feb 2016 20:37:51 +0800 + +comix (4.0.4-2) unstable; urgency=low + + * Recommend mcomix. PLEASE UPGRADE to mcomix since comix is not + maintained upstream. + * Remove .pyc files. (Closes: #797506, #741237, #758117) + * Suggest unar and unrar-free along with unrar. (Closes: #415915) + * Use dh_prep instead of deprecated dh_clean. + * Remove dh_desktop. + * Bump policy to 3.9.7. + + -- Emfox Zhou Sun, 21 Feb 2016 16:54:39 +0800 + comix (4.0.4-1) unstable; urgency=low * New upstream release diff -Nru comix-4.0.4/debian/compat comix-4.0.4/debian/compat --- comix-4.0.4/debian/compat 2016-04-27 08:01:43.000000000 +0000 +++ comix-4.0.4/debian/compat 2016-02-21 09:01:36.000000000 +0000 @@ -1 +1 @@ -4 +9 diff -Nru comix-4.0.4/debian/control comix-4.0.4/debian/control --- comix-4.0.4/debian/control 2016-04-27 08:01:43.000000000 +0000 +++ comix-4.0.4/debian/control 2016-02-24 12:45:55.000000000 +0000 @@ -2,14 +2,15 @@ Section: x11 Priority: optional Maintainer: Emfox Zhou -Build-Depends: debhelper (>= 4.0.0) +Build-Depends: debhelper (>= 9.0.0) Build-Depends-Indep: python (>= 1.5.3) -Standards-Version: 3.7.2 +Standards-Version: 3.9.7 Package: comix Architecture: all Depends: ${misc:Depends}, python (>= 2.4), python-gtk2 (>= 2.12), python-imaging (>= 1.1.5) -Suggests: unrar, python (>=2.5)|python-sqllite2 +Recommends: mcomix +Suggests: unrar-free | unrar, python (>=2.5)|python-sqllite2 Description: GTK Comic Book Viewer Comix is a comic book viewer. It reads zip, rar, tar, tar.gz and tar.bz2 archives (often called .cbz, .cbr and .cbt) as well as diff -Nru comix-4.0.4/debian/menu comix-4.0.4/debian/menu --- comix-4.0.4/debian/menu 2016-04-27 08:01:43.000000000 +0000 +++ comix-4.0.4/debian/menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -?package(comix):needs="X11" section="Applications/Viewers"\ - title="comix" command="/usr/bin/comix" diff -Nru comix-4.0.4/debian/patches/remove-build-dep-check.patch comix-4.0.4/debian/patches/remove-build-dep-check.patch --- comix-4.0.4/debian/patches/remove-build-dep-check.patch 1970-01-01 00:00:00.000000000 +0000 +++ comix-4.0.4/debian/patches/remove-build-dep-check.patch 2016-02-24 13:13:18.000000000 +0000 @@ -0,0 +1,13 @@ +Upstream original install script check for runtime dependency at build time, +The checking is not necessary and should be removed. +--- a/install.py ++++ b/install.py +@@ -294,7 +294,7 @@ + # Install Comix. + # --------------------------------------------------------------------------- + if args == ['install']: +- check_dependencies() ++ #check_dependencies() + print 'Installing Comix to', install_dir, '...\n' + if not os.access(install_dir, os.W_OK): + print 'You do not have write permissions to', install_dir diff -Nru comix-4.0.4/debian/patches/series comix-4.0.4/debian/patches/series --- comix-4.0.4/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ comix-4.0.4/debian/patches/series 2016-02-24 13:10:44.000000000 +0000 @@ -0,0 +1 @@ +remove-build-dep-check.patch diff -Nru comix-4.0.4/debian/rules comix-4.0.4/debian/rules --- comix-4.0.4/debian/rules 2016-04-27 08:01:43.000000000 +0000 +++ comix-4.0.4/debian/rules 2016-02-21 09:57:51.000000000 +0000 @@ -9,7 +9,13 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -build: +binary-arch: +# We have nothing to do by default. + +binary-indep: +# We have nothing to do by default. + +build: build-arch build-indep dh_testdir # Add here commands to compile the package. @@ -25,12 +31,13 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # Add here commands to install the package into debian/comix. mkdir -p $(CURDIR)/debian/comix/usr python install.py install --dir $(CURDIR)/debian/comix/usr --no-mime + find $(CURDIR)/debian/comix/usr/share/comix -type f -name '*.pyc' -delete install mime/comicthumb $(CURDIR)/debian/comix/usr/bin/comicthumb install -d $(CURDIR)/debian/comix/usr/share/mime/packages install -m 644 mime/comix.xml $(CURDIR)/debian/comix/usr/share/mime/packages/comix.xml @@ -51,7 +58,6 @@ dh_installmime dh_installman mime/comicthumb.1.gz dh_gconf - dh_desktop dh_compress dh_fixperms dh_installdeb @@ -61,4 +67,4 @@ dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build-indep build-arch build clean binary-indep binary-arch binary install configure diff -Nru comix-4.0.4/debian/source/format comix-4.0.4/debian/source/format --- comix-4.0.4/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ comix-4.0.4/debian/source/format 2016-02-21 09:37:50.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru comix-4.0.4/install.py comix-4.0.4/install.py --- comix-4.0.4/install.py 2016-04-27 08:01:43.000000000 +0000 +++ comix-4.0.4/install.py 2009-02-14 11:09:21.000000000 +0000 @@ -294,7 +294,7 @@ # Install Comix. # --------------------------------------------------------------------------- if args == ['install']: -# check_dependencies() + check_dependencies() print 'Installing Comix to', install_dir, '...\n' if not os.access(install_dir, os.W_OK): print 'You do not have write permissions to', install_dir