diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-12-05 15:29:53 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-12-05 15:29:53 +0100 |
| commit | efcd9763c92f242ab8047b95b209174f5312cdfd (patch) | |
| tree | f6a5347c32f28897db4c48f0d8f8060bf5cc8346 /debian | |
| parent | 11151b1f1b1eefc912e25c59cdd49459f030f246 (diff) | |
Squash unuploaded commit, upload to experimental.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rwxr-xr-x | debian/rules | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index 8e5b99b..a9ffdb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,9 @@ -talloc (2.0.4~git20101205-1) UNRELEASED; urgency=low - - * New upstream release. - - -- Jelmer Vernooij <jelmer@debian.org> Sun, 05 Dec 2010 15:19:14 +0100 - -talloc (2.0.3~git20101130-1) experimental; urgency=low +talloc (2.0.4~git20101205-1) experimental; urgency=low * New upstream release. * Bump standards version to 3.9.1 (no changes). - -- Jelmer Vernooij <jelmer@debian.org> Tue, 30 Nov 2010 01:15:51 +0100 + -- Jelmer Vernooij <jelmer@debian.org> Sun, 05 Dec 2010 15:19:14 +0100 talloc (2.0.3~git20101101-2) experimental; urgency=low diff --git a/debian/rules b/debian/rules index 1806f30..bbab9aa 100755 --- a/debian/rules +++ b/debian/rules @@ -49,11 +49,7 @@ install: build mkdir -p $(DESTDIR)`swig -swiglib` $(MAKE) install DESTDIR=$(DESTDIR) # Waf really should be doing this: -<<<<<<< TREE ar -rc libtalloc.a bin/default/talloc_*.o -======= - ar -rc libtalloc.a bin/default/talloc_?.o ->>>>>>> MERGE-SOURCE cp libtalloc.a $(DESTDIR)/usr/lib dh_install --list-missing --fail-missing --sourcedir=$(DESTDIR) |