diff options
| author | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-03-03 20:04:36 +0000 |
|---|---|---|
| committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-03-03 20:04:36 +0000 |
| commit | 571d570e1be6f783a2e8ef0dafa838e9d82f923e (patch) | |
| tree | 9b18682751acba56d650129922ecc4c5f12a3469 /Makefile.am | |
| parent | 62172377c57ff85bce35a43e0ca3e76f67a473ad (diff) | |
| parent | 4e6290d8e2dc4dcd784102bdab18d7e1854e11c0 (diff) | |
| download | libphidget21-571d570e1be6f783a2e8ef0dafa838e9d82f923e.tar.gz | |
Merge branch 'master' into squeeze-backportssqueeze-backports
Conflicts:
debian/changelog
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 5e0ccf4..8eac0d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -382,6 +382,6 @@ deb: @cp debian/changelog.template debian/changelog @sed -i s/"VERSION"/"$(PACKAGE_VERSION)"/ debian/changelog @sed -i s/"DATE"/"$(shell date +"%a, %d %b %Y %T %z")"/ debian/changelog - @if [ -z "$(DPKG_ARCH)" ]; then dpkg-buildpackage -us -uc; else dpkg-buildpackage -us -uc -a$(DPKG_ARCH); fi + @if [ -z "$(DPKG_ARCH)" ]; then dpkg-buildpackage -I.svn -us -uc; else dpkg-buildpackage -I.svn -us -uc -a$(DPKG_ARCH); fi jni: all |