Bump version to 1.68.2+dfsg1-1~exp1

diff --git a/debian/changelog b/debian/changelog
index 74b1971f3793069747e18b768d0260d4f6aa878d..ea80b31110556cf6b3a09ca3dd9ac1ffdb523a2e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rustc (1.68.2+dfsg1-1~exp1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Update patches to adapt to upstream test path change
+
+ -- Eric Long <i@hack3r.moe>  Thu, 27 Jul 2023 22:50:07 +0800
+
 rustc (1.67.1+dfsg1-1~exp1) experimental; urgency=medium
 
   [ Fabian Grünbichler ]

diff --git a/debian/control b/debian/control
index 590f09bbe03aa915d1917216fcf5e77c809115f9..d0866ecc364b355597d2d7c8c7b3f94134d27eb9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends:
  dpkg-dev (>= 1.17.14),
  python3:native,
  cargo:native (>= 0.60.0)      <!pkg.rustc.dlstage0>,
- rustc:native (>= 1.66.0+dfsg) <!pkg.rustc.dlstage0>,
- rustc:native (<= 1.67.1++)    <!pkg.rustc.dlstage0>,
+ rustc:native (>= 1.67.0+dfsg) <!pkg.rustc.dlstage0>,
+ rustc:native (<= 1.68.2++)    <!pkg.rustc.dlstage0>,
  llvm-15-dev:native,
  llvm-15-tools:native,
  gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>,
@@ -41,6 +41,8 @@ Build-Depends:
 Build-Depends-Indep:
  wasi-libc (>= 0.0~git20221206.8b7148f~~) <!nowasm>,
  wasi-libc (<= 0.0~git20221206.8b7148f++) <!nowasm>,
+# wasi-libc (>= 0.0~gitFIXME.4362b18~~) <!nowasm>,
+# wasi-libc (<= 0.0~gitFIXME.4362b18++) <!nowasm>,
  clang-15:native,
 Build-Conflicts: gdb-minimal <!nocheck>
 Standards-Version: 4.2.1
@@ -56,7 +58,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libstd-rust-dev (= ${binary:Version}),
  gcc, libc-dev, binutils (>= 2.26)
 Recommends:
- cargo (>= 0.68.0~~), cargo (<< 0.69.0~~),
+ cargo (>= 0.69.0~~), cargo (<< 0.70.0~~),
 # llvm is needed for llvm-dwp for -C split-debuginfo=packed
  llvm-15,
 Suggests:
@@ -77,7 +79,7 @@ Description: Rust systems programming language
  generic programming and meta-programming, in both static and dynamic
  styles.
 
-Package: libstd-rust-1.67
+Package: libstd-rust-1.68
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -104,7 +106,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libstd-rust-1.67 (= ${binary:Version}),
+ libstd-rust-1.68 (= ${binary:Version}),
 Description: Rust standard libraries - development files
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -267,7 +269,7 @@ Package: rust-clippy
 Architecture: any
 Multi-Arch: allowed
 Depends: ${misc:Depends}, ${shlibs:Depends},
- libstd-rust-1.67 (= ${binary:Version})
+ libstd-rust-1.68 (= ${binary:Version})
 Recommends: cargo
 Description: Rust linter
  Rust is a curly-brace, block-structured expression language.  It
@@ -322,7 +324,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
  rust-gdb (>= ${binary:Version}) | rust-lldb (>= ${binary:Version}),
  cargo,
 Recommends:
- cargo (>= 0.68.0~~), cargo (<< 0.69.0~~)
+ cargo (>= 0.69.0~~), cargo (<< 0.70.0~~)
 Suggests:
  rust-doc (>= ${binary:Version}),
  rust-src (>= ${binary:Version}),

diff --git a/debian/libstd-rust-1.67.install b/debian/libstd-rust-1.67.install
deleted file mode 100644 (file)
index cd4545c..0000000
--- a/debian/libstd-rust-1.67.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/

diff --git a/debian/libstd-rust-1.67.lintian-overrides b/debian/libstd-rust-1.67.lintian-overrides
deleted file mode 100644 (file)
index 42712d6..0000000
--- a/debian/libstd-rust-1.67.lintian-overrides
+++ /dev/null
@@ -1,13 +0,0 @@
-# "libstd" just seemed too generic
-libstd-rust-1.67 binary: package-name-doesnt-match-sonames
-libstd-rust-1.67 binary: sharedobject-in-library-directory-missing-soname
-
-# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff
-libstd-rust-1.67 binary: dev-pkg-without-shlib-symlink
-libstd-rust-1.67 binary: shlib-without-versioned-soname
-libstd-rust-1.67 binary: unused-shlib-entry-in-control-file
-
-# Libraries that use libc symbols (libterm, libstd, etc) *are* linked
-# to libc.  Lintian gets upset that some Rust libraries don't need
-# libc, boo hoo.
-libstd-rust-1.67 binary: library-not-linked-against-libc

diff --git a/debian/libstd-rust-1.68.install b/debian/libstd-rust-1.68.install
new file mode 100644 (file)
index 0000000..cd4545c
--- /dev/null
+++ b/debian/libstd-rust-1.68.install
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/

diff --git a/debian/libstd-rust-1.68.lintian-overrides b/debian/libstd-rust-1.68.lintian-overrides
new file mode 100644 (file)
index 0000000..2c67506
--- /dev/null
+++ b/debian/libstd-rust-1.68.lintian-overrides
@@ -0,0 +1,13 @@
+# "libstd" just seemed too generic
+libstd-rust-1.68 binary: package-name-doesnt-match-sonames
+libstd-rust-1.68 binary: sharedobject-in-library-directory-missing-soname
+
+# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff
+libstd-rust-1.68 binary: dev-pkg-without-shlib-symlink
+libstd-rust-1.68 binary: shlib-without-versioned-soname
+libstd-rust-1.68 binary: unused-shlib-entry-in-control-file
+
+# Libraries that use libc symbols (libterm, libstd, etc) *are* linked
+# to libc.  Lintian gets upset that some Rust libraries don't need
+# libc, boo hoo.
+libstd-rust-1.68 binary: library-not-linked-against-libc