From f1cfd7f22562bceb15f846d8fa2dff58a98c6756 Mon Sep 17 00:00:00 2001 From: "Robert S. Edmonds" Date: Thu, 8 Aug 2013 18:44:34 -0400 Subject: [PATCH] debian/: try to fix _version.py handling --- debian/_version.py | 4 ++++ debian/_version.py.pre | 4 ---- debian/bup.install | 1 + debian/rules | 13 ++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 debian/_version.py delete mode 100644 debian/_version.py.pre create mode 100644 debian/bup.install diff --git a/debian/_version.py b/debian/_version.py new file mode 100644 index 0000000..f33e6b3 --- /dev/null +++ b/debian/_version.py @@ -0,0 +1,4 @@ + +COMMIT='22a8600f0ea8cddb07d00e253f4c37429cb09590' +NAMES='(tag: bup-0.25-rc2-126-g22a8600)' +DATE='2013-08-08 18:03:42 -0400' diff --git a/debian/_version.py.pre b/debian/_version.py.pre deleted file mode 100644 index 32b02f4..0000000 --- a/debian/_version.py.pre +++ /dev/null @@ -1,4 +0,0 @@ - -COMMIT='$Format:%H$' -NAMES='$Format:%d$' -DATE='$Format:%ci$' diff --git a/debian/bup.install b/debian/bup.install new file mode 100644 index 0000000..ab2d127 --- /dev/null +++ b/debian/bup.install @@ -0,0 +1 @@ +debian/_version.py usr/lib/bup/bup/_version.py diff --git a/debian/rules b/debian/rules index 1e9f364..8c125de 100755 --- a/debian/rules +++ b/debian/rules @@ -1,21 +1,20 @@ #!/usr/bin/make -f +%: + dh $@ --with python2 --parallel + override_dh_auto_configure: - mv lib/bup/_version.py.pre lib/bup/_oldversion.py.pre - cp -p debian/_version.py.pre lib/bup ./configure override_dh_auto_clean: -rm config/config.cmd config/config.h config/config.log config/config.mak config/config.md config/config.sub config/config.vars dh_auto_clean --parallel - if test -f lib/bup/_oldversion.py.pre; then \ - mv lib/bup/_oldversion.py.pre lib/bup/_version.py.pre; \ - fi override_dh_auto_test: if [ "`dpkg-architecture -qDEB_BUILD_ARCH`" != "s390" ]; then \ dh_auto_test --parallel; \ fi -%: - dh $@ --with python2 --parallel +git-update-versionpy: + make lib/bup/_version.py + mv lib/bup/_version.py debian/ -- 2.39.5