Merge pull request #2468 from groni/master

remove confilcts from prison
This commit is contained in:
groni
2016-12-28 16:22:44 +01:00
committed by GitHub
-6
View File
@@ -29,12 +29,6 @@
<Dependency>libdmtx</Dependency> <Dependency>libdmtx</Dependency>
<Dependency>qrencode</Dependency> <Dependency>qrencode</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Replaces>
<Package>prison-qt5</Package>
</Replaces>
<Conflicts>
<Package>prison-qt5</Package>
</Conflicts>
<Files> <Files>
<Path fileType="library">/usr/lib</Path> <Path fileType="library">/usr/lib</Path>
<Path fileType="library">/usr/lib/qt5</Path> <Path fileType="library">/usr/lib/qt5</Path>