projects
/
theonering
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e442690
)
Fixing a bug where telepathy-theonering wasn't included in packages
author
Ed Page
<eopage@byu.net>
Tue, 29 Dec 2009 15:42:12 +0000
(09:42 -0600)
committer
Ed Page
<eopage@byu.net>
Tue, 29 Dec 2009 15:42:12 +0000
(09:42 -0600)
Makefile
patch
|
blob
|
history
support/builddeb.py
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
bdb6b54
..
bfacab9
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-42,8
+42,9
@@
package: $(OBJ)
mkdir -p $(BUILD_PATH)/generic
cp $(SOURCE_PATH)/constants.py $(BUILD_PATH)/generic
mkdir -p $(BUILD_PATH)/generic
cp $(SOURCE_PATH)/constants.py $(BUILD_PATH)/generic
- $(foreach file, $(DATA), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
- $(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
+ $(foreach file, $(DATA), cp $(file) $(BUILD_PATH)/generic/$(subst /,!,$(file)) ; )
+ $(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/generic/$(subst /,!,$(file)) ; )
+ cp $(SOURCE_PATH)/telepathy-theonering $(BUILD_PATH)/generic/$(subst /,!,$(SOURCE_PATH)/telepathy-theonering)
cp support/$(PROJECT_NAME).manager $(BUILD_PATH)/generic
cp support/$(PROJECT_NAME).profile.* $(BUILD_PATH)/generic
cp support/org.freedesktop.Telepathy.ConnectionManager.$(PROJECT_NAME).service $(BUILD_PATH)/generic
cp support/$(PROJECT_NAME).manager $(BUILD_PATH)/generic
cp support/$(PROJECT_NAME).profile.* $(BUILD_PATH)/generic
cp support/org.freedesktop.Telepathy.ConnectionManager.$(PROJECT_NAME).service $(BUILD_PATH)/generic
diff --git
a/support/builddeb.py
b/support/builddeb.py
index
464402c
..
133446e
100755
(executable)
--- a/
support/builddeb.py
+++ b/
support/builddeb.py
@@
-44,8
+44,8
@@
rm -f ~/.telepathy-theonering/theonering.log
def find_files(path):
for root, dirs, files in os.walk(path):
for file in files:
def find_files(path):
for root, dirs, files in os.walk(path):
for file in files:
- if file.startswith("src-"):
- fileParts = file.split("-")
+ if file.startswith("src!"):
+ fileParts = file.split("!")
unused, relPathParts, newName = fileParts[0], fileParts[1:-1], fileParts[-1]
assert unused == "src"
relPath = os.sep.join(relPathParts)
unused, relPathParts, newName = fileParts[0], fileParts[1:-1], fileParts[-1]
assert unused == "src"
relPath = os.sep.join(relPathParts)