summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2023-08-24 08:42:08 +0100
committerSean Whitton <spwhitton@spwhitton.name>2023-08-24 08:42:08 +0100
commita374b10da016f6f8f2c23f9b1816ca7f4be69661 (patch)
tree338cf59c3ef19a0da3c6ae1f67cf5bf6e11ddafa /debian
parentb2b4849d57df695bd1d1286f1fe3eaaf2239ae66 (diff)
parentf4b0b5e20a9e3a6ccce52e41314763cebc8a9769 (diff)
downloademacs-a374b10da016f6f8f2c23f9b1816ca7f4be69661.tar.gz
Merge branch 'athena/unstable' into athena/bookworm-backports
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules2
3 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 60544ead43c..7ab4ea3f4b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+emacs-snapshot (30.1~git20230822.1) unstable; urgency=medium
+
+ * Package git snapshot.
+ * Bump libgccjit dependency for gcc-13 in sid.
+ * Return to pgtk.
+
+ -- Sean Whitton <spwhitton@spwhitton.name> Thu, 24 Aug 2023 08:39:56 +0100
+
emacs-snapshot (30.1~git20230703.1~bpo12+1~athena1) bookworm-backports; urgency=medium
* Rebuild for athena apt repository.
diff --git a/debian/control b/debian/control
index e7106938a29..ec95994c5b2 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
libasound2-dev,
libcairo-dev,
libdbus-1-dev,
- libgccjit-12-dev,
+ libgccjit-13-dev,
libgif-dev,
libgnutls28-dev,
libgmp-dev,
diff --git a/debian/rules b/debian/rules
index 424578fdf22..0cb68380924 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ override_dh_autoreconf:
override_dh_auto_configure:
./configure --prefix=/opt/emacs-snapshot \
- --with-x-toolkit=lucid --with-native-compilation=aot
+ --with-pgtk --with-native-compilation=aot
override_dh_shlibdeps:
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info