Skip to content

Commit

Permalink
Merge pull request #758 from g-maxime/fix-after-23.06
Browse files Browse the repository at this point in the history
Clean and fix linux project files
  • Loading branch information
JeromeMartinez authored Jul 13, 2023
2 parents 21a916b + 74c7916 commit 8bc2b85
Show file tree
Hide file tree
Showing 35 changed files with 73 additions and 926 deletions.
5 changes: 4 additions & 1 deletion Project/GNU/mediaconch.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@ Homepage: http://MediaArea.net/MediaConch
Standards-Version: 3.9.6
Vcs-Git: https://github.com/MediaArea/MediaConch_SourceCode.git
Vcs-Browser: https://github.com/MediaArea/MediaConch_SourceCode
Build-Depends: debhelper (>= 9), dh-autoreconf, tofrodos, libmediainfo-dev (>= 23.07), libzen-dev (>= 0.4.41), qt5-qmake, qtbase5-dev, libqt5webkit5-dev, libxml2-dev, libxslt-dev, libsqlite3-dev, libjansson-dev, zlib1g-dev, pkg-config, automake, autoconf, libtool, libcurl4-gnutls-dev, libevent-dev
Build-Depends: debhelper (>= 9), dh-autoreconf, tofrodos, libmediainfo-dev (>= 23.07), libzen-dev (>= 0.4.41), qt5-qmake, qtbase5-dev, libqt5webkit5-dev, libxml2-dev, libxslt-dev, libsqlite3-dev, libjansson-dev, zlib1g-dev, pkg-config, automake, autoconf, libtool, libcurl4-gnutls-dev, libevent-dev, python3-all, dh-python
Package-List:
mediaconch deb utils optional arch=any
mediaconch-server deb utils optional arch=any
mediaconch-gui deb utils optional arch=any
libmediaconch0 deb libs optional arch=any
libmediaconch-dev deb libdevel optional arch=any
mediaconch-dbg deb debug extra arch=any
mediaconch-server-dbg debug utils extra arch=any
mediaconch-gui-dbg deb debug extra arch=any
libmediaconch0-dbg deb debug extra arch=any
Checksums-Sha1:
0000000000000000000000000000000000000000 000000 mediaconch_23.07.orig.tar.xz
0000000000000000000000000000000000000000 000000 mediaconch_23.07-1.debian.tar.xz
Expand Down
10 changes: 5 additions & 5 deletions Project/GNU/mediaconch.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%global libmediainfo_version 23.07
%global libzen_version 0.4.41

%if 0%{?fedora_version} || 0%{?centos_version} >= 600 || 0%{?rhel_version} >= 600
%if 0%{?fedora_version} || 0%{?rhel}
%global libmediaconch_name libmediaconch
%global libmediainfo_name libmediainfo
%global libzen_name libzen
Expand All @@ -13,7 +13,7 @@
%endif

# CentOS also set rhel macro
%if ! 0%{?suse_version} && ! 0%{?rhel} || 0%{?suse_version} >= 1200 || 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700
%if ! 0%{?suse_version} || 0%{?suse_version} >= 1200
%global build_server 1
%else
%global build_server 0
Expand Down Expand Up @@ -378,7 +378,7 @@ fi
%files
%defattr(-,root,root,-)
%doc Release/ReadMe_CLI_Linux.txt History_CLI.txt
%if 0%{?fedora_version} || 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700
%if 0%{?fedora_version} || 0%{?rhel}
%license License.html
%else
%doc License.html
Expand All @@ -389,7 +389,7 @@ fi
%files server
%defattr(-,root,root,-)
%doc Documentation/Daemon.md Documentation/Config.md Documentation/REST.md
%if 0%{?fedora_version} || 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700
%if 0%{?fedora_version} || 0%{?rhel}
%license License.html
%else
%doc License.html
Expand Down Expand Up @@ -417,7 +417,7 @@ fi
%files gui
%defattr(-,root,root,-)
%doc Release/ReadMe_GUI_Linux.txt History_GUI.txt
%if 0%{?fedora_version} || 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700
%if 0%{?fedora_version} || 0%{?rhel}
%license License.html
%else
%doc License.html
Expand Down
6 changes: 0 additions & 6 deletions Project/OBS/deb7.debian/changelog

This file was deleted.

1 change: 0 additions & 1 deletion Project/OBS/deb7.debian/compat

This file was deleted.

118 changes: 0 additions & 118 deletions Project/OBS/deb7.debian/control

This file was deleted.

19 changes: 0 additions & 19 deletions Project/OBS/deb7.debian/copyright

This file was deleted.

9 changes: 0 additions & 9 deletions Project/OBS/deb7.debian/mediaconch-gui.dirs

This file was deleted.

9 changes: 0 additions & 9 deletions Project/OBS/deb7.debian/mediaconch-gui.install

This file was deleted.

1 change: 0 additions & 1 deletion Project/OBS/deb7.debian/mediaconch-server.dirs

This file was deleted.

1 change: 0 additions & 1 deletion Project/OBS/deb7.debian/mediaconch-server.install

This file was deleted.

2 changes: 0 additions & 2 deletions Project/OBS/deb7.debian/mediaconch.dirs

This file was deleted.

2 changes: 0 additions & 2 deletions Project/OBS/deb7.debian/mediaconch.install

This file was deleted.

134 changes: 0 additions & 134 deletions Project/OBS/deb7.debian/rules

This file was deleted.

1 change: 0 additions & 1 deletion Project/OBS/deb7.debian/source/format

This file was deleted.

Loading

0 comments on commit 8bc2b85

Please sign in to comment.