Split cydia-lproj from main package.

diff --git a/.gitignore b/.gitignore
index 36277cab53253e8e5b6ea4281cec9a7cc97618f7..79a41cf58d18e1ada7d9f1420bb7e5b8255120a8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ sysroot
 MobileCydia
 CydiaAppliance
 _
+__
 Cydia.deb
 debs
 .DS_Store

diff --git a/control b/control
deleted file mode 100644 (file)
index 4f9204d..0000000
--- a/control
+++ /dev/null
@@ -1,15 +0,0 @@
-Package: cydia
-Priority: required
-Section: Packaging
-Maintainer: Jay Freeman (saurik) <saurik@saurik.com>
-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)
-Pre-Depends: dpkg (>= 1.14.25-8)
-Conflicts: com.sosiphone.addcydia
-Description: graphical iPhone front-end for APT
-Name: Cydia Installer
-Author: Jay Freeman (saurik) <saurik@saurik.com>
-Depiction: http://cydia.saurik.com/info/cydia/
-Tag: purpose::uikit, cydia::essential, role::enduser

diff --git a/control.sh b/control.sh
index 537cb66367c821a136b181ea410db3feb66d4eaf..3d808bf8ddaab49528b97a31db3292d6e1ddc459 100755 (executable)
--- 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/cydia.control b/cydia.control
new file mode 100644 (file)
index 0000000..c32b912
--- /dev/null
+++ b/cydia.control
@@ -0,0 +1,15 @@
+Package: cydia
+Priority: required
+Section: Packaging
+Maintainer: Jay Freeman (saurik) <saurik@saurik.com>
+Architecture: iphoneos-arm
+Version: 
+Replaces: com.sosiphone.addcydia
+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
+Name: Cydia Installer
+Author: Jay Freeman (saurik) <saurik@saurik.com>
+Depiction: http://cydia.saurik.com/info/cydia/
+Tag: purpose::uikit, cydia::essential, role::enduser

diff --git a/makefile b/makefile
index 70fa990bddee29241214fee05434f7d1f236f635..574c6fa5120b4c370be78c1d6f77e244b6488556 100644 (file)
--- 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