summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2011-06-12 13:17:25 +0100
committerLars Wirzenius <liw@liw.fi>2011-06-12 13:17:25 +0100
commit6123ea7746b621be8a5e8e12c4ff58f6d1d6ddaa (patch)
tree7e6f7b3c9481e3cbaa070311a1f8178de0c67cd6
parent52995dda6d68ca0f407fe9fe91c44d6df88452ef (diff)
downloaddupfiles-6123ea7746b621be8a5e8e12c4ff58f6d1d6ddaa.tar.gz
* New upstream version.dupfiles-5.4
* Update packaging to use dh_python2.
-rw-r--r--Makefile11
-rw-r--r--debian/changelog7
-rw-r--r--debian/control9
-rwxr-xr-xdebian/rules8
4 files changed, 13 insertions, 22 deletions
diff --git a/Makefile b/Makefile
index a7d4a77..aed2a72 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,5 @@
-prefix = /usr/local
-bindir = $(prefix)/bin
-mandir = $(prefix)/share/man
-man1dir = $(mandir)/man1
-
all:
-install:
- install -d $(bindir)
- install dupfiles $(bindir)
- install -d $(man1dir)
- install dupfiles.1 $(man1dir)
-
check:
./testit
diff --git a/debian/changelog b/debian/changelog
index fa61ee1..08fa06b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dupfiles (5.4) squeeze; urgency=low
+
+ * New upstream version.
+ * Update packaging to use dh_python2.
+
+ -- Lars Wirzenius <liw@liw.fi> Sun, 12 Jun 2011 13:17:22 +0100
+
dupfiles (5.3) squeeze; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index f14cf1c..de232a9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,14 @@ Maintainer: Lars Wirzenius <liw@liw.fi>
Section: misc
Priority: optional
Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 7.3.8), python-support (>= 1.0.3),
- python (>= 2.5), python-cliapp (>= 0.4)
+Build-Depends: debhelper (>= 7.3.8), python-all (>= 2.6),
+ python-cliapp (>= 0.7)
+X-Python-Version: >= 2.6
Package: dupfiles
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python (>= 2.5),
- python-progressbar, python-cliapp (>= 0.4)
+Depends: ${python:Depends}, ${misc:Depends}, python (>= 2.6),
+ python-ttystatus, python-cliapp (>= 0.7)
Description: find and optionally hard-link duplicate files
dupfiles finds files with identical content, and either reports them,
or hardlinks them to each other.
diff --git a/debian/rules b/debian/rules
index bb9b499..46bf560 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,4 @@
#!/usr/bin/make -f
%:
- dh $@ --with-buildsystem=python-distutils
+ dh $@ --with=python2 --buildsystem=python_distutils
-override_dh_auto_build:
- setuppy-debian-versions-match
- dh_auto_build $@ --with-buildsystem=python-distutils
-
-override_dh_auto_install:
- python setup.py install --prefix=debian/dupfiles/usr