diff -Nru brewtarget-2.0.3/brewtarget_cfg.qrc.in brewtarget-2.1.0/brewtarget_cfg.qrc.in
--- brewtarget-2.0.3/brewtarget_cfg.qrc.in 2014-01-18 22:34:47.000000000 +0000
+++ brewtarget-2.1.0/brewtarget_cfg.qrc.in 1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-
-
- ${CMAKE_CURRENT_BINARY_DIR}/src/blankdb.sqlite
-
-
diff -Nru brewtarget-2.0.3/brewtarget.desktop brewtarget-2.1.0/brewtarget.desktop
--- brewtarget-2.0.3/brewtarget.desktop 1970-01-01 00:00:00.000000000 +0000
+++ brewtarget-2.1.0/brewtarget.desktop 2014-08-02 20:52:22.000000000 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Categories=Qt;KDE;Education;Utility;Engineering;
+Exec=brewtarget
+Name=Brewtarget
+GenericName=Beer calculator
+X-KDE-StartupNotify=true
+Icon=brewtarget
+Terminal=false
+Type=Application
+
diff -Nru brewtarget-2.0.3/brewtarget.desktop.in brewtarget-2.1.0/brewtarget.desktop.in
--- brewtarget-2.0.3/brewtarget.desktop.in 2014-01-18 22:34:37.000000000 +0000
+++ brewtarget-2.1.0/brewtarget.desktop.in 1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Categories=Qt;KDE;Education;Utility;Engineering;
-Exec=brewtarget
-Name=Brewtarget
-GenericName=Beer calculator
-X-KDE-StartupNotify=true
-Icon=${brewtarget_ICONS_LOCATION}/brewtarget_icon.svg
-Terminal=false
-Type=Application
-
diff -Nru brewtarget-2.0.3/brewtarget.qrc brewtarget-2.1.0/brewtarget.qrc
--- brewtarget-2.0.3/brewtarget.qrc 2014-03-09 16:36:31.000000000 +0000
+++ brewtarget-2.1.0/brewtarget.qrc 2014-09-13 16:07:26.000000000 +0000
@@ -1,7 +1,7 @@
images/backup.png
- images/brewtarget_icon.svg
+ images/brewtarget.svg
images/bubbles.svg
images/clipboard.svg
images/clock.svg
@@ -14,6 +14,7 @@
images/edit-copy.png
images/exit.svg
images/filesave.svg
+ images/flagBrazil.svg
images/flagCatalonia.svg
images/flagChina.svg
images/flagFrance.svg
@@ -27,6 +28,7 @@
images/flagSpain.svg
images/flagUK.svg
images/flagCzech.svg
+ images/folder.png
images/glass2.png
images/help-contents.png
images/hydrometer.svg
@@ -57,8 +59,6 @@
images/title.png
css/brewday.css
css/recipe.css
- create_db.sql
- migrations/migrations.xml
- migrations/migration_2.0.0_to_2.0.2.sql
+ css/tooltip.css
diff -Nru brewtarget-2.0.3/build/dummyfile brewtarget-2.1.0/build/dummyfile
--- brewtarget-2.0.3/build/dummyfile 2014-03-09 16:36:31.000000000 +0000
+++ brewtarget-2.1.0/build/dummyfile 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-The only purpose of this file is to keep cpack from not including this otherwise empty directory in the source packages.
diff -Nru brewtarget-2.0.3/CHANGES.markdown brewtarget-2.1.0/CHANGES.markdown
--- brewtarget-2.0.3/CHANGES.markdown 2014-02-16 20:36:19.000000000 +0000
+++ brewtarget-2.1.0/CHANGES.markdown 2014-09-14 16:56:46.000000000 +0000
@@ -7,8 +7,32 @@
### New Features
+* Folders for organizing recipes [#1109740](https://bugs.launchpad.net/brewtarget/+bug/1109740).
+* Recipe parameter [sliders](https://blueprints.launchpad.net/brewtarget/+spec/recipe-sliders)
+ to make it easier to visualize the value and range of IBUs, color, etc.
+
+### Bug Fixes
+
+* Boil SG was wrong if kettle losses were not zero [#1328761](https://bugs.launchpad.net/brewtarget/+bug/1328761).
+* Extract recipes crash brew-it [#1340484](https://bugs.launchpad.net/brewtarget/+bug/1340484)
+* Incorrect abbreviation in manual [#1224236](https://bugs.launchpad.net/bugs/1224236).
+* Bad IBUs for extract recipes [#1286655](https://bugs.launchpad.net/bugs/1286655).
+* "Brew It" fails for extract recipes [#1340484](https://bugs.launchpad.net/bugs/1340484).
+* Missing icons for some distributions [#1346342](https://bugs.launchpad.net/bugs/1346342).
+* Failed to launch on OSX with case-sensitive filesystems [#1259374](https://bugs.launchpad.net/bugs/1259374).
+
+### Incompatibilities
+
+## v2.0.3
+
+Minor bugfix release.
+
+### New Features
+
### Bug Fixes
+* Manual button failed to display the manual [#1282618](https://bugs.launchpad.net/brewtarget/+bug/1282618).
+* Selecting FG units did not change displayed units [#128751](https://bugs.launchpad.net/brewtarget/+bug/1287511).
* Windows builds now properly find phonon library [#1226862](https://bugs.launchpad.net/brewtarget/+bug/1226862).
* Mash wizard does not overshoot target boil size when recipe includes extract or sugar.[#1233744](https://bugs.launchpad.net/brewtarget/+bug/1233744)
diff -Nru brewtarget-2.0.3/CMakeLists.txt brewtarget-2.1.0/CMakeLists.txt
--- brewtarget-2.0.3/CMakeLists.txt 2014-05-03 14:43:24.000000000 +0000
+++ brewtarget-2.1.0/CMakeLists.txt 2014-09-15 00:58:50.000000000 +0000
@@ -1,5 +1,5 @@
PROJECT(brewtarget)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.8)
# Creates a Makefile.
# NOTE: cmake . -DCMAKE_INSTALL_PREFIX=/tmp/blah && make DESTDIR=/foo
@@ -10,8 +10,8 @@
#=================================Version======================================
SET( brewtarget_VERSION_MAJOR 2 )
-SET( brewtarget_VERSION_MINOR 0 )
-SET( brewtarget_VERSION_PATCH 3 )
+SET( brewtarget_VERSION_MINOR 1 )
+SET( brewtarget_VERSION_PATCH 0 )
SET( brewtarget_VERSION_STRING "${brewtarget_VERSION_MAJOR}.${brewtarget_VERSION_MINOR}.${brewtarget_VERSION_PATCH}" )
#===================================Options====================================
@@ -30,6 +30,10 @@
OPTION( NO_MESSING_WITH_FLAGS
"On means do not add any build flags whatsoever. May override other options."
OFF )
+
+# Do this right off the bat
+ENABLE_TESTING()
+
#==============================Compile flags===================================
IF( NOT ${NO_MESSING_WITH_FLAGS} )
IF( CMAKE_COMPILER_IS_GNUCXX )
@@ -59,7 +63,8 @@
ENDIF()
IF( APPLE AND NOT CMAKE_OSX_ARCHITECTURES )
- SET( CMAKE_OSX_ARCHITECTURES i386 x86_64 ) # Build intel binary.
+ SET( CMAKE_OSX_ARCHITECTURES x86_64 ) # Build intel 64-bit binary.
+ #SET( CMAKE_OSX_ARCHITECTURES i386 x86_64 ) # Build intel binary.
#SET( CMAKE_OSX_ARCHITECTURES ppc i386 ppc64 x86_64 ) # Build universal binary.
ENDIF()
@@ -89,9 +94,15 @@
# ======================Find Qt4 (>= 4.6.0) for this project===================
IF( ${BUILD_DESIGNER_PLUGINS} )
- FIND_PACKAGE(Qt4 4.6.0 COMPONENTS QtCore QtGui QtNetwork QtSql QtSvg QtWebKit QtXml QtDesigner REQUIRED)
+ FIND_PACKAGE(Qt4 4.6.0 COMPONENTS QtCore QtGui QtNetwork QtSql QtWebKit QtXml QtDesigner REQUIRED)
ELSE()
- FIND_PACKAGE(Qt4 4.6.0 COMPONENTS QtCore QtGui QtNetwork QtSql QtSvg QtWebkit QtXml REQUIRED)
+ # This is a major kludge, but linking with QtSvg is the easiest way to get
+ # an app that includes the svg image format plugin that works.
+ IF( APPLE )
+ FIND_PACKAGE(Qt4 4.6.0 COMPONENTS QtCore QtGui QtNetwork QtSql QtWebkit QtXml QtSvg REQUIRED)
+ ELSE()
+ FIND_PACKAGE(Qt4 4.6.0 COMPONENTS QtCore QtGui QtNetwork QtSql QtWebkit QtXml REQUIRED)
+ ENDIF()
ENDIF()
MESSAGE( STATUS "CMAKE_SYSTEM_INCLUDE_PATH: ${CMAKE_SYSTEM_INCLUDE_PATH}" )
@@ -120,8 +131,6 @@
#=========================Configure brewtarget.qrc.in==========================
SET( brewtarget_QRC "${CMAKE_CURRENT_SOURCE_DIR}/brewtarget.qrc" )
-SET( brewtarget_cfg_QRC "${CMAKE_CURRENT_BINARY_DIR}/brewtarget_cfg.qrc" )
-CONFIGURE_FILE( brewtarget_cfg.qrc.in ${brewtarget_cfg_QRC} )
#============================Doxygen Custom Target=============================
FIND_PROGRAM( DOXYGEN_CMD doxygen )
@@ -134,12 +143,6 @@
)
ENDIF()
-#=============================Database Custom Target===========================
-FIND_PROGRAM( SQLITE3_CMD sqlite3 )
-IF( NOT SQLITE3_CMD )
- MESSAGE( FATAL_ERROR "Did not find sqlite3 to make the database." )
-ENDIF()
-
#=========================Detect Debian========================================
IF( EXISTS "/etc/debian_version" )
MESSAGE( STATUS "Debian detected..." )
@@ -192,17 +195,6 @@
SET( DOCPATH "${BT_BUNDLE_DIR}/Contents/Resources/en.lproj" )
ENDIF()
-#=========================Configure brewtarget.desktop=========================
-
-# If it begins with a '/'
-IF( IS_ABSOLUTE ${DATAROOTDIR} )
- SET( brewtarget_ICONS_LOCATION "${DATAROOTDIR}/icons/${CMAKE_PROJECT_NAME}" )
-ELSE()
- SET( brewtarget_ICONS_LOCATION "/${DATAROOTDIR}/icons/${CMAKE_PROJECT_NAME}" )
-ENDIF()
-
-CONFIGURE_FILE( brewtarget.desktop.in brewtarget.desktop )
-
#==============================Setup the config.h==============================
# "#define CONFIGDATADIR ${CONFIGDATADIR}$" in config.in will be replaced
@@ -243,15 +235,13 @@
)
# Desktop files to install.
-# This is not prefixed with ${ROOTDIR} b/c it is a configured file that will
-# only exist in the build directory.
SET( brewtarget_DESKTOP
- ${CMAKE_CURRENT_BINARY_DIR}/brewtarget.desktop
+ ${ROOTDIR}/brewtarget.desktop
)
# Icon files to install.
SET( brewtarget_ICONS
- ${ROOTDIR}/images/brewtarget_icon.svg
+ ${ROOTDIR}/images/brewtarget.svg
)
SET( TRANSLATIONS_FILES
@@ -471,6 +461,8 @@
# Install the data.
INSTALL( FILES ${brewtarget_DATA}
DESTINATION ${DATAPATH} )
+ INSTALL( DIRECTORY ${ROOTDIR}/doc/images
+ DESTINATION ${DATAPATH} )
# Install the documentation.
INSTALL( FILES ${brewtarget_DOCS}
@@ -484,7 +476,7 @@
IF( UNIX AND NOT APPLE )
# Install the icons.
INSTALL( FILES ${brewtarget_ICONS}
- DESTINATION "${DATAROOTDIR}/icons/${CMAKE_PROJECT_NAME}" )
+ DESTINATION "${DATAROOTDIR}/icons/hicolor/scalable/apps/" )
# Install the .desktop file.
INSTALL( FILES ${brewtarget_DESKTOP}
diff -Nru brewtarget-2.0.3/create_db.sql brewtarget-2.1.0/create_db.sql
--- brewtarget-2.0.3/create_db.sql 2014-03-09 16:36:31.000000000 +0000
+++ brewtarget-2.1.0/create_db.sql 1970-01-01 00:00:00.000000000 +0000
@@ -1,556 +0,0 @@
--- NOTE: none of the BeerXML property names should EVER change. This is to
--- ensure backwards compatability when rolling out ingredient updates to
--- old versions.
-
--- NOTE: deleted=1 means the ingredient is "deleted" and should not be shown in
--- any list.
--- deleted=0 means it isn't deleted and may or may not be shown.
--- display=1 means the ingredient should be shown in a list, available to
--- be put into a recipe.
--- display=0 means the ingredient is in a recipe already and should not
--- be shown in a list, available to be put into a recipe.
-BEGIN TRANSACTION;
-
-CREATE TABLE settings(
- id integer primary key,
- version varchar(256)
-);
-INSERT INTO settings VALUES(1,'2.0.2');
-
-create table equipment(
- id integer PRIMARY KEY autoincrement,
- -- BeerXML properties
- name varchar(256) not null DEFAULT '',
- boil_size real DEFAULT 0.0,
- batch_size real DEFAULT 0.0,
- tun_volume real DEFAULT 0.0,
- tun_weight real DEFAULT 0.0,
- tun_specific_heat real DEFAULT 0.0,
- top_up_water real DEFAULT 0.0,
- trub_chiller_loss real DEFAULT 0.0,
- evap_rate real DEFAULT 0.0,
- boil_time real DEFAULT 0.0,
- calc_boil_volume boolean DEFAULT 0,
- lauter_deadspace real DEFAULT 0.0,
- top_up_kettle real DEFAULT 0.0,
- hop_utilization real DEFAULT 100.0,
- notes text DEFAULT '',
- -- Out BeerXML extensions
- real_evap_rate real DEFAULT 0.0,
- boiling_point real DEFAULT 100.0,
- absorption real DEFAULT 1.085,
- -- Metadata
- deleted boolean DEFAULT 0,
- display boolean DEFAULT 1
-);
-
-create table fermentable(
- id integer PRIMARY KEY autoincrement,
- -- BeerXML properties
- name varchar(256) not null DEFAULT '',
- ftype varchar(32) DEFAULT 'Grain',
- amount real DEFAULT 0.0,
- yield real DEFAULT 0.0,
- color real DEFAULT 0.0,
- add_after_boil boolean DEFAULT 0,
- origin varchar(32) DEFAULT '',
- supplier varchar(256) DEFAULT '',
- notes text DEFAULT '',
- coarse_fine_diff real DEFAULT 0.0,
- moisture real DEFAULT 0.0,
- diastatic_power real DEFAULT 0.0,
- protein real DEFAULT 0.0,
- max_in_batch real DEFAULT 100.0,
- recommend_mash boolean DEFAULT 0,
- is_mashed boolean DEFAULT 0,
- ibu_gal_per_lb real DEFAULT 0.0,
- -- Display stuff
- display_unit integer DEFAULT -1,
- display_scale integer DEFAULT -1,
- -- meta data
- deleted boolean DEFAULT 0,
- display boolean DEFAULT 1
-);
-
-create table hop(
- id integer PRIMARY KEY autoincrement,
- -- BeerXML properties
- name varchar(256) not null DEFAULT '',
- alpha real DEFAULT 0.0,
- amount real DEFAULT 0.0,
- use varchar(32) DEFAULT 'Boil',
- time real DEFAULT 0.0,
- notes text DEFAULT '',
- htype varchar(32) DEFAULT 'Both',
- form varchar(32) DEFAULT 'Pellet',
- beta real DEFAULT 0.0,
- hsi real DEFAULT 0.0,
- origin varchar(32),
- substitutes text DEFAULT '',
- humulene real DEFAULT 0.0,
- caryophyllene real DEFAULT 0.0,
- cohumulone real DEFAULT 0.0,
- myrcene real DEFAULT 0.0,
- -- Display stuff
- display_unit integer DEFAULT -1,
- display_scale integer DEFAULT -1,
- -- meta data
- deleted boolean DEFAULT 0,
- display boolean DEFAULT 1
-);
-
-create table misc(
- id integer PRIMARY KEY autoincrement,
- -- BeerXML properties
- name varchar(256) not null DEFAULT '',
- mtype varchar(32) DEFAULT 'Other',
- use varchar(32) DEFAULT 'Boil',
- time real DEFAULT 0.0,
- amount real DEFAULT 0.0,
- amount_is_weight boolean DEFAULT 1,
- use_for text DEFAULT '',
- notes text DEFAULT '',
- -- Display stuff.
- -- Be careful: this will change meaning based on amount_is_weight
- display_unit integer DEFAULT -1,
- display_scale integer DEFAULT -1,
- -- meta data
- deleted boolean DEFAULT 0,
- display boolean DEFAULT 1
-);
-
-create table style(
- id integer PRIMARY KEY autoincrement,
- -- BeerXML properties
- name varchar(256) not null DEFAULT '',
- s_type varchar(64) DEFAULT 'Ale',
- category varchar(256) DEFAULT '',
- category_number varchar(16) DEFAULT '',
- style_letter varchar(1) DEFAULT '',
- style_guide varchar(1024) DEFAULT '',
- og_min real DEFAULT 1.0,
- og_max real DEFAULT 1.100,
- fg_min real DEFAULT 1.0,
- fg_max real DEFAULT 1.100,
- ibu_min real DEFAULT 0.0,
- ibu_max real DEFAULT 100.0,
- color_min real DEFAULT 0.0,
- color_max real DEFAULT 100.0,
- abv_min real DEFAULT 0.0,
- abv_max real DEFAULT 100.0,
- carb_min real DEFAULT 0.0,
- carb_max real DEFAULT 100.0,
- notes text DEFAULT '',
- profile text DEFAULT '',
- ingredients text DEFAULT '',
- examples text DEFAULT '',
- -- meta data
- deleted boolean DEFAULT 0,
- display boolean DEFAULT 1
-);
-
-create table yeast(
- id integer PRIMARY KEY autoincrement,
- -- BeerXML properties
- name varchar(256) not null DEFAULT '',
- ytype varchar(32) DEFAULT 'Ale',
- form varchar(32) DEFAULT 'Liquid',
- amount real DEFAULT 0.0,
- amount_is_weight boolean DEFAULT 0,
- laboratory varchar(32) DEFAULT '',
- product_id varchar(32) DEFAULT '',
- min_temperature real DEFAULT 0.0,
- max_temperature real DEFAULT 32.0,
- flocculation varchar(32) DEFAULT 'Medium',
- attenuation real DEFAULT 75.0,
- notes text DEFAULT '',
- best_for varchar(256) DEFAULT '',
- times_cultured integer DEFAULT 0,
- max_reuse integer DEFAULT 10,
- add_to_secondary boolean DEFAULT 0,
- -- Display stuff
- -- Be careful: this will change meaning based on amount_is_weight
- display_unit integer DEFAULT -1,
- display_scale integer DEFAULT -1,
- -- meta data
- deleted boolean DEFAULT 0,
- display boolean DEFAULT 1
-);
-
-create table water(
- id integer PRIMARY KEY autoincrement,
- -- BeerXML properties
- name varchar(256) not null DEFAULT '',
- amount real DEFAULT 0.0,
- calcium real DEFAULT 0.0,
- bicarbonate real DEFAULT 0.0,
- sulfate real DEFAULT 0.0,
- chloride real DEFAULT 0.0,
- sodium real DEFAULT 0.0,
- magnesium real DEFAULT 0.0,
- ph real DEFAULT 7.0,
- notes text DEFAULT '',
- -- metadata
- deleted boolean DEFAULT 0,
- display boolean DEFAULT 1
-);
-
--- The following bt_* tables simply point to ingredients provided by brewtarget.
--- This is to make updating and pushing new ingredients easy.
--- NOTE: they MUST be named bt_
, where is the table name that
--- they refer to, and they MUST contain fields 'id' and '_id'.
-
-create table bt_equipment(
- id integer PRIMARY KEY autoincrement,
- equipment_id integer,
- foreign key(equipment_id) references equipment(id)
-);
-
-create table bt_fermentable(
- id integer PRIMARY KEY autoincrement,
- fermentable_id integer,
- foreign key(fermentable_id) references fermentable(id)
-);
-
-create table bt_hop(
- id integer PRIMARY KEY autoincrement,
- hop_id integer,
- foreign key(hop_id) references hop(id)
-);
-
-create table bt_misc(
- id integer PRIMARY KEY autoincrement,
- misc_id integer,
- foreign key(misc_id) references misc(id)
-);
-
-create table bt_style(
- id integer PRIMARY KEY autoincrement,
- style_id integer,
- foreign key(style_id) references style(id)
-);
-
-create table bt_yeast(
- id integer PRIMARY KEY autoincrement,
- yeast_id integer,
- foreign key(yeast_id) references yeast(id)
-);
-
-create table bt_water(
- id integer PRIMARY KEY autoincrement,
- water_id integer,
- foreign key(water_id) references water(id)
-);
-
-create table mash(
- id integer PRIMARY KEY autoincrement,
- -- BeerXML properties
- name varchar(256) DEFAULT '',
- grain_temp real DEFAULT 20.0,
- notes text DEFAULT '',
- tun_temp real DEFAULT 20.0,
- sparge_temp real DEFAULT 74.0,
- ph real DEFAULT 7.0,
- tun_weight real DEFAULT 0.0,
- tun_specific_heat real DEFAULT 0.0,
- equip_adjust boolean DEFAULT 1,
- -- Metadata
- deleted boolean DEFAULT 0,
- -- Mashes default to be undisplayed until they are named
- display boolean DEFAULT 0
-);
-
-create table mashstep(
- id integer PRIMARY KEY autoincrement,
- -- BeerXML properties
- name varchar(256) not null DEFAULT '',
- mstype varchar(32) DEFAULT 'Infusion',
- infuse_amount real DEFAULT 0.0,
- step_temp real DEFAULT 67.0,
- step_time real DEFAULT 0.0,
- ramp_time real DEFAULT 0.0,
- end_temp real DEFAULT 67.0,
- infuse_temp real DEFAULT 67.0,
- decoction_amount real DEFAULT 0.0,
- -- Display stuff
- -- we have three display fields in this table. I don't like my solution,
- -- but really don't want to deal with another table and lookup
- display_unit integer DEFAULT -1,
- display_scale integer DEFAULT -1,
- display_temp_unit integer DEFAULT -1,
- -- Meta data
- deleted boolean DEFAULT 0,
- display boolean DEFAULT 1,
- -- Our step number is unique within our parent mash.
- mash_id integer,
- step_number integer DEFAULT 0,
- foreign key(mash_id) references mash(id)
- -- This is not necessary since we manage these internally in Brewtarget.
- -- unique( mash_id, step_number )
-);
-
--- Completely new non-BeerXML type.
-create table brewnote(
- id integer PRIMARY KEY autoincrement,
- brewDate datetime DEFAULT CURRENT_DATETIME,
- fermentDate datetime DEFAULT CURRENT_DATETIME,
- sg real DEFAULT 1.0,
- volume_into_bk real DEFAULT 0.0,
- strike_temp real DEFAULT 70.0,
- mash_final_temp real DEFAULT 67.0,
- og real DEFAULT 1.0,
- post_boil_volume real DEFAULT 0.0,
- volume_into_fermenter real DEFAULT 0.0,
- pitch_temp real DEFAULT 20.0,
- fg real DEFAULT 1.0,
- eff_into_bk real DEFAULT 70.0,
- abv real DEFAULT 0.0,
- predicted_og real DEFAULT 1.0,
- brewhouse_eff real DEFAULT 70.0,
- predicted_abv real DEFAULT 0.0,
- projected_boil_grav real DEFAULT 1.0,
- projected_strike_temp real DEFAULT 70.0,
- projected_fin_temp real DEFAULT 67.0,
- projected_mash_fin_temp real DEFAULT 67.0,
- projected_vol_into_bk real DEFAULT 0.0,
- projected_og real DEFAULT 1.0,
- projected_vol_into_ferm real DEFAULT 0.0,
- projected_fg real DEFAULT 1.0,
- projected_eff real DEFAULT 70.0,
- projected_abv real DEFAULT 0.0,
- projected_atten real DEFAULT 75.0,
- projected_points real DEFAULT 0.0,
- projected_ferm_points real DEFAULT 0.0,
- boil_off real DEFAULT 0.0,
- final_volume real DEFAULT 0.0,
- notes text DEFAULT '',
- deleted boolean DEFAULT 0,
- display boolean DEFAULT 1,
- recipe_id integer,
- foreign key(recipe_id) references recipe(id)
-);
-
--- Completely new non-BeerXML type.
-create table instruction(
- id integer PRIMARY KEY autoincrement,
- name varchar(256) not null DEFAULT '',
- directions text DEFAULT '',
- hasTimer boolean DEFAULT 0,
- timerValue varchar(16) DEFAULT '00:00:00',
- completed boolean DEFAULT 0,
- interval real DEFAULT 0.0,
- deleted boolean DEFAULT 0,
- display boolean DEFAULT 1
-);
-
-create table recipe(
- id integer PRIMARY KEY autoincrement,
- -- BeerXML properties
- name varchar(256) not null DEFAULT '',
- type varchar(32) DEFAULT 'All Grain',
- brewer varchar(1024) DEFAULT '',
- assistant_brewer varchar(1024) DEFAULT 'Brewtarget: free beer software',
- batch_size real DEFAULT 0.0,
- boil_size real DEFAULT 0.0,
- boil_time real DEFAULT 0.0,
- efficiency real DEFAULT 70.0,
- og real DEFAULT 1.0,
- fg real DEFAULT 1.0,
- fermentation_stages int DEFAULT 1,
- primary_age real DEFAULT 0.0,
- primary_temp real DEFAULT 20.0,
- secondary_age real DEFAULT 0.0,
- secondary_temp real DEFAULT 20.0,
- tertiary_age real DEFAULT 0.0,
- tertiary_temp real DEFAULT 20.0,
- age real DEFAULT 0.0,
- age_temp real DEFAULT 20.0,
- date date DEFAULT CURRENT_DATE,
- carb_volume real DEFAULT 0.0,
- forced_carb boolean DEFAULT 0,
- priming_sugar_name varchar(128) DEFAULT '',
- carbonationTemp_c real DEFAULT 20.0,
- priming_sugar_equiv real DEFAULT 1.0,
- keg_priming_factor real DEFAULT 1.0,
- notes text DEFAULT '',
- taste_notes text DEFAULT '',
- taste_rating real DEFAULT 0.0,
- -- Metadata
- deleted boolean DEFAULT 0,
- display boolean DEFAULT 1,
- -- Relational members
- style_id integer,
- mash_id integer,
- equipment_id integer,
- foreign key(style_id) references style(id),
- foreign key(mash_id) references mash(id),
- foreign key(equipment_id) references equipment(id)
-);
-
-create table fermentable_in_recipe(
- id integer primary key autoincrement,
- fermentable_id integer,
- recipe_id integer,
- foreign key(fermentable_id) references fermentable(id),
- foreign key(recipe_id) references recipe(id)
-);
-
-create table hop_in_recipe(
- id integer PRIMARY KEY autoincrement,
- hop_id integer,
- recipe_id integer,
- foreign key(hop_id) references hop(id),
- foreign key(recipe_id) references recipe(id)
-);
-
-create table misc_in_recipe(
- id integer PRIMARY KEY autoincrement,
- misc_id integer,
- recipe_id integer,
- foreign key(misc_id) references misc(id),
- foreign key(recipe_id) references recipe(id)
-);
-
-create table water_in_recipe(
- id integer PRIMARY KEY autoincrement,
- water_id integer,
- recipe_id integer,
- foreign key(water_id) references water(id),
- foreign key(recipe_id) references recipe(id)
-);
-
-create table yeast_in_recipe(
- id integer PRIMARY KEY autoincrement,
- yeast_id integer,
- recipe_id integer,
- foreign key(yeast_id) references yeast(id),
- foreign key(recipe_id) references recipe(id)
-);
-
-create table instruction_in_recipe(
- id integer PRIMARY KEY autoincrement,
- instruction_id integer,
- recipe_id integer,
- -- instruction_number is the order of the instruction in the recipe.
- instruction_number integer DEFAULT 0,
- foreign key(instruction_id) references instruction(id),
- foreign key(recipe_id) references recipe(id)
-);
-
--- This trigger automatically makes a new instruction in a recipe the last.
-CREATE TRIGGER inc_ins_num AFTER INSERT ON instruction_in_recipe
-BEGIN
- UPDATE instruction_in_recipe SET instruction_number =
- (SELECT max(instruction_number) FROM instruction_in_recipe WHERE recipe_id = new.recipe_id) + 1
- WHERE rowid = new.rowid;
-END;
-
--- This trigger automatically decrements all instruction numbers greater than the one
--- deleted in the given recipe.
-CREATE TRIGGER dec_ins_num AFTER DELETE ON instruction_in_recipe
-BEGIN
- UPDATE instruction_in_recipe SET instruction_number = instruction_number - 1
- WHERE recipe_id = old.recipe_id AND instruction_id > old.instruction_id;
-END;
-
--- Ingredient inheritance tables
-
-create table equipment_children(
- id integer PRIMARY KEY autoincrement,
- parent_id integer,
- child_id integer,
- foreign key(parent_id) references equipment(id),
- foreign key(child_id) references equipment(id)
-);
-
-create table fermentable_children(
- id integer PRIMARY KEY autoincrement,
- parent_id integer,
- child_id integer,
- foreign key(parent_id) references fermentable(id),
- foreign key(child_id) references fermentable(id)
-);
-
-create table hop_children(
- id integer PRIMARY KEY autoincrement,
- parent_id integer,
- child_id integer,
- foreign key(parent_id) references hop(id),
- foreign key(child_id) references hop(id)
-);
-
-create table misc_children(
- id integer PRIMARY KEY autoincrement,
- parent_id integer,
- child_id integer,
- foreign key(parent_id) references misc(id),
- foreign key(child_id) references misc(id)
-);
-
-create table recipe_children(
- id integer PRIMARY KEY autoincrement,
- parent_id integer,
- child_id integer,
- foreign key(parent_id) references recipe(id),
- foreign key(child_id) references recipe(id)
-);
-
-create table style_children(
- id integer PRIMARY KEY autoincrement,
- parent_id integer,
- child_id integer,
- foreign key(parent_id) references style(id),
- foreign key(child_id) references style(id)
-);
-
-create table water_children(
- id integer PRIMARY KEY autoincrement,
- parent_id integer,
- child_id integer,
- foreign key(parent_id) references water(id),
- foreign key(child_id) references water(id)
-);
-
-create table yeast_children(
- id integer PRIMARY KEY autoincrement,
- parent_id integer,
- child_id integer,
- foreign key(parent_id) references yeast(id),
- foreign key(child_id) references yeast(id)
-);
-
--- Inventory tables for the future.
-
-create table fermentable_in_inventory(
- id integer PRIMARY KEY autoincrement,
- fermentable_id integer,
- amount real DEFAULT 0.0,
- foreign key(fermentable_id) references fermentable(id)
-);
-
-create table hop_in_inventory(
- id integer PRIMARY KEY autoincrement,
- hop_id integer,
- amount real DEFAULT 0.0,
- foreign key(hop_id) references hop(id)
-);
-
-create table misc_in_inventory(
- id integer PRIMARY KEY autoincrement,
- misc_id integer,
- amount real DEFAULT 0.0,
- foreign key(misc_id) references misc(id)
-);
-
--- For yeast, homebrewers don't usually keep stores of yeast. They keep
--- packets or vials or some other type of discrete integer quantity. So, I
--- don't know how useful a real-valued inventory amount would be for yeast.
-create table yeast_in_inventory(
- id integer PRIMARY KEY autoincrement,
- yeast_id integer,
- --amount real DEFAULT 0.0,
- quanta integer DEFAULT 0,
- foreign key(yeast_id) references yeast(id)
-);
-
-COMMIT;
diff -Nru brewtarget-2.0.3/css/tooltip.css brewtarget-2.1.0/css/tooltip.css
--- brewtarget-2.0.3/css/tooltip.css 1970-01-01 00:00:00.000000000 +0000
+++ brewtarget-2.1.0/css/tooltip.css 2014-08-02 20:52:22.000000000 +0000
@@ -0,0 +1,36 @@
+#tooltip
+{
+ border-collapse:collapse;
+ width:100%;
+ empty-cells:hide;
+}
+#tooltip td
+{
+ border: 0px solid white;
+ padding: 0px 0px 0px 0px;
+ empty-cells:show;
+}
+#tooltip th
+{
+ border: 0px solid white;
+ padding: 0px 0px 0px 0px;
+ font-weight:bold;
+ text-align:left;
+ empty-cells:show;
+}
+#tooltip caption
+{
+ caption-side:bottom;
+ text-align: center;
+ font-weight:bold;
+}
+#tooltip td.left
+{
+ font-weight:bold;
+ text-align:left;
+}
+#tooltip td.value
+{
+ font-weight:normal;
+ text-align:left;
+}
Binary files /tmp/TZhwMv27XZ/brewtarget-2.0.3/data/default_db.sqlite and /tmp/IGOo0uaZq8/brewtarget-2.1.0/data/default_db.sqlite differ
diff -Nru brewtarget-2.0.3/debian/changelog brewtarget-2.1.0/debian/changelog
--- brewtarget-2.0.3/debian/changelog 2014-07-27 21:47:59.000000000 +0000
+++ brewtarget-2.1.0/debian/changelog 2014-09-20 14:30:47.000000000 +0000
@@ -1,8 +1,12 @@
-brewtarget (2.0.3-1ppa1~trusty1) trusty; urgency=low
+brewtarget (2.1.0-1ppa1~trusty1) trusty; urgency=low
+ * New upstream release
+ * Converted debian/copyright to machine-readable format
+ * Removed deprecated hardening-includes, using dpkg-buildflags
+ * Removed sqlite3 build dependency
* Trusty tahr build
- -- Philip G. Lee Sun, 27 Jul 2014 16:05:30 -0500
+ -- Philip G. Lee Sun, 14 Sep 2014 13:41:30 -0500
brewtarget (2.0.3-1) unstable; urgency=low
diff -Nru brewtarget-2.0.3/debian/control brewtarget-2.1.0/debian/control
--- brewtarget-2.0.3/debian/control 2014-05-03 15:33:07.000000000 +0000
+++ brewtarget-2.1.0/debian/control 2014-09-15 01:03:14.000000000 +0000
@@ -2,13 +2,13 @@
Section: misc
Priority: optional
Maintainer: Philip G. Lee
-Build-Depends: cmake (>= 2.8), debhelper (>= 9.0), autotools-dev, libqt4-dev, qt4-qmake, libphonon-dev, libqtwebkit-dev, sqlite3, hardening-includes
+Build-Depends: cmake (>= 2.8), debhelper (>= 9.0), autotools-dev, libqt4-dev, qt4-qmake, libphonon-dev, libqtwebkit-dev
Standards-Version: 3.9.5
Homepage: http://www.brewtarget.org
Package: brewtarget
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite, libqt4-svg
Description: GUI beer brewing software
Brewtarget is a calculator for brewing beer. It is a Qt-based program which
allows you to create recipes from a database of ingredients. It calculates all
diff -Nru brewtarget-2.0.3/debian/copyright brewtarget-2.1.0/debian/copyright
--- brewtarget-2.0.3/debian/copyright 2014-05-03 15:33:07.000000000 +0000
+++ brewtarget-2.1.0/debian/copyright 2014-09-15 01:03:14.000000000 +0000
@@ -1,23 +1,12 @@
-This package was debianized by:
-
- Philip G. Lee on Tue, 16 Jun 2009 21:52:17 -0500
-
-It was downloaded from:
-
- http://www.brewtarget.org
-
-Upstream Author:
-
- Philip G. Lee
-
-The Debian packaging is:
-
- Copyright (C) 2009-2013, Philip G. Lee
-
-and is licensed under the GPL-3.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Brewtarget
+Upstream-Contact: Philip G. Lee
+Source: https://gitorious.org/brewtarget
+Copyright: 2009-2014, Philip G. Lee
+License: GPL-3
Files: *
-Copyright: 2009-2013, Philip G. Lee
+Copyright: 2009-2014, Philip G. Lee
License: GPL-3
Files: cmake/modules/FindPhonon.cmake
@@ -29,14 +18,14 @@
License: GPL-3
Files: images/*
-Copyright: 2009-2013, Philip G. Lee
+Copyright: 2009-2014, Philip G. Lee
2009-2010, Eric Tamme
License: WTFPL-2
Files: images/flag* images/bubbles.svg images/convert.svg
images/clipboard.svg images/refractometer.svg
images/restore.svg images/yeastVial.svg
-Copyright: 2012, Philip G. Lee
+Copyright: 2012-2014, Philip G. Lee
License: WTFPL-2
Files: images/edit-copy.png images/document-print-preview.png
@@ -44,42 +33,88 @@
images/printer.png images/server-database.png
images/kbruch.png images/help-contents.png
Copyright: David Vignoni et al.
-License: CC-BY-SA-3.0 or LGPL-3.0
+License: CC-BY-SA-3.0
Files: images/backup.png
Copyright: David Vignoni
License: LGPL-2.1
License: GPL-3
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package;if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or visit
- http://www.gnu.org/copyleft/gpl.html
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package;if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or visit
+ http://www.gnu.org/copyleft/gpl.html
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-3'.
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-3'.
-
-License: WTFPL-2
- Copyright (C) 2004 Sam Hocevar
-
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
- DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+License: BSD-2-clause
+ Copyright (c) The Regents of the University of California.
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
- 0. You just DO WHAT THE FUCK YOU WANT TO.
+License: WTFPL-2
+ Copyright (C) 2004 Sam Hocevar
+ .
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+ .
+ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ .
+ 0. You just DO WHAT THE FUCK YOU WANT TO.
License: CC-BY-SA-3.0
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
@@ -87,15 +122,15 @@
PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE
WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS
PROHIBITED.
-
+ .
BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS
LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU
THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH
TERMS AND CONDITIONS.
-
+ .
1. Definitions
-
+ .
a. "Adaptation" means a work based upon the Work, or upon the Work
and other pre-existing works, such as a translation, adaptation,
derivative work, arrangement of music or other alterations of a
@@ -190,19 +225,19 @@
the right of fixation and reproducing fixations of the Work,
including storage of a protected performance or phonogram in
digital form or other electronic medium.
-
+ .
2. Fair Dealing Rights. Nothing in this License is intended to
reduce, limit, or restrict any uses free from copyright or rights
arising from limitations or exceptions that are provided for in
connection with the copyright protection under copyright law or other
applicable laws.
-
+ .
3. License Grant. Subject to the terms and conditions of this
License, Licensor hereby grants You a worldwide, royalty-free,
non-exclusive, perpetual (for the duration of the applicable
copyright) license to exercise the rights in the Work as stated
below:
-
+ .
a. to Reproduce the Work, to incorporate the Work into one or more
Collections, and to Reproduce the Work as incorporated in the
Collections;
@@ -217,7 +252,7 @@
incorporated in Collections; and,
d. to Distribute and Publicly Perform Adaptations.
e. For the avoidance of doubt:
-
+ .
i. Non-waivable Compulsory License Schemes. In those
jurisdictions in which the right to collect royalties through
any statutory or compulsory licensing scheme cannot be
@@ -236,16 +271,16 @@
administers voluntary licensing schemes, via that society,
from any exercise by You of the rights granted under this
License.
-
+ .
The above rights may be exercised in all media and formats whether
now known or hereafter devised. The above rights include the right to
make such modifications as are technically necessary to exercise the
rights in other media and formats. Subject to Section 8(f), all
rights not expressly granted by Licensor are hereby reserved.
-
+ .
4. Restrictions. The license granted in Section 3 above is expressly
made subject to and limited by the following restrictions:
-
+ .
a. You may Distribute or Publicly Perform the Work only under the
terms of this License. You must include a copy of, or the Uniform
Resource Identifier (URI) for, this License with every copy of
@@ -348,9 +383,9 @@
applicable national law, to enable You to reasonably exercise
Your right under Section 3(b) of this License (right to make
Adaptations) but not otherwise.
-
+ .
5. Representations, Warranties and Disclaimer
-
+ .
UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING,
LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR
WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED,
@@ -360,15 +395,15 @@
OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE.
SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES,
SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
+ .
6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY
APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY
LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR
EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK,
EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
+ .
7. Termination
-
+ .
a. This License and the rights granted hereunder will terminate
automatically upon any breach by You of the terms of this
License. Individuals or entities who have received Adaptations or
@@ -385,9 +420,9 @@
other license that has been, or is required to be, granted under
the terms of this License), and this License will continue in
full force and effect unless terminated as stated above.
-
+ .
8. Miscellaneous
-
+ .
a. Each time You Distribute or Publicly Perform the Work or a
Collection, the Licensor offers to the recipient a license to the
Work on the same terms and conditions as the license granted to
@@ -428,9 +463,9 @@
not granted under this License, such additional rights are deemed
to be included in the License; this License is not intended to
restrict the license of any rights under applicable law.
-
+ .
Creative Commons Notice
-
+ .
Creative Commons is not a party to this License, and makes no
warranty whatsoever in connection with the Work. Creative Commons
will not be liable to You or any party on any legal theory for
@@ -440,7 +475,7 @@
sentences, if Creative Commons has expressly identified itself as
the Licensor hereunder, it shall have all rights and obligations
of Licensor.
-
+ .
Except for the limited purpose of indicating to the public that
the Work is licensed under the CCPL, Creative Commons does not
authorize the use by either party of the trademark "Creative
@@ -451,5 +486,5 @@
its website or otherwise made available upon request from time to
time. For the avoidance of doubt, this trademark restriction does
not form part of the License.
-
+ .
Creative Commons may be contacted at http://creativecommons.org/.
diff -Nru brewtarget-2.0.3/debian/rules brewtarget-2.1.0/debian/rules
--- brewtarget-2.0.3/debian/rules 2014-05-03 15:33:07.000000000 +0000
+++ brewtarget-2.1.0/debian/rules 2014-09-15 01:03:14.000000000 +0000
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
install-dir = "$(shell pwd)/debian/brewtarget"
-include /usr/share/hardening-includes/hardening.make
+CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CXXFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
override_dh_auto_configure:
if ! test -d build; then mkdir build; fi
diff -Nru brewtarget-2.0.3/dev-doc/CreatingStandaloneBundleMacBT.txt brewtarget-2.1.0/dev-doc/CreatingStandaloneBundleMacBT.txt
--- brewtarget-2.0.3/dev-doc/CreatingStandaloneBundleMacBT.txt 2014-01-18 22:34:39.000000000 +0000
+++ brewtarget-2.1.0/dev-doc/CreatingStandaloneBundleMacBT.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Creating a stand-alone bundle for Mac Brewtarget with the QT libraries.
-put together by Dan Cavanagh (dan@dancavanagh.com) with absolutely no guarantees :)
-
-Prerequisites:
-1) you have QT installed on your system (if you build it yourself, please make sure to use the -universal flag when building, and build the dynamic library version, not the static version)
-2) you can successfully build and run BrewTarget on your mac
-3) you have an existing, working mac bundle of BrewTarget (just download the mac brewtarget app from Sourceforge and you'll get a working bundle)
-
-Basic steps:
-
-1) Build BrewTarget
-2) Copy the BrewTarget executable into the bundle (goes into Contents>MacOS in the package, replace what's in there already)
- - to see the bundle contents, ctrl-click on the BrewTarget bundle and and choose "Show Package Contents"
-3) In terminal, navigate to the directory containing the BrewTarget bundle.
-4) Run "macdeployqt %.app" where % is the name of the brewtarget bundle (on my machine it was "brewtarget-1.2.4.app")
-
-Here's where it may not work all the way. macdeployqt is a command-line tool that comes with the full QT package (or is built if you build QT yourself). It is supposed to copy the frameworks (basically a mac equivalent of .dll's) into the proper folder in the bundle, which is Contents>Frameworks. However, if it is unable to copy the frameworks you need, it will list which ones were unsuccessful, and their locations. You should view the list of failures and simply manually cp them into the Frameworks folder in the bundle.
-
-
-Some references:
-http://doc.qt.nokia.com/latest/deployment-mac.html
- -docs about macdeployqt (at bottom of page). Also describes the manual process of doing that.
-
-
-for support, please contact the devs on the sourceforge brewtarget project
\ No newline at end of file
diff -Nru brewtarget-2.0.3/dev-doc/MacPackaging.txt brewtarget-2.1.0/dev-doc/MacPackaging.txt
--- brewtarget-2.0.3/dev-doc/MacPackaging.txt 1970-01-01 00:00:00.000000000 +0000
+++ brewtarget-2.1.0/dev-doc/MacPackaging.txt 2014-09-13 16:08:22.000000000 +0000
@@ -0,0 +1,38 @@
+# Mac Bundle Packaging
+
+Basic steps are:
+
+ $ rm -r /Applications/brewtarget.app
+ $ cmake -DDO_RELEASE_BUILD=ON -DCMAKE_OSX_ARCHITECTURES=x86_64
+ $ make
+
+This makes /Applications/brewtarget.app
+
+ $ make install
+
+The following seems unnecessary. I tried to do it and the error message suggested the
+frameworks had already been copied (and they had).
+
+ $ make addframeworks
+
+Most of the time, the SVG image format plugin will not automagically be
+copied to the app. So, manually copy
+
+ /Developer/Applications/Qt/plugins/imageformats/libqsvg.dylib
+ /Developer/Applications/Qt/plugins/iconengines/libqsvgicon.dylib
+
+to
+
+ /Applications/brewtarget.app/Contents/PlugIns/imageformats/libqsvg.dylib
+ /Applications/brewtarget.app/Contents/PlugIns/iconengines/libqsvgicon.dylib
+
+If your Qt installation is not in the same place as mine, figure it out with
+
+ $ qmake -query
+
+Use the Apple "Disk Utility" to create a 100 MB disk image. Mount it and copy
+brewtarget.app to it. Also, make a shortcut to /Applications and move it to the
+mounted disk image as well. Eject the image, and use the Disk Utility to
+convert the image to a compressed disk image.
+
+From within OSX, scp the installer to the host machine to get it out.
diff -Nru brewtarget-2.0.3/doc/brewtarget-manual.html brewtarget-2.1.0/doc/brewtarget-manual.html
--- brewtarget-2.0.3/doc/brewtarget-manual.html 2014-05-03 14:43:24.000000000 +0000
+++ brewtarget-2.1.0/doc/brewtarget-manual.html 2014-08-10 17:05:53.000000000 +0000
@@ -1,6 +1,6 @@
- Brewtarget 2.0.3 Manual
+ Brewtarget 2.1.0 Manual
";
+
+ body = "";
+ //body += QString("%1
").arg(rec->getName()());
+ body += QString("