diff -Nru binutils-mipsen-1~c1/debian/changelog binutils-mipsen-2~c2/debian/changelog
--- binutils-mipsen-1~c1/debian/changelog	2019-02-01 12:06:58.000000000 +0000
+++ binutils-mipsen-2~c2/debian/changelog	2019-02-10 09:32:27.000000000 +0000
@@ -1,3 +1,14 @@
+binutils-mipsen (2~c2) unstable; urgency=medium
+
+  * Don't build for arm64, ppc64el, mips64el.
+  * Not use nocheck when build.
+  * Use toolchain-team in salsa.
+  * Built-Using use strict dependencies.
+  * Warning instead of error when rebuild with the same
+   version with archive. (Closes: #921682)
+
+ -- YunQiang Su <syq@debian.org>  Sun, 10 Feb 2019 17:32:27 +0800
+
 binutils-mipsen (1~c1) unstable; urgency=medium
 
   * Initial Release. (Closes: #905466)
diff -Nru binutils-mipsen-1~c1/debian/control binutils-mipsen-2~c2/debian/control
--- binutils-mipsen-1~c1/debian/control	2019-02-01 12:06:58.000000000 +0000
+++ binutils-mipsen-2~c2/debian/control	2019-02-10 09:32:27.000000000 +0000
@@ -6,12 +6,12 @@
  dejagnu, chrpath, lsb-release,
  binutils-source (>= 2.31)
 Standards-Version: 4.1.5
-Vcs-Browser: https://salsa.debian.org/debian/binutils-mipsen
-Vcs-Git: https://salsa.debian.org/debian/binutils-mipsen.git
+Vcs-Browser: https://salsa.debian.org/toolchain-team/binutils-mipsen
+Vcs-Git: https://salsa.debian.org/toolchain-team/binutils-mipsen.git
 
 Package: binutils-mips64-linux-gnuabi64
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-common,
   ${shlibs:Depends}, ${extraDepends}
@@ -29,7 +29,7 @@
 Package: binutils-mips64-linux-gnuabi64-dbg
 Section: debug
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-mips64-linux-gnuabi64 (= ${binary:Version})
 Description: GNU binary utilities, for mips64-linux-gnuabi64 target (debug symbols)
@@ -37,7 +37,7 @@
 
 Package: binutils-mips64-linux-gnuabin32
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-common,
   ${shlibs:Depends}, ${extraDepends}
@@ -55,7 +55,7 @@
 Package: binutils-mips64-linux-gnuabin32-dbg
 Section: debug
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-mips64-linux-gnuabin32 (= ${binary:Version})
 Description: GNU binary utilities, for mips64-linux-gnuabin32 target (debug symbols)
@@ -63,7 +63,7 @@
 
 Package: binutils-mips64el-linux-gnuabin32
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-common,
   ${shlibs:Depends}, ${extraDepends}
@@ -81,7 +81,7 @@
 Package: binutils-mips64el-linux-gnuabin32-dbg
 Section: debug
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-mips64el-linux-gnuabin32 (= ${binary:Version})
 Description: GNU binary utilities, for mips64el-linux-gnuabin32 target (debug symbols)
@@ -89,7 +89,7 @@
 
 Package: binutils-mipsisa64r6-linux-gnuabin32
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-common,
   ${shlibs:Depends}, ${extraDepends}
@@ -107,7 +107,7 @@
 Package: binutils-mipsisa64r6-linux-gnuabin32-dbg
 Section: debug
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-mipsisa64r6-linux-gnuabin32 (= ${binary:Version})
 Description: GNU binary utilities, for mipsisa64r6-linux-gnuabin32 target (debug symbols)
@@ -115,7 +115,7 @@
 
 Package: binutils-mipsisa64r6el-linux-gnuabin32
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-common,
   ${shlibs:Depends}, ${extraDepends}
@@ -133,7 +133,7 @@
 Package: binutils-mipsisa64r6el-linux-gnuabin32-dbg
 Section: debug
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-mipsisa64r6el-linux-gnuabin32 (= ${binary:Version})
 Description: GNU binary utilities, for mipsisa64r6el-linux-gnuabin32 target (debug symbols)
@@ -141,7 +141,7 @@
 
 Package: binutils-mipsisa32r6-linux-gnu
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-common,
   ${shlibs:Depends}, ${extraDepends}
@@ -159,7 +159,7 @@
 Package: binutils-mipsisa32r6-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-mipsisa32r6-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for mipsisa32r6-linux-gnu target (debug symbols)
@@ -167,7 +167,7 @@
 
 Package: binutils-mipsisa32r6el-linux-gnu
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-common,
   ${shlibs:Depends}, ${extraDepends}
@@ -185,7 +185,7 @@
 Package: binutils-mipsisa32r6el-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-mipsisa32r6el-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for mipsisa32r6el-linux-gnu target (debug symbols)
@@ -193,7 +193,7 @@
 
 Package: binutils-mipsisa64r6-linux-gnuabi64
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-common,
   ${shlibs:Depends}, ${extraDepends}
@@ -211,7 +211,7 @@
 Package: binutils-mipsisa64r6-linux-gnuabi64-dbg
 Section: debug
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-mipsisa64r6-linux-gnuabi64 (= ${binary:Version})
 Description: GNU binary utilities, for mipsisa64r6-linux-gnuabi64 target (debug symbols)
@@ -219,7 +219,7 @@
 
 Package: binutils-mipsisa64r6el-linux-gnuabi64
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-common,
   ${shlibs:Depends}, ${extraDepends}
@@ -237,7 +237,7 @@
 Package: binutils-mipsisa64r6el-linux-gnuabi64-dbg
 Section: debug
 Priority: optional
-Architecture: amd64 ppc64el arm64 i386 mips64el
+Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Depends: binutils-mipsisa64r6el-linux-gnuabi64 (= ${binary:Version})
 Description: GNU binary utilities, for mipsisa64r6el-linux-gnuabi64 target (debug symbols)
diff -Nru binutils-mipsen-1~c1/debian/control.in binutils-mipsen-2~c2/debian/control.in
--- binutils-mipsen-1~c1/debian/control.in	2019-02-01 12:06:58.000000000 +0000
+++ binutils-mipsen-2~c2/debian/control.in	2019-02-10 09:32:27.000000000 +0000
@@ -6,5 +6,5 @@
  dejagnu, chrpath, lsb-release,
  binutils-source (>= 2.31)
 Standards-Version: 4.1.5
-Vcs-Browser: https://salsa.debian.org/debian/binutils-mipsen
-Vcs-Git: https://salsa.debian.org/debian/binutils-mipsen.git
+Vcs-Browser: https://salsa.debian.org/toolchain-team/binutils-mipsen
+Vcs-Git: https://salsa.debian.org/toolchain-team/binutils-mipsen.git
diff -Nru binutils-mipsen-1~c1/debian/rules binutils-mipsen-2~c2/debian/rules
--- binutils-mipsen-1~c1/debian/rules	2019-02-01 12:06:58.000000000 +0000
+++ binutils-mipsen-2~c2/debian/rules	2019-02-10 09:32:27.000000000 +0000
@@ -13,10 +13,10 @@
   ARCHIVE_VER := 0
 endif
 ifeq (error,$(shell dpkg --compare-versions $(ARCHIVE_VER) ge $(DVER_T) && echo "error"))
-  $(error Version in Debian Archive >= Version in debian/changelog)
+  $(warning Version in Debian Archive >= Version in debian/changelog)
 endif
 
-HOST_ARCH = amd64 ppc64el arm64 i386 mips64el
+HOST_ARCH = amd64 i386 x32
 
 ARCHS = mips64 mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 
@@ -58,12 +58,14 @@
 	cp -r /usr/src/binutils/debian binutils-$(VER)/
 	cp -r /usr/src/binutils/patches binutils-$(VER)/debian
 	sed -i '/.*ps aux.*/d' binutils-$(VER)/debian/rules
+	sed -i 's/amd64 i386 x32 arm64 ppc64el))/amd64 i386 x32))/' binutils-$(VER)/debian/rules
+	sed -i 's/src_name := .*/src_name := $(DEB_NAME_ACT)/g' binutils-$(VER)/debian/rules
+	env -i make -C binutils-$(VER) -f debian/rules stamps/control ## don't try to make it simpler ....
 	touch $@
 
 stamp-dir/build: stamp-dir/prepare
 	cd binutils-$(VER); \
-		sed -i 's/src_name := .*/src_name := $(DEB_NAME_ACT)/g' debian/rules; \
-		DEB_BUILD_OPTIONS="nocheck nomult nohppa" CROSS_ARCHS="$(ARCHS)" dpkg-buildpackage -B -d -uc -us
+		DEB_BUILD_OPTIONS="nomult nohppa" CROSS_ARCHS="$(ARCHS)" dpkg-buildpackage -B -d -uc -us
 	touch $@
 
 $(ARCHS): build-arch
@@ -76,7 +78,7 @@
 	  dpkg-deb -R $$pkg $$pkg_d; \
 	  sed -i 's/Source: binutils/Source: $(DEB_NAME_ACT) ($(DEB_SVER_ACT))/g' $$pkg_d/DEBIAN/control; \
 	  sed -i 's/Version: .*/Version: $(DVER_T)/g' $$pkg_d/DEBIAN/control; \
-	  sed -i 's/ (= $(DVER))/ (>= $(DVER))/g' $$pkg_d/DEBIAN/control; \
+	  sed -i '/^Built-Using/! s/ (= $(DVER))/ (>= $(DVER))/g' $$pkg_d/DEBIAN/control; \
 	  if [ -f "$$pkg_d/usr/share/doc/binutils-$${type}/changelog.Debian.gz" ]; then \
 	    mv -f $$pkg_d/usr/share/doc/binutils-$${type}/changelog.Debian.gz $$pkg_d/usr/share/doc/binutils-$${type}/changelog.Debian.binutils.gz; \
 	    gzip -c9n debian/changelog > $$pkg_d/usr/share/doc/binutils-$${type}/changelog.Debian.gz; \