Merge branch 'debian/experimental' into proxmox/bookworm

diff --git a/debian/changelog b/debian/changelog
index 81d8c6cff1517db0c6d63387c80f2ff9d15e69af..f000881d91b27ec8a5f2ad71b034cf5ff458fd4a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-rustc (1.69.0+dfsg1-1~exp1) UNRELEASED; urgency=medium
+rustc (1.69.0+dfsg1-1~exp1) experimental; urgency=medium
 
   [ Eric Long ]
   * New upstream release
@@ -17,6 +17,12 @@ rustc (1.68.2+dfsg1-1) unstable; urgency=medium
 
  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Sun, 10 Sep 2023 19:22:53 +0200
 
+rustc (1.68.2+dfsg1-1~bpo12+pve1) bookworm; urgency=medium
+
+  * Rebuild for Proxmox Bookworm products
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 03 Aug 2023 09:34:09 +0200
+
 rustc (1.68.2+dfsg1-1~exp1) experimental; urgency=medium
 
   [ Eric Long ]

diff --git a/debian/gbp.conf b/debian/gbp.conf
index d568e69c446fbbc56f246295d1432289f5cce8e9..7feab582269e458c55b116da1c5fe3ab44d20e25 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
-pristine-tar = True
+pristine-tar = False
 ignore-branch = True
 
 [import-orig]
-upstream-branch = upstream/experimental
-debian-branch = debian/experimental
+upstream-branch = proxmox/upstream
+debian-branch = proxmox/bookworm