[sweethome3d] 01/02: Merge tag 'debian/4.5+dfsg-2' into wheezy-backports

Gabriele Giacone gg0-guest at moszumanska.debian.org
Mon Dec 22 10:16:48 UTC 2014


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

gg0-guest pushed a commit to branch wheezy-backports
in repository sweethome3d.

commit 69e169392293294a0bee876695ae9b83eb547bc5
Merge: 910b575 a7a75f4
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Thu Dec 18 12:34:39 2014 +0100

    Merge tag 'debian/4.5+dfsg-2' into wheezy-backports
    
    sweethome3d Debian release 4.5+dfsg-2
    
    Conflicts:
    	debian/changelog
    	debian/control

 .classpath                                         |    3 +-
 ChangeLog                                          |  156 +-
 README.TXT                                         |   12 +-
 THIRDPARTY-LICENSE-LOADER3DS.TXT                   |  178 --
 build.xml                                          |  112 +-
 debian/README.source                               |    5 +-
 debian/changelog                                   |   23 +
 debian/control                                     |    8 +-
 debian/patches/00build.xml                         |    2 +-
 debian/patches/01noMacOSX                          |   51 +-
 debian/patches/03novideo                           |   33 +-
 debian/patches/04manifest                          |    4 +-
 debian/sweethome3d.sh                              |    2 +-
 deploy/SweetHome3D.jnlp                            |   32 +-
 deploy/SweetHome3DApplet.html                      |    6 +-
 deploy/SweetHome3DApplet.jnlp                      |    1 -
 deploy/SweetHome3DViewer.html                      |    4 +-
 deploy/SweetHome3DViewer.jnlp                      |    1 -
 deploy/deleteHome.php                              |   31 +
 install/linux/SweetHome3D                          |    2 +-
 install/macosx/Sweet Home 3D/Contents/Info.plist   |    9 +-
 install/windows/SweetHome3D.ico                    |  Bin 12830 -> 60594 bytes
 install/windows/installerInnoSetup.iss             |   14 +-
 install/windows/installerLaunch4j.xml              |   11 +-
 install/windows/signedInstallerInnoSetup.iss       |   18 +-
 src/com/eteks/sweethome3d/HomeFramePane.java       |    4 +
 src/com/eteks/sweethome3d/MacOSXConfiguration.java |   19 +-
 src/com/eteks/sweethome3d/SweetHome3D.java         |   20 +-
 .../eteks/sweethome3d/SweetHome3DBootstrap.java    |   15 +-
 .../sweethome3d/applet/AppletApplication.java      |   92 +-
 .../sweethome3d/applet/AppletContentManager.java   |  127 +-
 .../sweethome3d/applet/AppletUserPreferences.java  |    1 -
 .../sweethome3d/applet/HomeAppletController.java   |  205 ++-
 .../sweethome3d/applet/HomeAppletRecorder.java     |  101 +-
 .../sweethome3d/applet/SweetHome3DApplet.java      |   20 +-
 .../sweethome3d/applet/SweetHome3DViewer.java      |   25 +-
 src/com/eteks/sweethome3d/applet/ViewerHelper.java |  160 +-
 .../eteks/sweethome3d/applet/package.properties    |   31 +-
 .../eteks/sweethome3d/applet/package_bg.properties |   26 +
 .../eteks/sweethome3d/applet/package_de.properties |   32 +-
 .../eteks/sweethome3d/applet/package_el.properties |   30 +-
 .../eteks/sweethome3d/applet/package_es.properties |   28 +-
 .../eteks/sweethome3d/applet/package_fr.properties |   34 +-
 .../eteks/sweethome3d/applet/package_hu.properties |   29 +-
 .../eteks/sweethome3d/applet/package_it.properties |   31 +-
 .../eteks/sweethome3d/applet/package_ja.properties |   30 +-
 .../eteks/sweethome3d/applet/package_pl.properties |   31 +-
 .../eteks/sweethome3d/applet/package_pt.properties |   31 +-
 .../eteks/sweethome3d/applet/package_ru.properties |   31 +-
 .../eteks/sweethome3d/applet/package_sv.properties |   29 +-
 .../eteks/sweethome3d/applet/package_vi.properties |   29 +-
 .../sweethome3d/applet/package_zh_CN.properties    |   43 +-
 .../applet/resources/document-import-sh3d.png      |  Bin 0 -> 561 bytes
 src/com/eteks/sweethome3d/io/Base64.java           | 1214 +++++++++++++
 .../eteks/sweethome3d/io/ContentDigestManager.java |  319 ++++
 .../io/ContributedFurnitureCatalog.properties      |   19 +-
 .../io/ContributedFurnitureCatalog_fr.properties   |    6 +-
 .../io/ContributedFurnitureCatalog_pt.properties   |   22 +-
 .../sweethome3d/io/DamagedHomeIOException.java     |   61 +
 .../sweethome3d/io/DefaultFurnitureCatalog.java    |   66 +-
 .../io/DefaultFurnitureCatalog.properties          |   69 +-
 .../io/DefaultFurnitureCatalog_fr.properties       |    6 +-
 .../io/DefaultFurnitureCatalog_pt.properties       |   38 +-
 .../io/DefaultFurnitureCatalog_ru.properties       |    8 +-
 .../sweethome3d/io/DefaultHomeInputStream.java     |  483 +++++-
 .../sweethome3d/io/DefaultHomeOutputStream.java    |  116 +-
 .../sweethome3d/io/DefaultTexturesCatalog.java     |   25 +-
 .../io/DefaultTexturesCatalog.properties           |   26 +
 .../io/DefaultTexturesCatalog_bg.properties        |    2 +-
 .../io/DefaultTexturesCatalog_it.properties        |    2 +-
 .../sweethome3d/io/DefaultUserPreferences.java     |    2 -
 .../eteks/sweethome3d/io/FileUserPreferences.java  |    5 +-
 src/com/eteks/sweethome3d/io/HomeFileRecorder.java |   67 +-
 .../eteks/sweethome3d/io/resources/spotlight.obj   |    6 +
 .../eteks/sweethome3d/j3d/Component3DManager.java  |   37 +-
 src/com/eteks/sweethome3d/j3d/DAELoader.java       |    2 +-
 src/com/eteks/sweethome3d/j3d/Ground3D.java        |   43 +-
 .../sweethome3d/j3d/HomePieceOfFurniture3D.java    |  233 ++-
 src/com/eteks/sweethome3d/j3d/Max3DSLoader.java    | 1803 ++++++++++++++++++++
 src/com/eteks/sweethome3d/j3d/ModelManager.java    |  110 +-
 src/com/eteks/sweethome3d/j3d/PhotoRenderer.java   |   20 +-
 src/com/eteks/sweethome3d/j3d/Room3D.java          |   28 +-
 src/com/eteks/sweethome3d/j3d/TextureManager.java  |  280 ++-
 src/com/eteks/sweethome3d/j3d/Wall3D.java          |   38 +-
 .../sweethome3d/model/CatalogDoorOrWindow.java     |   51 +-
 ...ptedRecorderException.java => CatalogItem.java} |   28 +-
 src/com/eteks/sweethome3d/model/CatalogLight.java  |   48 +
 .../sweethome3d/model/CatalogPieceOfFurniture.java |   70 +-
 .../eteks/sweethome3d/model/CatalogTexture.java    |  119 +-
 .../model/DamagedHomeRecorderException.java        |   70 +
 .../eteks/sweethome3d/model/FurnitureCatalog.java  |   34 +-
 .../eteks/sweethome3d/model/FurnitureCategory.java |   21 +-
 src/com/eteks/sweethome3d/model/Home.java          |   47 +-
 .../sweethome3d/model/HomeFurnitureGroup.java      |   39 +-
 .../sweethome3d/model/HomePieceOfFurniture.java    |   14 +-
 src/com/eteks/sweethome3d/model/HomeTexture.java   |   46 +-
 .../model/InterruptedRecorderException.java        |    2 +-
 src/com/eteks/sweethome3d/model/LengthUnit.java    |   98 +-
 .../eteks/sweethome3d/model/LengthUnit.properties  |    3 +-
 ...n.java => NotEnoughSpaceRecorderException.java} |   25 +-
 .../eteks/sweethome3d/model/PieceOfFurniture.java  |    8 +
 .../eteks/sweethome3d/model/TexturesCatalog.java   |   34 +-
 .../eteks/sweethome3d/model/TexturesCategory.java  |   21 +-
 .../eteks/sweethome3d/model/UserPreferences.java   |   37 +-
 src/com/eteks/sweethome3d/model/Wall.java          |    4 +-
 src/com/eteks/sweethome3d/package.properties       |    3 +-
 src/com/eteks/sweethome3d/package_bg.properties    |    3 +-
 src/com/eteks/sweethome3d/package_cs.properties    |    1 +
 src/com/eteks/sweethome3d/package_de.properties    |    2 +-
 src/com/eteks/sweethome3d/package_el.properties    |    5 +-
 src/com/eteks/sweethome3d/package_es.properties    |    3 +-
 src/com/eteks/sweethome3d/package_fr.properties    |    1 +
 src/com/eteks/sweethome3d/package_hu.properties    |    1 +
 src/com/eteks/sweethome3d/package_it.properties    |    1 +
 src/com/eteks/sweethome3d/package_ja.properties    |    5 +-
 src/com/eteks/sweethome3d/package_pl.properties    |    3 +-
 src/com/eteks/sweethome3d/package_pt.properties    |    5 +-
 src/com/eteks/sweethome3d/package_ru.properties    |    5 +-
 src/com/eteks/sweethome3d/package_sv.properties    |    1 +
 src/com/eteks/sweethome3d/package_vi.properties    |    4 +-
 src/com/eteks/sweethome3d/package_zh_CN.properties |    5 +-
 .../eteks/sweethome3d/swing/AutoCommitSpinner.java |  120 +-
 .../sweethome3d/swing/CatalogItemToolTip.java      |  225 +++
 src/com/eteks/sweethome3d/swing/CompassPanel.java  |   26 +-
 .../sweethome3d/swing/FileContentManager.java      |   16 +-
 .../swing/FurnitureCatalogListPanel.java           |  116 +-
 .../swing/FurnitureCatalogTransferHandler.java     |   14 +-
 .../sweethome3d/swing/FurnitureCatalogTree.java    |   69 +-
 .../eteks/sweethome3d/swing/FurnitureTable.java    |  488 +++++-
 .../eteks/sweethome3d/swing/FurnitureToolTip.java  |  178 --
 src/com/eteks/sweethome3d/swing/HelpPane.java      |   11 +-
 .../eteks/sweethome3d/swing/HomeComponent3D.java   |   78 +-
 .../sweethome3d/swing/HomeFurniturePanel.java      |   12 +-
 src/com/eteks/sweethome3d/swing/HomePane.java      |  123 +-
 .../swing/ImportedFurnitureWizardStepsPanel.java   |   50 +-
 .../sweethome3d/swing/ModelMaterialsComponent.java |   97 +-
 .../sweethome3d/swing/ModelPreviewComponent.java   |   44 +-
 .../sweethome3d/swing/MultipleLevelsPlanPanel.java |   73 +-
 .../eteks/sweethome3d/swing/NullableSpinner.java   |   75 +-
 .../sweethome3d/swing/ObserverCameraPanel.java     |    6 +-
 src/com/eteks/sweethome3d/swing/PhotoPanel.java    |    1 +
 src/com/eteks/sweethome3d/swing/PlanComponent.java |  163 +-
 src/com/eteks/sweethome3d/swing/SwingTools.java    |   69 +-
 .../sweethome3d/swing/TextureChoiceComponent.java  |  670 ++++++--
 .../sweethome3d/swing/UserPreferencesPanel.java    |   94 +-
 src/com/eteks/sweethome3d/swing/VideoPanel.java    |   13 +-
 src/com/eteks/sweethome3d/swing/package.properties |   41 +-
 .../eteks/sweethome3d/swing/package_bg.properties  |   35 +-
 .../eteks/sweethome3d/swing/package_cs.properties  |   18 +-
 .../eteks/sweethome3d/swing/package_de.properties  |   35 +-
 .../eteks/sweethome3d/swing/package_el.properties  |   31 +-
 .../eteks/sweethome3d/swing/package_es.properties  |   41 +-
 .../eteks/sweethome3d/swing/package_fr.properties  |   32 +-
 .../eteks/sweethome3d/swing/package_hu.properties  |   37 +-
 .../eteks/sweethome3d/swing/package_it.properties  |   36 +-
 .../eteks/sweethome3d/swing/package_ja.properties  |   33 +-
 .../eteks/sweethome3d/swing/package_pl.properties  |   41 +-
 .../eteks/sweethome3d/swing/package_pt.properties  |   52 +-
 .../eteks/sweethome3d/swing/package_ru.properties  |   48 +-
 .../eteks/sweethome3d/swing/package_sv.properties  |   38 +-
 .../eteks/sweethome3d/swing/package_vi.properties  |   32 +-
 .../sweethome3d/swing/package_zh_CN.properties     |  112 +-
 .../swing/resources/furnitureInformation.png       |  Bin 0 -> 547 bytes
 .../eteks/sweethome3d/tools/OperatingSystem.java   |   26 +-
 .../viewcontroller/FurnitureController.java        |  197 ++-
 .../viewcontroller/Home3DAttributesController.java |    1 +
 .../sweethome3d/viewcontroller/HomeController.java |  299 +++-
 .../viewcontroller/HomeController3D.java           |   22 +-
 .../viewcontroller/HomeFurnitureController.java    |   46 +-
 .../eteks/sweethome3d/viewcontroller/HomeView.java |   16 +-
 .../ImportedFurnitureWizardController.java         |   25 +-
 .../viewcontroller/LabelController.java            |   14 +-
 .../sweethome3d/viewcontroller/PlanController.java |  337 ++--
 .../viewcontroller/TextureChoiceController.java    |   50 +-
 .../sweethome3d/viewcontroller/package.properties  |    9 +-
 .../viewcontroller/package_bg.properties           |    9 +-
 .../viewcontroller/package_cs.properties           |    1 +
 .../viewcontroller/package_de.properties           |    7 +-
 .../viewcontroller/package_el.properties           |    6 +-
 .../viewcontroller/package_es.properties           |   19 +-
 .../viewcontroller/package_fr.properties           |    7 +-
 .../viewcontroller/package_hu.properties           |    7 +-
 .../viewcontroller/package_it.properties           |    9 +-
 .../viewcontroller/package_ja.properties           |    8 +-
 .../viewcontroller/package_pl.properties           |   11 +-
 .../viewcontroller/package_pt.properties           |   11 +-
 .../viewcontroller/package_ru.properties           |   19 +-
 .../viewcontroller/package_sv.properties           |    7 +-
 .../viewcontroller/package_vi.properties           |    6 +-
 .../viewcontroller/package_zh_CN.properties        |   18 +-
 .../resources/help/bg/addingLevels.html            |   16 +-
 .../resources/help/bg/editing3DView.html           |    7 +-
 .../resources/help/bg/editingFurniture.html        |   21 +-
 .../resources/help/bg/editingPreferences.html      |    6 +-
 .../resources/help/bg/importingFurniture.html      |    2 +-
 .../viewcontroller/resources/help/bg/tips.html     |   19 +-
 .../resources/help/cs/importingFurniture.html      |    2 +-
 .../resources/help/de/addingLevels.html            |   11 +-
 .../resources/help/de/editing3DView.html           |    4 +-
 .../resources/help/de/editingFurniture.html        |   33 +-
 .../resources/help/de/editingPreferences.html      |    4 +-
 .../resources/help/de/importingFurniture.html      |    2 +-
 .../viewcontroller/resources/help/de/tips.html     |   15 +-
 .../resources/help/el/importingFurniture.html      |    2 +-
 .../resources/help/en/addingLevels.html            |   11 +-
 .../resources/help/en/editing3DView.html           |    4 +-
 .../resources/help/en/editingFurniture.html        |   54 +-
 .../resources/help/en/editingPreferences.html      |    6 +-
 .../resources/help/en/importingFurniture.html      |    4 +-
 .../resources/help/en/savingHome.html              |    2 -
 .../viewcontroller/resources/help/en/tips.html     |   14 +-
 .../resources/help/en/tocCreating.html             |   14 +-
 .../resources/help/en/tocEditing.html              |    9 +-
 .../resources/help/en/tocImporting.html            |   10 +-
 .../resources/help/es/addingLevels.html            |  135 ++
 .../resources/help/es/creatingHome.html            |    2 +-
 .../resources/help/es/editing3DView.html           |    6 +-
 .../resources/help/es/editingFurniture.html        |   65 +-
 .../resources/help/es/editingLevels.html           |   79 +
 .../resources/help/es/editingRooms.html            |    2 +-
 .../resources/help/es/images/editingLevels.png     |  Bin 0 -> 15100 bytes
 .../resources/help/es/importingBackground.html     |    2 +-
 .../resources/help/es/importingFurniture.html      |    2 +-
 .../viewcontroller/resources/help/es/tips.html     |   15 +-
 .../resources/help/es/tocCreating.html             |   11 +-
 .../resources/help/es/tocEditing.html              |    4 +-
 .../viewcontroller/resources/help/es/ui.html       |    2 +-
 .../resources/help/fr/addingLevels.html            |   16 +-
 .../resources/help/fr/editing3DView.html           |    5 +-
 .../resources/help/fr/editingFurniture.html        |   20 +-
 .../resources/help/fr/editingPreferences.html      |    6 +-
 .../resources/help/fr/importingFurniture.html      |    2 +-
 .../viewcontroller/resources/help/fr/tips.html     |   16 +-
 .../resources/help/hu/addingLevels.html            |   17 +-
 .../resources/help/hu/editing3DView.html           |    3 +-
 .../resources/help/hu/editingFurniture.html        |   44 +-
 .../resources/help/hu/editingPreferences.html      |    2 +-
 .../resources/help/hu/importingFurniture.html      |    2 +-
 .../viewcontroller/resources/help/hu/tips.html     |  622 ++++---
 .../resources/help/it/importingFurniture.html      |    2 +-
 .../resources/help/ja/addingLevels.html            |  100 ++
 .../resources/help/ja/creatingPhotos.html          |  152 ++
 .../resources/help/ja/creatingVideos.html          |   77 +
 .../resources/help/ja/editingCompass.html          |   96 ++
 .../resources/help/ja/editingLevels.html           |   56 +
 .../resources/help/ja/images/creatingPhotos.jpg    |  Bin 0 -> 52417 bytes
 .../ja/images/creatingPhotosAtPointsOfView.png     |  Bin 0 -> 17571 bytes
 .../resources/help/ja/images/creatingVideos.jpg    |  Bin 0 -> 48433 bytes
 .../resources/help/ja/images/editingCompass.png    |  Bin 0 -> 13777 bytes
 .../resources/help/ja/images/editingLevels.png     |  Bin 0 -> 12199 bytes
 .../help/ja/images/editingVirtualVisitor.png       |  Bin 0 -> 12817 bytes
 .../resources/help/ja/importingFurniture.html      |    2 +-
 .../viewcontroller/resources/help/ja/index.html    |    3 +-
 .../viewcontroller/resources/help/ja/tips.html     |   61 +-
 .../resources/help/ja/tocCreating.html             |    2 +
 .../{tocImporting.html => tocCreatingPhotos.html}  |   20 +-
 .../resources/help/ja/tocEditing.html              |    5 +-
 .../resources/help/ja/tocImporting.html            |    1 +
 .../resources/help/pl/addingFurniture.html         |   48 +-
 .../resources/help/pl/creatingHome.html            |   16 +-
 .../resources/help/pl/drawingDimensions.html       |   47 +-
 .../resources/help/pl/drawingWalls.html            |   38 +-
 .../resources/help/pl/editing3DView.html           |   54 +-
 .../resources/help/pl/editingDimensions.html       |   29 +-
 .../resources/help/pl/editingFurniture.html        |  112 +-
 .../resources/help/pl/editingPreferences.html      |   29 +-
 .../resources/help/pl/editingWalls.html            |    7 +-
 .../resources/help/pl/images/editingMaterials.png  |  Bin 0 -> 12723 bytes
 .../resources/help/pl/importingBackground.html     |    4 +
 .../resources/help/pl/importingFurniture.html      |   26 +-
 .../viewcontroller/resources/help/pl/index.html    |    6 +-
 .../viewcontroller/resources/help/pl/ui.html       |    2 +-
 .../resources/help/pt/addingLevels.html            |   97 ++
 .../resources/help/pt/editing3DView.html           |    6 +-
 .../resources/help/pt/editingLevels.html           |   60 +
 .../resources/help/pt/images/editingLevels.png     |  Bin 0 -> 15542 bytes
 .../resources/help/pt/importingFurniture.html      |    2 +-
 .../viewcontroller/resources/help/pt/index.html    |    2 +-
 .../resources/help/pt/tocCreating.html             |    1 +
 .../resources/help/pt/tocEditing.html              |    1 +
 .../resources/help/ru/addingFurniture.html         |   75 +-
 .../resources/help/ru/addingLevels.html            |  122 ++
 .../resources/help/ru/addingTexts.html             |   78 +
 .../resources/help/ru/creatingHome.html            |   28 +-
 .../resources/help/ru/creatingPhotos.html          |  182 ++
 .../resources/help/ru/creatingVideos.html          |   95 ++
 .../resources/help/ru/drawingDimensions.html       |   75 +-
 .../resources/help/ru/drawingRooms.html            |  169 ++
 .../resources/help/ru/drawingWalls.html            |   62 +-
 .../resources/help/ru/editing3DView.html           |   99 +-
 .../resources/help/ru/editingCompass.html          |  101 ++
 .../resources/help/ru/editingDimensions.html       |   54 +-
 .../resources/help/ru/editingFurniture.html        |  378 ++--
 .../resources/help/ru/editingLevels.html           |   68 +
 .../resources/help/ru/editingPreferences.html      |   95 +-
 .../resources/help/ru/editingRooms.html            |  189 ++
 .../resources/help/ru/editingWalls.html            |   80 +-
 .../resources/help/ru/images/addingText.png        |  Bin 0 -> 4815 bytes
 .../resources/help/ru/images/creatingPhotos.jpg    |  Bin 0 -> 41553 bytes
 .../ru/images/creatingPhotosAtPointsOfView.png     |  Bin 0 -> 18439 bytes
 .../resources/help/ru/images/creatingVideos.jpg    |  Bin 0 -> 35345 bytes
 .../resources/help/ru/images/editingCompass.png    |  Bin 0 -> 17768 bytes
 .../resources/help/ru/images/editingLevels.png     |  Bin 0 -> 14904 bytes
 .../resources/help/ru/images/editingMaterials.png  |  Bin 0 -> 11690 bytes
 .../resources/help/ru/images/editingRooms.png      |  Bin 0 -> 20111 bytes
 .../help/ru/images/editingVirtualVisitor.png       |  Bin 0 -> 13375 bytes
 .../resources/help/ru/importingBackground.html     |   42 +-
 .../resources/help/ru/importingFurniture.html      |   90 +-
 .../viewcontroller/resources/help/ru/index.html    |    5 +-
 .../resources/help/ru/printingHome.html            |   68 +-
 .../resources/help/ru/savingHome.html              |   54 +-
 .../viewcontroller/resources/help/ru/tips.html     |  544 +++---
 .../resources/help/ru/tocCreating.html             |   36 +-
 .../resources/help/ru/tocCreatingPhotos.html       |   48 +
 .../resources/help/ru/tocEditing.html              |   34 +-
 .../resources/help/ru/tocImporting.html            |   27 +-
 .../viewcontroller/resources/help/ru/tocStart.html |   31 +-
 .../viewcontroller/resources/help/ru/ui.html       |   45 +-
 .../resources/help/sv/addingLevels.html            |   19 +-
 .../resources/help/sv/editing3DView.html           |    2 +-
 .../resources/help/sv/editingFurniture.html        |   15 +-
 .../resources/help/sv/editingPreferences.html      |    2 +-
 .../resources/help/sv/importingFurniture.html      |    2 +-
 .../viewcontroller/resources/help/sv/tips.html     |  641 +++----
 .../resources/help/zh_CN/importingFurniture.html   |    2 +-
 .../resources/importedFurnitureWizard.png          |  Bin 12362 -> 12248 bytes
 .../viewcontroller/resources/repairedIcon.png      |  Bin 0 -> 303 bytes
 .../viewcontroller/resources/repairedImage.png     |  Bin 0 -> 126 bytes
 .../viewcontroller/resources/repairedModel.obj     |   23 +
 .../eteks/sweethome3d/junit/HomeCameraTest.java    |    8 +-
 .../sweethome3d/junit/HomeControllerTest.java      |   93 +-
 .../sweethome3d/junit/HomeFileRecorderTest.java    |   38 +
 .../sweethome3d/junit/HomeFurniturePanelTest.java  |   19 +-
 test/com/eteks/sweethome3d/junit/LevelTest.java    |   32 +-
 .../com/eteks/sweethome3d/junit/OBJWriterTest.java |    2 +-
 .../sweethome3d/junit/PackageDependenciesTest.java |    2 -
 .../junit/UserPreferencesPanelTest.java            |   15 +-
 .../sweethome3d/junit/resources/damagedHome.sh3d   |  Bin 0 -> 20480 bytes
 ...meInValidZipWithContentDigestsAndNoContent.sh3d |  Bin 0 -> 5075 bytes
 .../resources/damagedHomeWithContentDigests.sh3d   |  Bin 0 -> 20480 bytes
 340 files changed, 15186 insertions(+), 3894 deletions(-)

diff --cc debian/changelog
index 9b8af90,3f8fc96..255ef41
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,26 +1,33 @@@
+ sweethome3d (4.5+dfsg-2) unstable; urgency=medium
+ 
+   * 4.5 replaces Loader3DS with a library inspired from lib3ds.
+     + Remove java3ds-fileloader from build and runtime deps.
+     + Update manifest and java wrapper accordingly.
+ 
+  -- Gabriele Giacone <1o5g4r8o at gmail.com>  Fri, 24 Oct 2014 03:40:59 +0200
+ 
+ sweethome3d (4.5+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Bump Standards-Version to 3.9.6 (no changes).
+   * Refresh patches.
+ 
+  -- Gabriele Giacone <1o5g4r8o at gmail.com>  Thu, 23 Oct 2014 00:55:27 +0200
+ 
+ sweethome3d (4.4+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release (Closes: #754277)
+   * Depend on sunflow 0.07.2.svn396+dfsg-11.
+ 
+  -- Gabriele Giacone <1o5g4r8o at gmail.com>  Wed, 18 Jun 2014 12:02:29 +0200
+ 
 +sweethome3d (4.3+dfsg-1~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports.
 +  * Depend on sunflow 0.07.2.svn396+dfsg-10~bpo70+1.
 +
 + -- Gabriele Giacone <1o5g4r8o at gmail.com>  Tue, 18 Feb 2014 18:06:17 +0100
 +
  sweethome3d (4.3+dfsg-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 075d99c,e3e6658..3cc7dd5
--- a/debian/control
+++ b/debian/control
@@@ -9,11 -9,10 +9,10 @@@ Build-Depends-Indep: icedtea-netx-commo
                       libfreehep-graphicsio-svg-java,
                       libitext-java,
                       libjava3d-java,
-                      libsunflow-java (>= 0.07.2.svn396+dfsg-10~bpo70+1),
 -                     libsunflow-java (>= 0.07.2.svn396+dfsg-11),
++                     libsunflow-java (>= 0.07.2.svn396+dfsg-11~bpo70+1),
                       libbatik-java,
                       default-jdk
- Standards-Version: 3.9.5
+ Standards-Version: 3.9.6
  Vcs-Git: git://anonscm.debian.org/pkg-java/sweethome3d.git
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/sweethome3d.git
  Homepage: http://www.sweethome3d.com/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d.git



More information about the pkg-java-commits mailing list