From d4ca3b3a1d01175c6498bdd76297fa8aea45f40d Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 19 Oct 2017 15:21:59 +0200 Subject: [PATCH 1/4] wdiff: Use installed version of bee file This bee file didn't match the one installed from /src/mariux. Correct file in repository. --- wdiff.be0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wdiff.be0 b/wdiff.be0 index a1360675f..56edb09c3 100755 --- a/wdiff.be0 +++ b/wdiff.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION wdiff-1.2.2-0 + ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 660a873e714ac5fbf1e4f8db9bc3ac30835271b1 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 19 Oct 2017 15:30:48 +0200 Subject: [PATCH 2/4] libuv: Use installed version of bee file This bee file didn't match the one installed from /src/mariux. Correct file in repository. --- libuv.be0 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libuv.be0 b/libuv.be0 index 3846eca0d..bf7f5f089 100755 --- a/libuv.be0 +++ b/libuv.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION libuv-1.14.1-0 + ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -47,9 +49,10 @@ SRCURL[0]="https://github.com/libuv/libuv/archive/v${PKGVERSION}.tar.gz" # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + bee_patch "${@}" + start_cmd sh autogen.sh +} #mee_configure() { # bee_configure From 67e753af5bcb7f2720488216a75fa70f88a08cd5 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 19 Oct 2017 16:33:29 +0200 Subject: [PATCH 3/4] cups_paperjam: Remove package This package, which installed into /package/paperjam/ is no longer registered on the distmaster. Somebody removed the obsolete package. Fix repository. --- cups_paperjam-1.5.0-2.bee | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100755 cups_paperjam-1.5.0-2.bee diff --git a/cups_paperjam-1.5.0-2.bee b/cups_paperjam-1.5.0-2.bee deleted file mode 100755 index bd9664c00..000000000 --- a/cups_paperjam-1.5.0-2.bee +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env beesh - -SRCURL[0]="http://ftp.easysw.com/pub/cups/${PKGVERSION}/cups-${PKGVERSION}-source.tar.bz2" - -PATCHURL[0]="/src/mariux/download/cupd-1.5.0-0001-use-acl_free-on-acl_to_text-object.patch" - -EXCLUDE="^/etc/(rc[0-6]|init)\.d /etc/cups/cupsd.conf$" - -PREFIX=/package/paperjam/${PKGNAME}-${PKGFULLVERSION}-${PKGREVISION} - -build_in_sourcedir - -mee_configure() { - bee_configure \ - --with-icondir=${DATADIR}/icons \ - --with-menudir=${DATADIR}/applications \ - --enable-debug-printfs \ - --enable-debug \ - --enable-debug-guards \ - --disable-acl -} - -mee_build() { - bee_build PAMDIR=${SYSCONFDIR}/pam.d DBUSDIR=${SYSCONFDIR}/dbus-1 -} - -mee_install() { - bee_install BUILDROOT=${D} PAMDIR=${SYSCONFDIR}/pam.d DBUSDIR=${SYSCONFDIR}/dbus-1 -} From 09bf69e9a6a14137a637e87ad7937ac5aeebfff2 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 19 Oct 2017 16:35:47 +0200 Subject: [PATCH 4/4] hplip_cups_paperjam: Remove package This package, which installed into /package/paperjam/ is no longer registered on the distmaster. Somebody removed the obsolete package. Fix repository. --- hplip_cups_paperjam-1.5.0-2-3.11.10-0.bee | 70 ----------------------- 1 file changed, 70 deletions(-) delete mode 100755 hplip_cups_paperjam-1.5.0-2-3.11.10-0.bee diff --git a/hplip_cups_paperjam-1.5.0-2-3.11.10-0.bee b/hplip_cups_paperjam-1.5.0-2-3.11.10-0.bee deleted file mode 100755 index 2994a8515..000000000 --- a/hplip_cups_paperjam-1.5.0-2-3.11.10-0.bee +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env beesh - -SRCURL[0]="http://prdownloads.sourceforge.net/hplip/hplip-${PKGVERSION}.tar.gz" - -PATCHURL[0]="" - -# BEE_CONFIGURE=compat - -# BEE_BUILDTYPE= - -EXCLUDE="^/usr/share/hal ^/etc/udev" - -PREFIX=/package/paperjam/$(beeversion --format="%p-%V-%r" ${PKGEXTRANAME}) - - - -build_in_sourcedir - -#mee_extract() { -# bee_extract ${@} -#} - -#mee_patch() { -# bee_patch ${@} -#} - - -mee_patch_post() { - for i in base/g.py Makefile.in Makefile.am check.py ; do - sed -e "s,/var/lib/hp,${LOCALSTATEDIR}/lib/hp,g" -i $i - done - - for i in ui/devmgr4.py fax/backend/hpfax.py fax/backend/hpfax.py ui4/devmgr5.py \ - base/g.py base/codes.py base/utils.py prnt/hpijs/globals.cpp prnt/hpcups/Utils.cpp \ - Makefile.am Makefile.in check.py installer/core_install.py ; do - sed -e "s,/etc/hp,${SYSCONFDIR}/hp,g" -i $i - done - -} - -mee_configure() { - bee_configure \ - --with-cupsbackenddir=${LIBDIR}/backend \ - --with-cupsfilterdir=${LIBDIR}/filter \ - --with-icondir=${DATADIR}/application \ - --with-mimedir=${DATADIR}/cups/mime \ - --with-systraydir=${SYSCONFDIR}/xdg/autostart \ - --disable-network-build \ - --disable-scan-build -} - -#mee_build() { -# bee_build -#} - -#mee_install() { -# bee_install -#} - -#drwxr-xr-x root/system 0 2011-11-18 11:53 /etc/hp/ -#-rw-r--r-- root/system 1079 2011-11-18 11:53 /etc/hp/hplip.conf -#drwxr-xr-x root/system 0 2011-11-18 11:53 /etc/udev/ -#drwxr-xr-x root/system 0 2011-11-18 11:53 /etc/udev/rules.d/ -#-rw-r--r-- root/system 8679 2011-11-18 11:53 /etc/udev/rules.d/55-hpmud.rules -#-rw-r--r-- root/system 643 2011-11-18 11:53 /etc/udev/rules.d/56-hpmud_support.rules -#drwxr-xr-x root/system 0 2011-11-18 11:53 /usr/share/hal/ -#drwxr-xr-x root/system 0 2011-11-18 11:53 /usr/share/hal/fdi/ -#drwxr-xr-x root/system 0 2011-11-18 11:53 /usr/share/hal/fdi/preprobe/ -#drwxr-xr-x root/system 0 2011-11-18 11:53 /usr/share/hal/fdi/preprobe/10osvendor/ -#-rw-r--r-- root/system 11687 2011-11-18 11:53 /usr/share/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi