Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7cca878a0ab2e4bb93a5a53adb170337c76d7f4f
commit 7cca878a0ab2e4bb93a5a53adb170337c76d7f4f Author: James Buren <[email protected]> Date: Sun Aug 19 12:19:37 2012 -0500 frugalware-1.7-3-x86_64 * disable replaces/conflicts as 1.7 is now branched off diff --git a/source/base/frugalware/FrugalBuild b/source/base/frugalware/FrugalBuild index ba7eb45..dcf7c35 100644 --- a/source/base/frugalware/FrugalBuild +++ b/source/base/frugalware/FrugalBuild @@ -16,41 +16,7 @@ backup=(etc/{profile.d/lang.sh,issue.net,ld.so.conf,nsswitch.conf,securetty,term up2date="Flasttar $url" source=($url/$pkgname-$pkgver.tar.gz) signatures=($source.asc) -# Remove after 1.7 final is released -replaces=( - 'eterm' 'libast' 'kmp' 'kudos' 'albumart' 'qscintilla2-python-qt3' - 'pyqt' 'qscintilla2-qt3' 'qscintilla' 'wpa_supplicant-gui' 'qcad' - 'cdcat' 'qlo10k1' 'avahi-qt3' 'coccinella' 'pdfedit' 'twinkle' - 'dclib' 'qucs' 'setedit' 'tvision' 'ktechlab' 'semantik' 'dracut-raid' - 'mkinitrd' 'cpuspeed' 'powernowd' 'sleepd' 'apmd' 'cpufreqd' 'rlocate' - 'wlan-ng' 'trayfreq' 'ivman' 'firestarter' 'festival' 'asterisk' - 'speech_tools' 'gnome-speech' 'acerhk' 'asterisk-addons' 'asterisk-sounds' - 'ypbind-mt' 'xf86-video-xgi' 'xf86-video-rendition' 'bittorrent' - 'bittorrent-gui' 'couchdb' 'wpa_supplicant-gui' 'uml_utilities' - 'user-mode-linux' 'vim-script-enhancedcommentify' 'oidentd' - 'scratchbox' 'texlipse' 'cvs2darcs' 'db-4.5' 'ngrep' 'pdfedit' - 'piccolo' 'piespy' 'postgresql-docs' 'qscintilla2-designer-qt3-plugin' - 'desktopcouch' 'dhcdbd' 'unixodbc-qt' 'sendmail' 'limewire' 'mediatomb' - 'microcode_ctl' 'knemo' 'ivman' 'isapnptools' 'hylafax' - 'inadyn' 'gtweakui' 'gtkcdlabel' 'dmg2iso' 'egroupware' 'exim' - 'festival' 'gfxboot' 'eterm-esetroot' 'ltp' 'pccts' 'pinot' 'nas' - 'light-monitor' 'libglw' 'libmal' 'ecletex' 'cdlabelgen' 'clutter-perl' - 'cvsps' 'efltk' 'gnubversion' 'libtextcat' 'libsvg' 'irda-utils' 'kmod-docs' - 'kdepim-wizards' 'docbook-sgml-dtd-4.1' 'gssmp' 'kdeaccessibility-docs' 'kodos' - 'python-couchdb' 'python-gweather' 'libreoffice-scripting-javascript' - 'libreoffice-scripting-python' 'monkey-bubble' 'b2evolution' 'grandr_applet' - 'koffice-tools' 'koffice-libs' 'koffice-data' 'koffice-docs' 'libpano12' - 'pysvn' 'thunar-shares-plugin' 'kde-l10n-kn' - 'eclipse-cdt' 'eclipse' 'koffice-l10n' 'aspell-ia' 'aspell-nn' 'aspell-rw' - 'aspell-sw' 'aspell-wa' 'aspell-zu' 'koffice-l10n-ca' 'koffice-l10n-ca@valencia' - 'koffice-l10n-da' 'koffice-l10n-de' 'koffice-l10n-el' 'koffice-l10n-en_gb' - 'koffice-l10n-es' 'koffice-l10n-et' 'koffice-l10n-fr' 'koffice-l10n-gl' - 'koffice-l10n-hu' 'koffice-l10n-it' 'koffice-l10n-ja' 'koffice-l10n-kk' - 'koffice-l10n-nb' 'koffice-l10n-nds' 'koffice-l10n-nl' 'koffice-l10n-pl' - 'koffice-l10n-pt' 'koffice-l10n-pt_br' 'koffice-l10n-ru' 'koffice-l10n-sv' - 'koffice-l10n-tr' 'koffice-l10n-uk' 'koffice-l10n-wa' 'koffice-l10n-zh_cn' - 'koffice-l10n-zh_tw' 'aspell5-fo' 'aspell5-gd' 'aspell5-ny' 'aspell5-sc' - 'aspell5-tl' 'aspell6-et' 'aspell6-la' 'aspell6-qu' 'aspell6-vi' 'aspell6-yi' - 'rdt' 'star' -) -conflicts=("${replaces[@]}") + +#replaces=( +#) +#conflicts=("${replaces[@]}") _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
