summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--NEWS.md10
-rw-r--r--org.inkscape.Inkscape.appdata.xml.in5
-rw-r--r--packaging/appimage/AppRun2
-rwxr-xr-xpackaging/macos/220-inkscape-package.sh8
-rw-r--r--packaging/macos/inkscape.plist4
6 files changed, 23 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e57c69fb..944af42ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ set(PROJECT_NAME inkscape)
set(INKSCAPE_VERSION_MAJOR 1)
set(INKSCAPE_VERSION_MINOR 0)
set(INKSCAPE_VERSION_PATCH 0)
-set(INKSCAPE_VERSION_SUFFIX "alpha")
+set(INKSCAPE_VERSION_SUFFIX "alpha2")
set(INKSCAPE_VERSION ${INKSCAPE_VERSION_MAJOR}.${INKSCAPE_VERSION_MINOR})
if(INKSCAPE_VERSION_PATCH)
diff --git a/NEWS.md b/NEWS.md
index 4906290f7..5d219747e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,13 @@
+Inkscape 1.0alpha2
+
+Release highlights
+
+Released on 2019-06-02
+
+ • Performance improvements
+ • "Native" MacOS look
+ • Various fixes
+
Inkscape 1.0alpha
Release highlights
diff --git a/org.inkscape.Inkscape.appdata.xml.in b/org.inkscape.Inkscape.appdata.xml.in
index 4ed15abb6..de18d43be 100644
--- a/org.inkscape.Inkscape.appdata.xml.in
+++ b/org.inkscape.Inkscape.appdata.xml.in
@@ -51,6 +51,11 @@
</ul>
</description>
</release>
+ <release version="1.0-alpha2" date="2019-06-02">
+ <description>
+ <p>This is the second public alpha release of Inkscape 1.0! This package is intended to test against regressions, try new features, and get a taste of the future of Inkscape!</p>
+ </description>
+ </release>
<release version="1.0-alpha" date="2019-01-04">
<description>
<p>This is the first public alpha release of Inkscape 1.0! This package is intended to test against regressions, try new features, and get a taste of the future of Inkscape!</p>
diff --git a/packaging/appimage/AppRun b/packaging/appimage/AppRun
index c9e3540f2..d9da5023b 100644
--- a/packaging/appimage/AppRun
+++ b/packaging/appimage/AppRun
@@ -63,7 +63,7 @@ if [ -e "$HERE/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2" ] ; then
export GDK_PIXBUF_MODULE_FILE=$(readlink -f "$HERE"/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders.cache ) # Patched to contain no paths
export LIBRARY_PATH=$GDK_PIXBUF_MODULEDIR:$LIBRARY_PATH # Otherwise getting "Unable to load image-loading module"
export GTK_THEME=Adwaita-dark # Or "Adwaita"
- export INKSCAPE_DATADIR=${XDG_CONFIG_HOME:-~/.config}/inkscape-1.0-alpha
+ export INKSCAPE_DATADIR=${XDG_CONFIG_HOME:-~/.config}/inkscape-1.0-alpha2
exec "${HERE}/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2" --inhibit-cache --library-path "${LIBRARY_PATH}" "${MAIN}" "$@"
else
exec "${MAIN}" "$@"
diff --git a/packaging/macos/220-inkscape-package.sh b/packaging/macos/220-inkscape-package.sh
index 602397e3c..426852ca1 100755
--- a/packaging/macos/220-inkscape-package.sh
+++ b/packaging/macos/220-inkscape-package.sh
@@ -55,12 +55,12 @@ curl -L -o $APP_RES_DIR/inkscape.icns $URL_INKSCAPE_ICNS
if [ -z $CI_JOB_ID ]; then # running standalone
# update version information
- /usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString '1.0alpha-g$(get_repo_version $SRC_DIR/inkscape)'" $APP_PLIST
- /usr/libexec/PlistBuddy -c "Set CFBundleVersion '1.0alpha-g$(get_repo_version $SRC_DIR/inkscape)'" $APP_PLIST
+ /usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString '1.0alpha2-g$(get_repo_version $SRC_DIR/inkscape)'" $APP_PLIST
+ /usr/libexec/PlistBuddy -c "Set CFBundleVersion '1.0alpha2-g$(get_repo_version $SRC_DIR/inkscape)'" $APP_PLIST
else # running as CI job
# update version information
- /usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString '1.0alpha-g$(get_repo_version $SELF_DIR)'" $APP_PLIST
- /usr/libexec/PlistBuddy -c "Set CFBundleVersion '1.0alpha-g$(get_repo_version $SELF_DIR)'" $APP_PLIST
+ /usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString '1.0alpha2-g$(get_repo_version $SELF_DIR)'" $APP_PLIST
+ /usr/libexec/PlistBuddy -c "Set CFBundleVersion '1.0alpha2-g$(get_repo_version $SELF_DIR)'" $APP_PLIST
fi
### copy Python.framework ######################################################
diff --git a/packaging/macos/inkscape.plist b/packaging/macos/inkscape.plist
index deb085694..457e2f1b6 100644
--- a/packaging/macos/inkscape.plist
+++ b/packaging/macos/inkscape.plist
@@ -536,11 +536,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.0alpha</string>
+ <string>1.0alpha2</string>
<key>CFBundleSignature</key>
<string>Inks</string>
<key>CFBundleVersion</key>
- <string>1.0alpha</string>
+ <string>1.0alpha2</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2019 Inkscape Developers, GNU General Public License.</string>
<key>LSApplicationCategoryType</key>