added conflict with acpi-supportv0.7-2

9 files changed, 45 insertions, 43 deletions

diff --git a/debian/changelog b/debian/changelog
index bcd2ac1..3873d92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-my-x200 (0.7-1) UNRELEASED; urgency=medium
+my-x200 (0.7-2) UNRELEASED; urgency=medium
 
   * Initial release.
   * Removed remnant lines left of openrc-run in initd file
   * Added elogind as dependency
   * New acpi event: button/suspend
+  * Added conflict with acpi-support
 
- -- Robert Alessi <alessi@robertalessi.net>  Sat, 13 Feb 2021 09:47:12 +0100
+ -- Robert Alessi <alessi@robertalessi.net>  Sat, 13 Feb 2021 17:01:19 +0100
diff --git a/debian/control b/debian/control
index 0868d57..f9d77c6 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Package: my-x200
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, intel-gpu-tools, rsync,
   elogind, macchanger, rfkill, acpi-support-base
+Conflicts: acpi-support
 Recommends: rsnapshot
 Description: Service dedicated to Thinkpads X200
  my-x200 is a simple service primarily designed to make the
diff --git a/my-x200_0.7-1.debian.tar.xz b/my-x200_0.7-1.debian.tar.xz
deleted file mode 100644
index d9fa86d..0000000
--- a/my-x200_0.7-1.debian.tar.xz
+++ /dev/null
diff --git a/my-x200_0.7-1.dsc b/my-x200_0.7-1.dsc
deleted file mode 100644
index 0dd3c29..0000000
--- a/my-x200_0.7-1.dsc
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-Format: 3.0 (quilt)
-Source: my-x200
-Binary: my-x200
-Architecture: any
-Version: 0.7-1
-Maintainer: Robert Alessi <alessi@robertalessi.net>
-Homepage: http://git.robertalessi.net/my-x200
-Standards-Version: 4.3.0
-Build-Depends: debhelper (>= 10)
-Package-List:
- my-x200 deb misc optional arch=any
-Checksums-Sha1:
- 053883962f1d18f0c4764c3e2f6bcc8df7b9be45 16110 my-x200_0.7.orig.tar.gz
- df92deca5f212a77e6be744656eec76ba1bf2af2 1464 my-x200_0.7-1.debian.tar.xz
-Checksums-Sha256:
- e7dd781f4ef79e42446bb600ca2de1fcd839de6d834862dd810a6583292d5039 16110 my-x200_0.7.orig.tar.gz
- bf17c5fb0247982a7ecafe50d22b493e5ad08d83a84166f027fdc54d1aa155b0 1464 my-x200_0.7-1.debian.tar.xz
-Files:
- 0cc9f13e9d20ae5298e02a3bde770ad8 16110 my-x200_0.7.orig.tar.gz
- 644a1b776c3657c38ad3065fc3bdc012 1464 my-x200_0.7-1.debian.tar.xz
-
------BEGIN PGP SIGNATURE-----
-
-iQJMBAEBCAA2FiEERaXhpjEUeDwRCTLxF3PpJICFyMcFAmAn9QQYHGFsZXNzaUBy
-b2JlcnRhbGVzc2kubmV0AAoJEBdz6SSAhcjHOrIQAKZUOOkWZ84X8BIfAVvwnfv1
-Aae2jWhw9O6Jg/hH9xDm6uAXhYqaiimIqQq1a/5K1eG8efBu9gxzPocqsljQA0n5
-cF/LQgx0Npj9ZH3IV2wYhXesCtG2VxfEzqa2Si7QTA5QyH45cdNu419c5mBOR1RZ
-5zfjtQiPH5aRabRdXxEgvS951rpBp2KP4HFPDlZjZAxSLRCLPTi35UvsDuXBcg31
-FYcD7WiNR7/DWgsIDPzvRZuf3lX3I0vpPRSOGybEbj3rg4wM0TzLrcjr44A09pOq
-PvQ3SgVl8hNgi2QsmN92nbVbmcm6s4ux+UOims4bGm4hxd8hJccOjMXZPdjW/uT9
-lQKAZAoDL4BUQfLVNkJvM9kKyR+qSmlqZJMl71BM5AbIs27nOCuZFvnbup8WdcZw
-iShvKSX/aKjxCw7ygPi+XbHzZ8RWIptUUn0KOTMyZTjZX8mdr1i2mytLkaq+eQqW
-I1FkoQUIFI5n4e23vZQj2BtjtahBEZ5yBLlKrO00QtO/5hf2o2mVQ9LL/BuhLCUr
-p0JMTKnLd9H6z576IkXTOpkeyz3XBbr1lJhKE4UQxUU6S7DWu8X50z8Hu1KqwKA0
-GscoDWNeCizL3SPlk1EMDSDPqwdDHyyHLKq3nBnbZq4ybhbx2tRDXbA9aKwXELg0
-EC9AdEQs5EuXWcotlHY1
-=900L
------END PGP SIGNATURE-----
diff --git a/my-x200_0.7-1_amd64.deb b/my-x200_0.7-1_amd64.deb
deleted file mode 100644
index 47a2f9a..0000000
--- a/my-x200_0.7-1_amd64.deb
+++ /dev/null
diff --git a/my-x200_0.7-2.debian.tar.xz b/my-x200_0.7-2.debian.tar.xz
new file mode 100644
index 0000000..1aed498
--- /dev/null
+++ b/my-x200_0.7-2.debian.tar.xz
diff --git a/my-x200_0.7-2.dsc b/my-x200_0.7-2.dsc
new file mode 100644
index 0000000..90dc184
--- /dev/null
+++ b/my-x200_0.7-2.dsc
@@ -0,0 +1,41 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+Format: 3.0 (quilt)
+Source: my-x200
+Binary: my-x200
+Architecture: any
+Version: 0.7-2
+Maintainer: Robert Alessi <alessi@robertalessi.net>
+Homepage: http://git.robertalessi.net/my-x200
+Standards-Version: 4.3.0
+Build-Depends: debhelper (>= 10)
+Package-List:
+ my-x200 deb misc optional arch=any
+Checksums-Sha1:
+ 82dc31efabd4a7493c9d4737cae2dc942ff5f31b 7992 my-x200_0.7.orig.tar.gz
+ 90fa97683d4a58cbf85e92753addd90f7958de2a 1508 my-x200_0.7-2.debian.tar.xz
+Checksums-Sha256:
+ 172e2379d070f2bd49609fb892e4ff0de5975efb654d97f68671fba51d3d2255 7992 my-x200_0.7.orig.tar.gz
+ f133ac6eb5511575ada8d3f72cec61360440f9ac6c3f9b6d4e346f977403a007 1508 my-x200_0.7-2.debian.tar.xz
+Files:
+ c23018e118c3b1f7bd1831b222603401 7992 my-x200_0.7.orig.tar.gz
+ f4d691f876cebc5edd571100045a4ef2 1508 my-x200_0.7-2.debian.tar.xz
+
+-----BEGIN PGP SIGNATURE-----
+
+iQJMBAEBCAA2FiEERaXhpjEUeDwRCTLxF3PpJICFyMcFAmAn+NgYHGFsZXNzaUBy
+b2JlcnRhbGVzc2kubmV0AAoJEBdz6SSAhcjHEygP/jTMM/0+NjhZ+eKDTiAvJMMI
+MfiWDjk7pyc0yP6Xs5kH7Dx05WpgQUQVntMGu+/6i6d5nbPfRmtNeAG3QpiN+isZ
+ivF2Z+yCj0qEKqaK41DSvh2E3PnWZv7/mOfvKsg6B3Qa3Z8BPe9j/f+7bLqrPGn1
+4DrJBNg5AzDSzvJ7LMfT4zpL2NfBoYn4PfCFraUgCrNC99vRTI27VfcIOCtV6QaE
+xEG2BOISmh6e5lk2d8nq2UzzsSsKCuQZ4iHQGdWiCUM0VWfPehGoZB8AhxlXeLkb
+VMtgLqAYAGXI9xDP2dR62rDWHBxCbTUaWhfwNZOvlZ+F03pxRp+2J2LO3OdfHJpQ
+sxXTw5OHqTcMuTCCsEvmfs3Db+UfTFCIRn26eb9lzcfnUfE0gPOp6USScttd1+cx
+S3CP1jsVdcjn6GbJWnSZ3PNNu19Nz5kukd+rdu3IDkOoCMbVYA+OBzzCL8l3gQPG
+/+wzGgagyvpJV5FRSW32l4OwZ5L37LRk6Ke0CLS9tvahsMRHo4CJhGVkU1LPUXop
+zVwctkfVAtBmMYlFNmu27clVoStsHIxmK/ESHecW3q4PIWoaByj2LlPBg8wYyue8
+FLA/DbGUP64kV5T3wu36wbT9PpY9iWcPnFu8nmnI6M8MTu6TId7J2/AEsqOMviie
+bn4QfYBj4IYNNkLbKDe/
+=XpnR
+-----END PGP SIGNATURE-----
diff --git a/my-x200_0.7-2_amd64.deb b/my-x200_0.7-2_amd64.deb
new file mode 100644
index 0000000..579b65d
--- /dev/null
+++ b/my-x200_0.7-2_amd64.deb
diff --git a/my-x200_0.7.orig.tar.gz b/my-x200_0.7.orig.tar.gz
index 294a7d9..085eacd 100644
--- a/my-x200_0.7.orig.tar.gz
+++ b/my-x200_0.7.orig.tar.gz