[pkg-fgfs-crew] [flightgear-data] 01/01: Finalize 3.4.0+dfsg-0~exp1 for upload to unstable. Revert the manual addition of Switch.png - now included in 3.4.0.

[Markus Wanner]

This is an automated email from the git hooks/post-receive script.

markus_wanner-guest pushed a commit to branch experimental
in repository flightgear-data.

commit b7c579bda16fd714b98cf3b9e7018dc9471e53b9
Author: Markus Wanner <markus at bluegap.ch>
Date:   Wed Feb 18 23:40:37 2015 +0100

    Finalize 3.4.0+dfsg-0~exp1 for upload to unstable. Revert the manual
    addition of Switch.png - now included in 3.4.0.
---
 debian/Switch.png              | Bin 360 -> 0 bytes
 debian/changelog               |   5 ++---
 debian/rules                   |   4 ----
 debian/source/include-binaries |   1 -
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/Switch.png b/debian/Switch.png
deleted file mode 100644
index d83a2fd..0000000
Binary files a/debian/Switch.png and /dev/null differ
diff --git a/debian/changelog b/debian/changelog
index 6aed49e..902f410 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-flightgear-data (3.4.0~rc99+dfsg-0~exp1) UNRELEASED; urgency=medium
+flightgear-data (3.4.0+dfsg-0~exp1) experimental; urgency=medium
 
   [ Florent Rougon ]
   * New upstream release 3.2 (Closes: #766251).
@@ -30,10 +30,9 @@ flightgear-data (3.4.0~rc99+dfsg-0~exp1) UNRELEASED; urgency=medium
   * Update the watch file.
   * Use dh_link rather than the former dance in postinst/prerm. Drop
     these two for flightgear-data-base.
-  * Manually add Switch.png, which didn't quite make it into 3.4.0~rc99.
   * Drop another unnecessary LICENSE file.
 
- -- Markus Wanner <markus at bluegap.ch>  Wed, 18 Feb 2015 12:19:59 +0100
+ -- Markus Wanner <markus at bluegap.ch>  Wed, 18 Feb 2015 22:59:19 +0100
 
 flightgear-data (3.0.0-2) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 0c29f09..b5b77aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,10 +92,6 @@ override_dh_auto_install:
 		$(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/Aircraft/Generic/Engines/LICENSE \
 		$(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/webgui/3rdparty/sprintf/LICENSE
 
-# A file that didn't quite make it into 3.4.0~rc99, but should be in 3.4.0.
-	cp -a $(CURDIR)/debian/Switch.png \
-		$(CURDIR)/debian/flightgear-data-aircrafts/usr/share/games/flightgear/Aircraft/SenecaII/Models/Switch.png
-
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
 
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
deleted file mode 100644
index d945db2..0000000
--- a/debian/source/include-binaries
+++ /dev/null
@@ -1 +0,0 @@
-debian/Switch.png

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/flightgear-data.git