use C.UTF-8; optimise a bit
authormirabilos <tg@debian.org>
Sun, 2 Jun 2019 19:54:04 +0000 (21:54 +0200)
committermirabilos <mirabilos@evolvis.org>
Sun, 2 Jun 2019 19:54:04 +0000 (21:54 +0200)
also drop cherry-picked junk

debian/changelog
debian/rules

index 10796c4..ccce801 100644 (file)
@@ -2,10 +2,10 @@ musescore2 (2.3.2+dfsg3-2) wtf; urgency=low
 
   * Log prevented note collisions in revert-restriking patch
   * debian/buildtest: move nocheck test here
-  * Streamline debian/rules
-  * Build under the C locale
+  * Streamline and (slightly) optimise debian/rules
+  * Build under the C.UTF-8 locale
 
- -- Thorsten Glaser <tg@mirbsd.de>  Sun, 02 Jun 2019 21:42:44 +0200
+ -- Thorsten Glaser <tg@mirbsd.de>  Sun, 02 Jun 2019 21:53:08 +0200
 
 musescore2 (2.3.2+dfsg3-1) wtf; urgency=low
 
index 594005a..2be745a 100755 (executable)
@@ -6,7 +6,7 @@ export V=1
 export VERBOSE=1
 endif
 
-LC_ALL:=C
+LC_ALL:=C.UTF-8
 export LC_ALL
 
 DEB_HOST_ARCH_OS?=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
@@ -48,14 +48,14 @@ CMAKE_DEFS+=        -DBUILD_PORTMIDI=OFF
 endif
 
 override_dh_auto_configure:
-       dh_auto_configure -- ${CMAKE_DEFS}
+       exec dh_auto_configure -- ${CMAKE_DEFS}
 
 override_dh_auto_build:
-       env GNUMAKEFLAGS="$$GNUMAKEFLAGS --output-sync" \
+       exec env GNUMAKEFLAGS="$$GNUMAKEFLAGS --output-sync" \
            dh_auto_build -- lrelease all
 
 override_dh_auto_test:
-       mksh debian/buildtest ${DEB_BUILD_OPTIONS}
+       exec mksh debian/buildtest ${DEB_BUILD_OPTIONS}
 
 override_dh_install-indep:
        # move stuff to packages
@@ -64,8 +64,3 @@ override_dh_install-indep:
        cd debian/musescore-common/usr/share/mscore-* && \
            mkdir -p sound && \
            ln -sf ../../sounds/sf2 ../../sounds/sf3 ../../sounds/sfz sound/
-
-override_dh_auto_clean:
-       dh_auto_clean
-       # remove possible doxygen remnants
-       rm -rf doc/plugins