From 915284a678c405601a110b9e872055665d4a35db Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 8 Mar 2011 07:40:09 -0800 Subject: [PATCH] Split cydia-lproj from main package. --- .gitignore | 1 + control.sh | 5 +++-- control => cydia.control | 2 +- makefile | 25 +++++++++++++++++++++++-- 4 files changed, 28 insertions(+), 5 deletions(-) rename control => cydia.control (79%) diff --git a/.gitignore b/.gitignore index 36277cab..79a41cf5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ sysroot MobileCydia CydiaAppliance _ +__ Cydia.deb debs .DS_Store diff --git a/control.sh b/control.sh index 537cb663..3d808bf8 100755 --- a/control.sh +++ b/control.sh @@ -1,5 +1,6 @@ #!/bin/bash -dir=$1 +src=$1 +dir=$2 dir=${dir:=_} -sed -e "s@^\(Version:\).*@\1 $(./version.sh)@" control +sed -e "s@^\(Version:\).*@\1 $(./version.sh)@" "${src}" echo "Installed-Size: $(du -s "${dir}" | cut -f 1)" diff --git a/control b/cydia.control similarity index 79% rename from control rename to cydia.control index 4f9204d0..c32b9129 100644 --- a/control +++ b/cydia.control @@ -5,7 +5,7 @@ Maintainer: Jay Freeman (saurik) Architecture: iphoneos-arm Version: Replaces: com.sosiphone.addcydia -Depends: apr-lib, apt7-lib, apt7-key, darwintools, pcre, sed, shell-cmds, system-cmds, uikittools (>= 1.1.0) +Depends: apr-lib, apt7-lib, apt7-key, cydia-lproj, darwintools, pcre, sed, shell-cmds, system-cmds, uikittools (>= 1.1.0) Pre-Depends: dpkg (>= 1.14.25-8) Conflicts: com.sosiphone.addcydia Description: graphical iPhone front-end for APT diff --git a/makefile b/makefile index 70fa990b..574c6fa5 100644 --- a/makefile +++ b/makefile @@ -85,6 +85,8 @@ object := $(object:%=Objects/%) images := $(shell find MobileCydia.app -name '*.png') images := $(images:%=Images/%) +lproj_deb := debs/cydia-lproj_$(version)_iphoneos-arm.deb + all: MobileCydia clean: @@ -140,6 +142,7 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia $(images) $(shell find Mobil mkdir -p _/Applications cp -a MobileCydia.app _/Applications/Cydia.app + rm -rf _/Applications/Cydia.app/*.lproj cp -a MobileCydia _/Applications/Cydia.app/MobileCydia cd MobileCydia.app && find . -name '*.png' -exec cp -af ../Images/MobileCydia.app/{} ../_/Applications/Cydia.app/{} ';' @@ -152,7 +155,7 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia $(images) $(shell find Mobil #ln -s {/Applications/AppleTV,_/Applications/Lowtide}.app/Appliances/Cydia.frappliance mkdir -p _/DEBIAN - ./control.sh _ >_/DEBIAN/control + ./control.sh cydia.control _ >_/DEBIAN/control cp -a preinst _/DEBIAN/ find _ -exec touch -t "$$(date -j -f "%s" +"%Y%m%d%H%M.%S" "$$(git show --format='format:%ct' | head -n 1)")" {} ';' @@ -166,6 +169,24 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia $(images) $(shell find Mobil $(dpkg) -b _ Cydia.deb @echo "$$(stat -L -f "%z" Cydia.deb) $$(stat -f "%Y" Cydia.deb)" -package: debs/cydia_$(version)_iphoneos-arm.deb +$(lproj_deb): $(shell find MobileCydia.app -name '*.strings') + sudo rm -rf __ + mkdir -p __/Applications/Cydia.app + + cp -a MobileCydia.app/*.lproj __/Applications/Cydia.app + + mkdir -p __/DEBIAN + ./control.sh cydia-lproj.control __ >__/DEBIAN/control + cp -a preinst __/DEBIAN/ + + sudo chown -R 0 __ + sudo chgrp -R 0 __ + + mkdir -p debs + ln -sf debs/cydia-lproj_$(version)_iphoneos-arm.deb Cydia_.deb + $(dpkg) -b __ Cydia_.deb + @echo "$$(stat -L -f "%z" Cydia_.deb) $$(stat -f "%Y" Cydia_.deb)" + +package: debs/cydia_$(version)_iphoneos-arm.deb $(lproj_deb) .PHONY: all clean package sign -- 2.50.0