diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..332c598 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,312 @@ +ros-jazzy-geometric-shapes (2.3.0-1noble) noble; urgency=high + + * Install headers into subdirectory (#253 ) + * Added bodies::Body::computeBoundingBox (oriented box version) (#239 ) + * Improve padding of meshes using weighted vertex normals (#240 ) + * Contributors: Kenji Brameld (TRACLabs), Robert Haschke, Sebastian Castro, Sebastian Pelletier, Tyler Mayoff + + -- Tyler Weaver Fri, 29 Nov 2024 05:00:00 -0000 + +ros-jazzy-geometric-shapes (2.2.1-1noble) noble; urgency=high + + * Use the system version of octomap (#244 ) + * Contributors: Chris Lalancette + + -- Tyler Weaver Wed, 26 Jun 2024 04:00:00 -0000 + +ros-jazzy-geometric-shapes (2.2.0-1noble) noble; urgency=high + + * Jazzy Support (#241 ) + * Update CI workflows to Rolling, Jazzy, Humble + * Fix octomap dependency version to 1.9.7...<1.10.0 + * Fix Box::print (#237 ) + * CI: Fix cache key (#236 ) + * Switch to clang-format-14 (#228 ) + * Add humble testing (#221 ) + * Update black version (#218 ) + * Contributors: Henning Kayser, Matthijs van der Burgh, Stephanie Eng, Vatan Aksoy Tezer, Robert Haschke, Jafar Abdi + + -- Tyler Weaver Fri, 07 Jun 2024 04:00:00 -0000 + +ros-jazzy-geometric-shapes (2.1.3-1noble) noble; urgency=high + + * [jammy] Fix assimp linking and cmake error (#215 ) + * Contributors: Vatan Aksoy Tezer + + -- Tyler Weaver Tue, 08 Mar 2022 05:00:00 -0000 + +ros-jazzy-geometric-shapes (2.1.2-1noble) noble; urgency=high + + * Fix cmake such that Boost::filesystem is exported properly (#206 ) + Co-authored-by: Jordan Lack + * Contributors: Jafar Abdi + + -- Tyler Weaver Wed, 22 Dec 2021 05:00:00 -0000 + +ros-jazzy-geometric-shapes (2.1.1-1noble) noble; urgency=high + + * Changed retriever.h to retriever.hpp in mesh_operations.cpp in order to align with resource_retriever ros2 branch (#200 ) + * Add Copyright and LICENSE files + * Fix building on Windows with MSVC (#189 ) + * Contributors: Akash, Diego Rojas, Mark Moll, Tyler Weaver, Vatan Aksoy Tezer + + -- Tyler Weaver Mon, 27 Sep 2021 04:00:00 -0000 + +ros-jazzy-geometric-shapes (2.1.0-1noble) noble; urgency=high + + * Add Galactic CI, cleanup rolling (#190 ) + * Sync ros2 branch with noetic-devel up to d147f03 (#190 ) + * Contributors: Jafar Abdi, Henning Kayser, Vatan Aksoy Tezer + + -- Tyler Weaver Tue, 15 Jun 2021 04:00:00 -0000 + +ros-jazzy-geometric-shapes (2.0.2-1noble) noble; urgency=high + + * Declare assimp add qhull as SYSTEM dependency to suppress compiler warnings (#186 ) + * Fix export depends (#182 ) + * Add rolling to CI test (#179 ) + * Contributors: Jafar Abdi, Tyler Weaver + + -- Tyler Weaver Sat, 22 May 2021 04:00:00 -0000 + +ros-jazzy-geometric-shapes (2.0.1-1noble) noble; urgency=high + + * Set target compile options in cmake for warnings + * [fix] cmake install command (#164 ) + * Contributors: Tyler Weaver + + -- Tyler Weaver Fri, 09 Apr 2021 04:00:00 -0000 + +ros-jazzy-geometric-shapes (2.0.0-1noble) noble; urgency=high + + * [maint] Travis: Disable warnings as gcc warns about redundant declarations in qhull includes + * [maint] Inherit package VERSION (for library soname) from package.xml + * [maint] Trim boost dependencies #156 + * libboost-math libraries unnecessary as only headers-only parts are used + * move author tags below to comply with the xsd + * [maint] Compile on ROS2 Foxy (#153 ) + * Suppress assimp CMP0012 policy warning + * Use console_bridge_vendor dependency wrapper + * Fix CMakeLists issues:remove ASSIMP export dependency + + fix linking of OCTOMAP, resource_retriever + * [maint] Resolve octomap dependency with rosdep (#124 ) + * [maint] struct SolidPrimitiveDimCount -> function solidPrimitiveDimCount() (#121 ) + * [ros2-migration] Port to ROS 2 (#122 ) + * Migrate CMakeLists.txt, package.xml, messages + * Enable Travis: Run on ROS 2, enable ament_lint_cmake + * Contributors: Henning Kayser, Mikael Arguedas, Robert Haschke, Víctor Mayoral Vilches + + -- Tyler Weaver Fri, 20 Nov 2020 05:00:00 -0000 + +ros-jazzy-geometric-shapes (0.7.2-1noble) noble; urgency=high + + * [maint] Renamed SolidPrimitiveDimCount::value -> solidPrimitiveDimCount() (#121 ) + * [maint] cmake: Consistently use uppercase letters for QHULL dependency + * [maint] cmake: Fix assimp warning + * [maint] Update build badges for Noetic + * Contributors: Robert Haschke + + -- Tyler Weaver Fri, 25 Sep 2020 04:00:00 -0000 + +ros-jazzy-geometric-shapes (0.7.1-1noble) noble; urgency=high + + * [maint] Declare external includes as SYSTEM includes + * [maint] Migration to reentrant qhull (#149 ) + * [maint] Use soname version for library (#157 ) + * Contributors: Jochen Sprickerhof, Robert Haschke, Tyler Weaver + + -- Tyler Weaver Mon, 31 Aug 2020 04:00:00 -0000 + +ros-jazzy-geometric-shapes (0.7.0-1noble) noble; urgency=high + + * [feature] Added constructShapeFromBody() and constructMarkerFromBody() (#138 ) + * [maint] API cleanup + * Improve inlining + * ConvexMesh::MeshData as pimpl + * Reverted ABI compatibility fixups for Melodic: ed4cf1339cf3765ae9ffa6e6fd111a4e342c5fa2, d582479084a10cac53a7f17e29818b3d8be6161e + * Contributors: Martin Pecka, Robert Haschke + + -- Tyler Weaver Mon, 25 May 2020 04:00:00 -0000 + +ros-jazzy-geometric-shapes (0.6.3-1noble) noble; urgency=high + + * [maint] Provide checkIsometry() helper function (#144 ) + * [maint] Remove dynamic casts (#143 ) + * [feature] Added createEmptyBodyFromShapeType() (#137 ) + This allows more efficient body construction when scale, padding or pose should also be set during the construction. + * Contributors: Martin Pecka, Michael Görner + + -- Tyler Weaver Mon, 25 May 2020 04:00:00 -0000 + +ros-jazzy-geometric-shapes (0.6.2-1noble) noble; urgency=high + + * [maint] clang-tidy fixes in headers (#139 ) + * [fix] Various fixes + performance improvements (#109 , #126 , #107 , #108 ) + * Use Eigen::Isometry3d::linear() instead of rotation() + * Normalize the direction vector passed to Body::intersectsRay() (#115 ) + * Improved test coverage + * [feature] Added support for non-uniform scaling and padding of shapes. (#103 ) + * [maint] Made bodies::samplePointInside() const. (#133 ) + * [fix] Throw runtime exception when a shape or body should have a negative dimension. (#106 ) + * [maint] Prefer std::make_shared (#116 ) + * [maint] clang-tidy fixes (#114 ) + * [fix] Use covariant returns for clone() (#102 ) + * [feature] Added bodies::Body::computeBoundingBox (aligned box version). (#104 ) + * [maint] Windows compatibility: fix ASSIMP libraries path (#101 ) + * [fix] Body::containsPoint(): always include surface points (#97 ) + * Contributors: Martin Pecka, Alejandro Hernández Cordero, Bryce Willey, Michael Görner, Mike Lautman, Robert Haschke, RoboticsYY, Sean Yen, Tyler Weaver + + -- Tyler Weaver Sat, 02 May 2020 04:00:00 -0000 + +ros-jazzy-geometric-shapes (0.6.1-1noble) noble; urgency=high + + * Limit minimum number of cylinder vertices (on circumference) to 6 (#92 ) + * Eigen::Affine3d -> Eigen::Isometry3d (#88 ) + * Contributors: Robert Haschke, eisoku9618 + + -- Tyler Weaver Sun, 09 Dec 2018 05:00:00 -0000 + +ros-jazzy-geometric-shapes (0.6.0-1noble) noble; urgency=high + + * Add method getPlanes and use double precision for planes (#82 ) + * Contributors: Bence Magyar + + -- Tyler Weaver Mon, 14 May 2018 04:00:00 -0000 + +ros-jazzy-geometric-shapes (0.5.4-1noble) noble; urgency=high + + * gracefully handle negative cylinder height: #64 , #80 + * clang-formatting of whole repo: #79 + * operator<< for ShapeType: #80 + * adaption to new CONSOLE_BRIDGE_logXXX API: #75 , #72 + * [fix] box-ray intersection: #73 + * Contributors: Dave Coleman, Leroy Rügemer, Malcolm Mielle, Mike Purvis, Robert Haschke, Michael Goerner + + -- Tyler Weaver Fri, 06 Apr 2018 04:00:00 -0000 + +ros-jazzy-geometric-shapes (0.5.3-1noble) noble; urgency=high + + * [enhance] Add warning about common Assimp bug (#63 ) + * [maintenance] Update maintainers (#66 ) + * Contributors: Dave Coleman + + -- Tyler Weaver Sun, 26 Nov 2017 05:00:00 -0000 + +ros-jazzy-geometric-shapes (0.5.2-1noble) noble; urgency=high + + * [fix] mesh with too many vertices (#39 ) (#60 ) + * [fix] gcc6 build error (#56 ) + * [fix] Clear root transformation on imported Collada meshes. #52 + * [improve] relax mesh containment test (#58 ) + * [maintenance] Switch boost::shared_ptr to std::shared_ptr. #57 + * Contributors: Dave Coleman, Isaac I.Y. Saito, Lukas Bulwahn, Maarten de Vries, Michael Goerner + + -- Tyler Weaver Thu, 20 Oct 2016 04:00:00 -0000 + +ros-jazzy-geometric-shapes (0.5.1-1noble) noble; urgency=high + + * add c++11 safe-guards to the respective headers (#51 ) + This is, to be polite and point problems that might arise it out to users. + * Fix incorrect hint always sent to Assimp, improved STL reading (#24 ) + * Contributors: Dave Coleman, Michael Görner + + -- Tyler Weaver Tue, 23 Aug 2016 04:00:00 -0000 + +ros-jazzy-geometric-shapes (0.5.0-1noble) noble; urgency=high + + * [fix] append cmake module path instead of prepending (#22 ) + * [fix] FindQhull with non-debian systems (#30 ). See https://github.com/PointCloudLibrary/pcl/pull/852 + * [sys] Use std::shared_ptr for compatibility with FCL 0.5. #47 + * [sys] Switch to eigen 3 (#46 ) + * [sys] Switched to C++11 #44 + * [sys] add notice that project will be built in Release mode + * [sys] Remove link_directories, deprecated assimp code + * Contributors: Dave Coleman, Ioan A Sucan, Jochen Sprickerhof, Maarten de Vries, Michael Goerner + + -- Tyler Weaver Sun, 31 Jul 2016 04:00:00 -0000 + +ros-jazzy-geometric-shapes (0.4.4-1noble) noble; urgency=high + + * Merge pull request #37 from corot/indigo-devel + Fix issue #28 on small radius cylinders + * Contributors: Dave Coleman, Jorge Santos Simon + + -- Tyler Weaver Sun, 06 Mar 2016 05:00:00 -0000 + +ros-jazzy-geometric-shapes (0.4.3-1noble) noble; urgency=high + + * add functions for better display of convex meshes + * produce actual triangles for qhull mesh + * Fixed inverted scale for convex meshes inside check + * Contributors: Christian Dornhege, Michael Ferguson + + -- Tyler Weaver Thu, 30 Apr 2015 04:00:00 -0000 + +ros-jazzy-geometric-shapes (0.4.2-1noble) noble; urgency=high + + * PR #32 + Merge shape_tools package into geometric shapes + * PR #33 + Add run_depend on visualization_msgs + * PR #26 + Prevent every mesh generation opening a new file handle. + * Contributors: Christian Dornhege, Dave Coleman, Jochen Sprickerhof, Michael Ferguson, Steven Peters + + -- Tyler Weaver Wed, 22 Apr 2015 04:00:00 -0000 + +ros-jazzy-geometric-shapes (0.4.1-1noble) noble; urgency=high + + * update distro for travis testing. precise:=trusty + * update to use debian console_bridge dependency. https://github.com/ros/rosdistro/issues/4633 + * Contributors: Ioan A Sucan, Tully Foote + + -- Tyler Weaver Mon, 07 Jul 2014 04:00:00 -0000 + +ros-jazzy-geometric-shapes (0.4.0-1noble) noble; urgency=high + + * update usage of console_bridge to deal with version in Trusty + * Merge pull request #13 from ros-planning/testing-in-travis + Run local and moveit_core tests in Travis builds. + * Merge pull request #18 from dirk-thomas/hydro-devel + fix configure config.h.in when paths contain spaces fix #9 + * Run local and moveit_core tests in Travis builds. + * Contributors: Acorn, Dave Hershberger, Dirk Thomas, Ioan A Sucan, William Woodall + + -- Tyler Weaver Tue, 24 Jun 2014 04:00:00 -0000 + +ros-jazzy-geometric-shapes (0.3.8-1noble) noble; urgency=high + + * fix how we find eigen + * Contributors: Ioan Sucan + + -- Tyler Weaver Tue, 25 Feb 2014 05:00:00 -0000 + +ros-jazzy-geometric-shapes (0.3.7-1noble) noble; urgency=high + + * add build dep so we can find eigen, build fixes + * Contributors: Ioan A Sucan, Scott K Logan + + -- Tyler Weaver Sun, 23 Feb 2014 05:00:00 -0000 + +ros-jazzy-geometric-shapes (0.3.6-1noble) noble; urgency=high + + * Use assimp-dev dep for building + * Remove stray IS_ASSIMP3 define + * Invert Assimp version detect logic for greater accuracy + * Better feature detection for assimp version + * added travis support + * check for CATKIN_ENABLE_TESTING + * Contributors: Dave Hershberger, Ioan A Sucan, Lukas Bulwahn, Scott K Logan + + -- Tyler Weaver Fri, 31 Jan 2014 05:00:00 -0000 + +ros-jazzy-geometric-shapes (0.3.5-1noble) noble; urgency=high + + * Fix syntax error. + * white space fixes (tabs are now spaces) + * add comments for shape definitions + + -- Tyler Weaver Mon, 23 Sep 2013 04:00:00 -0000 + + diff --git a/debian/changelog.em b/debian/changelog.em deleted file mode 100644 index 3585909..0000000 --- a/debian/changelog.em +++ /dev/null @@ -1,7 +0,0 @@ -@[for change_version, change_date, changelog, main_name, main_email in changelogs]@(Package) (@(change_version)@(DebianInc)@(Distribution)) @(Distribution); urgency=high - -@(changelog) - - -- @(main_name) <@(main_email)> @(change_date) - -@[end for] diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/compat.em b/debian/compat.em deleted file mode 100644 index 7a87216..0000000 --- a/debian/compat.em +++ /dev/null @@ -1 +0,0 @@ -@(debhelper_version) diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..26b7718 --- /dev/null +++ b/debian/control @@ -0,0 +1,12 @@ +Source: ros-jazzy-geometric-shapes +Section: misc +Priority: optional +Maintainer: Tyler Weaver +Build-Depends: debhelper (>= 9.0.0), libassimp-dev, libboost-dev, libboost-filesystem-dev, libeigen3-dev, libfcl-dev, liboctomap-dev, libqhull-dev, pkg-config, ros-jazzy-ament-cmake, ros-jazzy-ament-cmake-copyright , ros-jazzy-ament-cmake-gtest , ros-jazzy-ament-lint-auto , ros-jazzy-ament-lint-cmake , ros-jazzy-console-bridge-vendor, ros-jazzy-eigen-stl-containers, ros-jazzy-eigen3-cmake-module, ros-jazzy-geometry-msgs, ros-jazzy-random-numbers, ros-jazzy-rclcpp, ros-jazzy-resource-retriever, ros-jazzy-rosidl-default-generators, ros-jazzy-shape-msgs, ros-jazzy-visualization-msgs, ros-jazzy-ros-workspace +Homepage: http://ros.org/wiki/geometric_shapes +Standards-Version: 3.9.2 + +Package: ros-jazzy-geometric-shapes +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libassimp-dev, libboost-dev, libboost-filesystem1.83.0, libeigen3-dev, libfcl0.7, liboctomap-dev, libqhull-dev, ros-jazzy-console-bridge-vendor, ros-jazzy-eigen-stl-containers, ros-jazzy-eigen3-cmake-module, ros-jazzy-geometry-msgs, ros-jazzy-random-numbers, ros-jazzy-rclcpp, ros-jazzy-resource-retriever, ros-jazzy-rosidl-default-runtime, ros-jazzy-shape-msgs, ros-jazzy-visualization-msgs, ros-jazzy-ros-workspace +Description: This package contains generic definitions of geometric shapes and bodies. diff --git a/debian/control.em b/debian/control.em deleted file mode 100644 index 6d7b65c..0000000 --- a/debian/control.em +++ /dev/null @@ -1,14 +0,0 @@ -Source: @(Package) -Section: misc -Priority: optional -Maintainer: @(Maintainer) -Build-Depends: debhelper (>= @(debhelper_version).0.0), @(', '.join(BuildDepends)) -Homepage: @(Homepage) -Standards-Version: 3.9.2 - -Package: @(Package) -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, @(', '.join(Depends)) -@[if Conflicts]Conflicts: @(', '.join(Conflicts))@\n@[end if]@ -@[if Replaces]Replaces: @(', '.join(Replaces))@\n@[end if]@ -Description: @(Description) diff --git a/debian/copyright.em b/debian/copyright similarity index 50% rename from debian/copyright.em rename to debian/copyright index bc82fd5..1e7eb7d 100644 --- a/debian/copyright.em +++ b/debian/copyright @@ -1,11 +1,7 @@ Format: Bloom subset of https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: @(Name) -@[if BugTracker]Upstream-Contact: @(BugTracker)@\n@[end if]@ -@[if Source]Source: @(Source)@\n@[end if]@ -@[for License, Text in Licenses]@ +Upstream-Name: geometric_shapes Files: See file headers in repository for details Copyright: See package copyright in source code for details -License: @(License) - @(Text) -@[end for]@ +License: BSD + See repository for full license text diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..ccf83e7 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[git-buildpackage] +upstream-tag=release/jazzy/geometric_shapes/2.3.0-1 +upstream-tree=tag diff --git a/debian/gbp.conf.em b/debian/gbp.conf.em deleted file mode 100644 index ad24a16..0000000 --- a/debian/gbp.conf.em +++ /dev/null @@ -1,3 +0,0 @@ -[git-buildpackage] -upstream-tag=@(release_tag) -upstream-tree=tag diff --git a/debian/rules.em b/debian/rules similarity index 71% rename from debian/rules.em rename to debian/rules index a856369..8e1d142 100755 --- a/debian/rules.em +++ b/debian/rules @@ -13,7 +13,7 @@ export DH_VERBOSE=1 # https://code.ros.org/trac/ros/ticket/2977 # https://code.ros.org/trac/ros/ticket/3842 export LDFLAGS= -export PKG_CONFIG_PATH=@(InstallationPrefix)/lib/pkgconfig +export PKG_CONFIG_PATH=/opt/ros/jazzy/lib/pkgconfig # Explicitly enable -DNDEBUG, see: # https://github.com/ros-infrastructure/bloom/issues/327 export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG @@ -24,24 +24,24 @@ endif DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) %: - dh $@@ -v --buildsystem=cmake --builddirectory=.obj-$(DEB_HOST_GNU_TYPE) + dh $@ -v --buildsystem=cmake --builddirectory=.obj-$(DEB_HOST_GNU_TYPE) override_dh_auto_configure: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree and source it. It will set things like # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/jazzy/setup.sh" ]; then . "/opt/ros/jazzy/setup.sh"; fi && \ dh_auto_configure -- \ - -DCMAKE_INSTALL_PREFIX="@(InstallationPrefix)" \ - -DAMENT_PREFIX_PATH="@(InstallationPrefix)" \ - -DCMAKE_PREFIX_PATH="@(InstallationPrefix)" \ + -DCMAKE_INSTALL_PREFIX="/opt/ros/jazzy" \ + -DAMENT_PREFIX_PATH="/opt/ros/jazzy" \ + -DCMAKE_PREFIX_PATH="/opt/ros/jazzy" \ $(BUILD_TESTING_ARG) override_dh_auto_build: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree and source it. It will set things like # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/jazzy/setup.sh" ]; then . "/opt/ros/jazzy/setup.sh"; fi && \ dh_auto_build override_dh_auto_test: @@ -49,19 +49,19 @@ override_dh_auto_test: # in the install tree and source it. It will set things like # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. echo -- Running tests. Even if one of them fails the build is not canceled. - if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/jazzy/setup.sh" ]; then . "/opt/ros/jazzy/setup.sh"; fi && \ dh_auto_test || true override_dh_shlibdeps: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree and source it. It will set things like # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ - dh_shlibdeps -l$(CURDIR)/debian/@(Package)/@(InstallationPrefix)/lib/:$(CURDIR)/debian/@(Package)/@(InstallationPrefix)/opt/@(Name)/lib/ + if [ -f "/opt/ros/jazzy/setup.sh" ]; then . "/opt/ros/jazzy/setup.sh"; fi && \ + dh_shlibdeps -l$(CURDIR)/debian/ros-jazzy-geometric-shapes//opt/ros/jazzy/lib/:$(CURDIR)/debian/ros-jazzy-geometric-shapes//opt/ros/jazzy/opt/geometric_shapes/lib/ override_dh_auto_install: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree and source it. It will set things like # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/jazzy/setup.sh" ]; then . "/opt/ros/jazzy/setup.sh"; fi && \ dh_auto_install diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/format.em b/debian/source/format.em deleted file mode 100644 index 9666bf4..0000000 --- a/debian/source/format.em +++ /dev/null @@ -1 +0,0 @@ -3.0 (@(format)) diff --git a/debian/source/options.em b/debian/source/options similarity index 81% rename from debian/source/options.em rename to debian/source/options index 8c4c78b..8bc9182 100644 --- a/debian/source/options.em +++ b/debian/source/options @@ -1,6 +1,5 @@ -@[if format and format == 'quilt']@ # Automatically add upstream changes to the quilt overlay. # http://manpages.ubuntu.com/manpages/trusty/man1/dpkg-source.1.html # This supports reusing the orig.tar.gz for debian increments. auto-commit -@[end if] +