summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-12-08 22:36:54 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-12-08 22:37:13 +0000
commit92887b2d262bc3115de5155a74a13153799cba20 (patch)
treec5ed4c900d97f7fb33638212f4c11a0bda36d559
parentReleasing progress-linux version 2.1-2~progress5+u1. (diff)
downloadphpmyadmin-shapefile-92887b2d262bc3115de5155a74a13153799cba20.tar.xz
phpmyadmin-shapefile-92887b2d262bc3115de5155a74a13153799cba20.zip
Merging debian version 2.1-3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog12
-rw-r--r--debian/compat1
-rw-r--r--debian/control4
-rw-r--r--debian/gitlab-ci.yml3
-rw-r--r--debian/upstream/metadata1
5 files changed, 18 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 51da282..c28e6d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+phpmyadmin-shapefile (2.1-3) unstable; urgency=medium
+
+ [ Felipe Sateler ]
+ * Bump debhelper from old 10 to 12.
+ * Set upstream metadata fields: Repository.
+ * Bump Standards-Version
+
+ [ William Desportes ]
+ * Add debian gitlab CI config file
+
+ -- Felipe Sateler <fsateler@debian.org> Sat, 16 Nov 2019 09:22:52 -0300
+
phpmyadmin-shapefile (2.1-2~progress5+u1) engywuck-backports; urgency=medium
* Initial upload to engywuck-backports.
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 4035ae5..dcb6db2 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,12 @@ XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
XSBC-Original-Maintainer: phpMyAdmin Team <team+phpmyadmin@tracker.debian.org>
XSBC-Original-Uploaders: Felipe Sateler <fsateler@debian.org>
Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper-compat (= 12),
pkg-php-tools (>= 1.7~),
phpunit,
php-codecoverage,
phpab,
-Standards-Version: 4.1.4
+Standards-Version: 4.4.1
Homepage: https://github.com/phpmyadmin/shapefile
Vcs-Browser: https://git.progress-linux.org/distributions/engywuck-backports/packages/phpmyadmin-shapefile
Vcs-Git: https://git.progress-linux.org/distributions/engywuck-backports/packages/phpmyadmin-shapefile
diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml
new file mode 100644
index 0000000..0c22dc4
--- /dev/null
+++ b/debian/gitlab-ci.yml
@@ -0,0 +1,3 @@
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..afdf5fc
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1 @@
+Repository: https://github.com/phpmyadmin/shapefile