Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:fix-changelog into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-1.10

[Alfonso Sanchez-Beato]

Change changelog file name to the standard one

Change changelog file name to the standard one

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:281c147529672d4d5bd53f77c47f3e4ac5bee107
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/475/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/506
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/506
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/506
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/506
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1298
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1040
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1088/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/475/rebuild

review: Approve (continuous-integration)

diff --git a/ChangeLog-snap.txt b/ChangeLog
similarity index 100%
rename from ChangeLog-snap.txt
rename to ChangeLog
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 77bbb1a..3c21c64 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -59,7 +59,7 @@ parts:
   changelog:
     plugin: nil
     override-build: |
-      cp "$SNAPCRAFT_PROJECT_DIR"/ChangeLog-snap.txt "$SNAPCRAFT_PART_INSTALL"/ChangeLog
+      cp "$SNAPCRAFT_PROJECT_DIR"/ChangeLog "$SNAPCRAFT_PART_INSTALL"/ChangeLog
     organize:
       ChangeLog: usr/share/doc/network-manager/ChangeLog