From c6ea4a8a42a491dce5ce6028247b3c5a218e36c6 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 17 Jan 2018 10:31:59 -0500 Subject: [PATCH] Rename .deb, as per conversation on Slack --- build-tools/debian-metadata/control | 4 ++-- ....android.install.in => xamarin.android-oss.install.in} | 0 .../{xamarin.android.links => xamarin.android-oss.links} | 0 build-tools/scripts/BuildEverything.mk | 8 ++++---- 4 files changed, 6 insertions(+), 6 deletions(-) rename build-tools/debian-metadata/{xamarin.android.install.in => xamarin.android-oss.install.in} (100%) rename build-tools/debian-metadata/{xamarin.android.links => xamarin.android-oss.links} (100%) diff --git a/build-tools/debian-metadata/control b/build-tools/debian-metadata/control index e950163175c..4798cf64c60 100644 --- a/build-tools/debian-metadata/control +++ b/build-tools/debian-metadata/control @@ -1,4 +1,4 @@ -Source: oss-xamarin.android +Source: xamarin.android-oss Section: unknown Priority: optional Maintainer: Xamarin @@ -8,7 +8,7 @@ Homepage: https://www.xamarin.com/platform Vcs-Git: https://github.com/xamarin/xamarin-android.git Vcs-Browser: https://github.com/xamarin/xamarin-android -Package: xamarin.android +Package: xamarin.android-oss Architecture: amd64 Depends: mono-xbuild (>= 5.2), java8-sdk, ${misc:Depends}, ${shlibs:Depends} Description: Xamarin.Android libraries and runtime (host component) diff --git a/build-tools/debian-metadata/xamarin.android.install.in b/build-tools/debian-metadata/xamarin.android-oss.install.in similarity index 100% rename from build-tools/debian-metadata/xamarin.android.install.in rename to build-tools/debian-metadata/xamarin.android-oss.install.in diff --git a/build-tools/debian-metadata/xamarin.android.links b/build-tools/debian-metadata/xamarin.android-oss.links similarity index 100% rename from build-tools/debian-metadata/xamarin.android.links rename to build-tools/debian-metadata/xamarin.android-oss.links diff --git a/build-tools/scripts/BuildEverything.mk b/build-tools/scripts/BuildEverything.mk index 5cee6b80ed3..10f114ebf4c 100644 --- a/build-tools/scripts/BuildEverything.mk +++ b/build-tools/scripts/BuildEverything.mk @@ -16,7 +16,7 @@ else ZIP_EXTENSION = zip endif -ZIP_OUTPUT_BASENAME = oss-xamarin.android_v$(PRODUCT_VERSION).$(-num-commits-since-version-change)_$(OS)-$(OS_ARCH)_$(GIT_BRANCH)_$(GIT_COMMIT) +ZIP_OUTPUT_BASENAME = xamarin.android-oss_v$(PRODUCT_VERSION).$(-num-commits-since-version-change)_$(OS)-$(OS_ARCH)_$(GIT_BRANCH)_$(GIT_COMMIT) ZIP_OUTPUT = $(ZIP_OUTPUT_BASENAME).$(ZIP_EXTENSION) @@ -182,8 +182,8 @@ package-deb: $(ZIP_OUTPUT) rm -fr $(ZIP_OUTPUT_BASENAME) tar xf $(ZIP_OUTPUT) cp -a build-tools/debian-metadata $(ZIP_OUTPUT_BASENAME)/debian - sed "s/%CONFIG%/$(CONFIGURATION)/" $(ZIP_OUTPUT_BASENAME)/debian/xamarin.android.install.in > $(ZIP_OUTPUT_BASENAME)/debian/xamarin.android.install && rm -f $(ZIP_OUTPUT_BASENAME)/debian/xamarin.android.install.in + sed "s/%CONFIG%/$(CONFIGURATION)/" $(ZIP_OUTPUT_BASENAME)/debian/xamarin.android-oss.install.in > $(ZIP_OUTPUT_BASENAME)/debian/xamarin.android-oss.install && rm -f $(ZIP_OUTPUT_BASENAME)/debian/xamarin.android-oss.install.in cp LICENSE $(ZIP_OUTPUT_BASENAME)/debian/copyright - ln -sf $(ZIP_OUTPUT) oss-xamarin.android_$(PRODUCT_VERSION).$(-num-commits-since-version-change).orig.tar.bz2 - cd $(ZIP_OUTPUT_BASENAME) && DEBEMAIL="Xamarin Public Jenkins (auto-signing) " dch --create -v $(PRODUCT_VERSION).$(-num-commits-since-version-change) --package oss-xamarin.android --force-distribution --distribution alpha "New release - please see git log for $(GIT_COMMIT)" + ln -sf $(ZIP_OUTPUT) xamarin.android-oss_$(PRODUCT_VERSION).$(-num-commits-since-version-change).orig.tar.bz2 + cd $(ZIP_OUTPUT_BASENAME) && DEBEMAIL="Xamarin Public Jenkins (auto-signing) " dch --create -v $(PRODUCT_VERSION).$(-num-commits-since-version-change) --package xamarin.android-oss --force-distribution --distribution alpha "New release - please see git log for $(GIT_COMMIT)" cd $(ZIP_OUTPUT_BASENAME) && dpkg-buildpackage -us -uc -rfakeroot