Prepare for 1.0 release

vlc-qt · Dec 27, 2015 · 2c15d72 · 2c15d72
1 parent dfc1b41
commit 2c15d72
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -67,6 +67,7 @@ build_script:
   - cmake .. -G %makefiles% -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="c:/dev/install" -DCI=ON -DNO_GIT=%nogitinfo% -DBUILD_TESTS=ON -DLIBVLC_LIBRARY="c:/dev/dependencies/vlc-%name%/sdk/lib/libvlc.lib" -DLIBVLCCORE_LIBRARY="c:/dev/dependencies/vlc-%name%/sdk/lib/libvlccore.lib" -DLIBVLC_INCLUDE_DIR="c:/dev/dependencies/vlc-%name%/sdk/include"
   - if not %platform%==mingw (nmake) else (mingw32-make)
   - if not %platform%==mingw (nmake install) else (mingw32-make install)
+  - if not %platform%==mingw (nmake windows) else (mingw32-make windows)
   - cd ..
   - cd build-debug
   - cmake .. -G %makefiles% -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="c:/dev/install" -DCI=ON -DNO_GIT=%nogitinfo% -DLIBVLC_LIBRARY="c:/dev/dependencies/vlc-%name%/sdk/lib/libvlc.lib" -DLIBVLCCORE_LIBRARY="c:/dev/dependencies/vlc-%name%/sdk/lib/libvlccore.lib" -DLIBVLC_INCLUDE_DIR="c:/dev/dependencies/vlc-%name%/sdk/include"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # VLC-Qt Changelog
 
-## master
+## 1.0.0 (2015-12-27)
  - Add audio and video filter module list (issue #112)
  - Add "Ignore" ratio that enables QML player to stretch video to container (issue #113)
  - Add ability to set playback rate (issue #127)
@@ -9,8 +9,6 @@
  - Expose protected methods on widgets to enable subclassing
  - Fix: Do not set time, if not playing (issue #120)
 
----
-
 ## 0.90.0 - 1.0 beta 1 (2015-09-20)
  - Renamed to VLCQtCore, VLCQtQml and VLCQtWidgets
  - Autogenerated CMake search scripts for full modularity

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.91.0
+1.0.0
diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,6 @@
-libvlc-qt (0.90.0-1) unstable; urgency=low
+libvlc-qt (1.0.0-1) unstable; urgency=low
 
-  * The full changelog can be found in NEWS
+  * The full changelog can be found in CHANGELOG.md
     or by running 'git log' when using Git
 
  -- Tadej Novak <[email protected]>  Thu, 15 Mar 2015 18:41:54 +0100