RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

packaging: remove last vestiges of python2

This commit is contained in:
Peter F. Patel-Schneider 2020-02-20 14:36:51 -05:00 committed by Filipe Laíns
parent d439d43be6
commit a5813e4e23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packaging/build_deb.sh
View File

@ -34,8 +34,8 @@ DIST_DIR="$PWD/dist"
# Build a python sdist package, then unpack and create .orig and source dir. # Build a python sdist package, then unpack and create .orig and source dir.
# #
P_NAME="$(python2.7 setup.py --name)" P_NAME="$(python3 setup.py --name)"
P_VERSION="$(python2.7 setup.py --version)" P_VERSION="$(python3 setup.py --version)"
SDIST_FILE="$DIST_DIR/$P_NAME-$P_VERSION.tar.gz" SDIST_FILE="$DIST_DIR/$P_NAME-$P_VERSION.tar.gz"
ORIG_FILE="$DIST_DIR/${P_NAME}_${P_VERSION}.orig.tar.gz" ORIG_FILE="$DIST_DIR/${P_NAME}_${P_VERSION}.orig.tar.gz"
@ -48,7 +48,7 @@ fi
export TMPDIR="$(/bin/mktemp --directory --tmpdir debbuild-$P_NAME-$P_VERSION-$USER-XXXXXX)" export TMPDIR="$(/bin/mktemp --directory --tmpdir debbuild-$P_NAME-$P_VERSION-$USER-XXXXXX)"
./tools/po-compile.sh ./tools/po-compile.sh
python2.7 setup.py sdist --formats=gztar --quiet python3 setup.py sdist --formats=gztar --quiet
/bin/tar --extract --gunzip --file "$SDIST_FILE" --directory "$DIST_DIR" /bin/tar --extract --gunzip --file "$SDIST_FILE" --directory "$DIST_DIR"
test -d "$BUILD_DIR" test -d "$BUILD_DIR"

6
packaging/debian/rules
View File

@ -9,10 +9,10 @@ PREFIX = /usr
%: %:
# Adding the required helpers # Adding the required helpers
dh $@ --with=python2 dh $@ --with=python3
override_dh_auto_install: override_dh_auto_install:
dh_auto_install -- --prefix=$(PREFIX) --install-lib=$(PREFIX)/share/solaar/lib dh_auto_install -- --prefix=$(PREFIX) --install-lib=$(PREFIX)/share/solaar/lib
override_dh_python2: override_dh_python3:
dh_python2 $(PREFIX)/share/solaar/lib dh_python3 $(PREFIX)/share/solaar/lib