From 2082d20eacc576f94eb3dbc7d5040946b3930943 Mon Sep 17 00:00:00 2001
From: nd <git@notandy.de>
Date: Sat, 31 Jul 2021 20:30:50 +0200
Subject: [PATCH] move changelog to top level
---
.gitlab-ci.yml | 1 +
CHANGELOG | 11 +++++++++++
debian/changelog | 5 -----
debian/rules | 2 +-
uffd/__init__.py | 2 +-
5 files changed, 14 insertions(+), 7 deletions(-)
create mode 100644 CHANGELOG
delete mode 100644 debian/changelog
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95ba6974..022ed526 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,6 +30,7 @@ build:apt:
script:
- apt update
- apt-get install -y python3-all debhelper python3-pip git-buildpackage
+ - cp CHANGELOG debian/changelog
- export PYBUILD_INSTALL_ARGS="--install-lib=/usr/share/uffd/ --install-scripts=/usr/share/uffd/"
- gbp dch --ignore-branch --debian-tag=v%\(version\)s
- dpkg-buildpackage -us -uc
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 00000000..a73f34f9
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,11 @@
+uffd (0.2.0) unstable; urgency=medium
+
+ * Working debian packages
+
+ -- CCCV <it@cccv.de> Sat, 31 Jul 2021 20:26:25 +0200
+
+uffd (0.1.2) unstable; urgency=medium
+
+ * Initial release.
+
+ -- Andreas Valder <nd@cccv.de> Fri, 30 Jul 2021 23:02:31 +0200
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 8ec8f739..00000000
--- a/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-uffd (0.1.2) unstable; urgency=medium
-
- * Initial release.
-
- -- Andreas Valder <nd@cccv.de> Fri, 31 Jul 2021 23:02:31 +0200
diff --git a/debian/rules b/debian/rules
index 51a9034e..5a90f13d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-export DH_VERBOSE = 1
+#export DH_VERBOSE = 1
export PYBUILD_NAME=uffd
diff --git a/uffd/__init__.py b/uffd/__init__.py
index 6550124c..7a1f027a 100644
--- a/uffd/__init__.py
+++ b/uffd/__init__.py
@@ -63,7 +63,7 @@ def create_app(test_config=None): # pylint: disable=too-many-locals
# We might only have read access to app.instance_path
try:
os.makedirs(app.instance_path, exist_ok=True)
- except:
+ except: # pylint: disable=bare-except
pass
db.init_app(app)
--
GitLab