diff options
| author | Bryan Ischo <bryan@ischo.com> | 2008-08-09 02:04:01 +0000 |
|---|---|---|
| committer | Bryan Ischo <bryan@ischo.com> | 2008-08-09 02:04:01 +0000 |
| commit | 600891ba77f46adb0de1e11779d3a06f664eb8cd (patch) | |
| tree | 21c1b680e7bebfd11acc55d915de8c175dafb7ac | |
| parent | 79cf3163f6e5eca2fc8b48c942a6e1686ce91d3e (diff) | |
| download | ceph-libs3-600891ba77f46adb0de1e11779d3a06f664eb8cd.tar.gz | |
* Fixed Debian package builds
| -rw-r--r-- | GNUmakefile | 22 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | debian/control.dev | 4 |
3 files changed, 18 insertions, 14 deletions
diff --git a/GNUmakefile b/GNUmakefile index 969b67f..3f010fe 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -143,17 +143,23 @@ $(DEBPKG): exported $(BUILD)/deb/DEBIAN/control $(BUILD)/deb/DEBIAN/shlibs \ $(BUILD)/deb/usr/share/doc/libs3/changelog.Debian.gz \ $(BUILD)/deb/usr/share/doc/libs3/copyright DESTDIR=$(BUILD)/deb/usr $(MAKE) install + rm -rf $(BUILD)/deb/usr/include + rm -f $(BUILD)/deb/usr/lib/libs3.a @mkdir -p $(dir $@) fakeroot dpkg-deb -b $(BUILD)/deb $@ mv $@ $(BUILD)/pkg/libs3_$(LIBS3_VER)_$(DEBARCH).deb +$(DEBDEVPKG): DEBARCH = $(shell dpkg-architecture | grep ^DEB_BUILD_ARCH= | \ + cut -d '=' -f 2) $(DEBDEVPKG): exported $(BUILD)/deb-dev/DEBIAN/control \ - $(BUILD)/deb-dev/usr/share/doc/libs3/changelog.gz \ - $(BUILD)/deb-dev/usr/share/doc/libs3/changelog.Debian.gz \ - $(BUILD)/deb-dev/usr/share/doc/libs3/copyright + $(BUILD)/deb-dev/usr/share/doc/libs3-dev/changelog.gz \ + $(BUILD)/deb-dev/usr/share/doc/libs3-dev/changelog.Debian.gz \ + $(BUILD)/deb-dev/usr/share/doc/libs3-dev/copyright DESTDIR=$(BUILD)/deb-dev/usr $(MAKE) install + rm -rf $(BUILD)/deb-dev/usr/bin + rm -f $(BUILD)/deb-dev/usr/lib/libs3.so* @mkdir -p $(dir $@) - fakeroot dpkg-deb -b $(BUILD)/deb $@ + fakeroot dpkg-deb -b $(BUILD)/deb-dev $@ mv $@ $(BUILD)/pkg/libs3-dev_$(LIBS3_VER)_$(DEBARCH).deb $(BUILD)/deb/DEBIAN/control: debian/control @@ -166,8 +172,6 @@ $(BUILD)/deb/DEBIAN/control: debian/control $(BUILD)/deb-dev/DEBIAN/control: debian/control.dev @mkdir -p $(dir $@) - echo -n "Depends: " > $@ - dpkg-shlibdeps -O $(BUILD)/bin/s3 | cut -d '=' -f 2- >> $@ sed -e 's/LIBS3_VERSION/$(LIBS3_VER)/' \ < $< | sed -e 's/DEBIAN_ARCHITECTURE/$(DEBARCH)/' >> $@ @@ -187,7 +191,7 @@ $(BUILD)/deb/usr/share/doc/libs3/copyright: LICENSE @echo "License version 3 on Debian" >> $@ @echo "systems is /usr/share/common-licenses/GPL-3." >> $@ -$(BUILD)/deb-dev/usr/share/doc/libs3/copyright: LICENSE +$(BUILD)/deb-dev/usr/share/doc/libs3-dev/copyright: LICENSE @mkdir -p $(dir $@) cp $< $@ @echo >> $@ @@ -199,7 +203,7 @@ $(BUILD)/deb/usr/share/doc/libs3/changelog.gz: debian/changelog @mkdir -p $(dir $@) gzip --best -c $< > $@ -$(BUILD)/deb-dev/usr/share/doc/libs3/changelog.gz: debian/changelog +$(BUILD)/deb-dev/usr/share/doc/libs3-dev/changelog.gz: debian/changelog @mkdir -p $(dir $@) gzip --best -c $< > $@ @@ -207,7 +211,7 @@ $(BUILD)/deb/usr/share/doc/libs3/changelog.Debian.gz: debian/changelog.Debian @mkdir -p $(dir $@) gzip --best -c $< > $@ -$(BUILD)/deb-dev/usr/share/doc/libs3/changelog.Debian.gz: \ +$(BUILD)/deb-dev/usr/share/doc/libs3-dev/changelog.Debian.gz: \ debian/changelog.Debian @mkdir -p $(dir $@) gzip --best -c $< > $@ diff --git a/debian/control b/debian/control index b249d7d..fbb28e2 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,6 @@ Priority: extra Maintainer: Bryan Ischo <bryan@ischo.com> Homepage: http://reallibs3.svn.sourceforge.net Description: C Library and Tools for Amazon S3 Access -This package includes the libs3 shared object library, needed to run -applications compiled against libs3, and additionally contains the s3 -utility for accessing Amazon S3. + This package includes the libs3 shared object library, needed to run + applications compiled against libs3, and additionally contains the s3 + utility for accessing Amazon S3. diff --git a/debian/control.dev b/debian/control.dev index 9588ada..93d647d 100644 --- a/debian/control.dev +++ b/debian/control.dev @@ -1,9 +1,9 @@ Package: libs3-dev Version: LIBS3_VERSION Architecture: DEBIAN_ARCHITECTURE -Section: devel +Section: libdevel Priority: extra -Requires: libs3 (>= LIBS3_VERSION) +Depends: libs3 (>= LIBS3_VERSION) Maintainer: Bryan Ischo <bryan@ischo.com> Homepage: http://reallibs3.svn.sourceforge.net Description: C Development Library for Amazon S3 Access |