Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

4 files changed, 13 insertions, 15 deletions

diff --git a/libre/dvdrip-libre/PKGBUILD b/libre/dvdrip/PKGBUILD
index 5bb758015..008c42971 100644
--- a/libre/dvdrip-libre/PKGBUILD
+++ b/libre/dvdrip/PKGBUILD
@@ -3,15 +3,14 @@
 # Contributor (Arch): Fredrik Hammar <Horney_C86@Hotmail.com>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=dvdrip
-pkgname=dvdrip-libre
+pkgname=dvdrip
 pkgver=0.98.11
-pkgrel=11
+pkgrel=11.parabola1
 pkgdesc="A Gtk frontend for transcode writen in Perl, without opcional hal and nonfree rar vobsub compression support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
-url="http://www.exit1.org/${_pkgname}/"
-install=${_pkgname}.install
+url="http://www.exit1.org/${pkgname}/"
+install=${pkgname}.install
 depends=('perl-gtk2-ex-formfactory' 'transcode' 'imagemagick'
          'perl-libintl-perl' 'desktop-file-utils' 'perl-event-execflow')
 optdepends=('xvid4conf: xvid4 configuration tool'
@@ -22,31 +21,30 @@ optdepends=('xvid4conf: xvid4 configuration tool'
             'ogmtools: Needed for OGG/Vorbis and for chapter progress bar'
             'xine-ui: Can be used to view DVD'\''s/files'
             'fping: Only for cluster mode master')
-source=("http://www.exit1.org/${_pkgname}/dist/${_pkgname}-${pkgver}.tar.gz"
-        "${_pkgname}.desktop" "libre.patch")
+source=("http://www.exit1.org/${pkgname}/dist/${pkgname}-${pkgver}.tar.gz"
+        "${pkgname}.desktop" "libre.patch")
 options=('!emptydirs' '!makeflags')
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver}")
+replaces=("${pkgname}-libre")
+conflicts=("${pkgname}-libre")
 md5sums=('6dfa4199d451757a37eea233a07da4c0'
          'e91cf411928fd0500d07a0022b4ef546'
          'bc006d3b3447f8b62ae6ba29773a064b')
 
 prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -Np1 -i "$srcdir/libre.patch"
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # install module in vendor directories.
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make install DESTDIR="${pkgdir}"
 
@@ -54,6 +52,6 @@ package() {
   find ${pkgdir} -name perllocal.pod -delete
   find ${pkgdir} -name .packlist -delete
 
-  install -Dm644 ${srcdir}/${_pkgname}.desktop "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-  install -Dm 644 COPYRIGHT "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+  install -Dm644 ${srcdir}/${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm 644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/libre/dvdrip-libre/dvdrip.desktop b/libre/dvdrip/dvdrip.desktop
index dd19b4aae..dd19b4aae 100644
--- a/libre/dvdrip-libre/dvdrip.desktop
+++ b/libre/dvdrip/dvdrip.desktop
diff --git a/libre/dvdrip-libre/dvdrip.install b/libre/dvdrip/dvdrip.install
index e111ef946..e111ef946 100644
--- a/libre/dvdrip-libre/dvdrip.install
+++ b/libre/dvdrip/dvdrip.install
diff --git a/libre/dvdrip-libre/libre.patch b/libre/dvdrip/libre.patch
index cc24ef467..cc24ef467 100644
--- a/libre/dvdrip-libre/libre.patch
+++ b/libre/dvdrip/libre.patch