Merge lp:~vagrantc/ltsp/ldm-ubuntu-packaging-fixes into lp:~stgraber/ltsp/ldm.karmic

Proposed by Vagrant Cascadian
Status: Merged
Merged at revision: 25
Proposed branch: lp:~vagrantc/ltsp/ldm-ubuntu-packaging-fixes
Merge into: lp:~stgraber/ltsp/ldm.karmic
Diff against target: None lines
To merge this branch: bzr merge lp:~vagrantc/ltsp/ldm-ubuntu-packaging-fixes
Reviewer Review Type Date Requested Status
Stéphane Graber Pending
Review via email: mp+11240@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Vagrant Cascadian (vagrantc) wrote :

a couple minor fixes that bring debian and ubuntu closer in sync.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/rules'
--- debian/rules 2009-06-01 21:41:35 +0000
+++ debian/rules 2009-09-04 23:24:50 +0000
@@ -30,4 +30,4 @@
30 dh $@30 dh $@
3131
32binary: binary-indep binary-arch32binary: binary-indep binary-arch
33.PHONY: build clean binary-indep binary-arch binary install bzr-release33.PHONY: build clean binary-indep binary-arch binary install
3434
=== modified file 'debian/watch'
--- debian/watch 2009-06-26 04:13:03 +0000
+++ debian/watch 2009-09-04 23:27:00 +0000
@@ -1,6 +1,6 @@
1# ltsp currently doesn't release tarballs. the latest version can be found by1# ldm does not currenly release tarballs, but the current version can be found
2# checking the following URL:2# by looking for the VERSION string in the following URL:
3# http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk/annotate/head:/release.conf3# http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk/annotate/head:/configure.ac
44
5version=35version=3
66
@@ -10,4 +10,4 @@
10http://ftp.debian.org/debian/pool/main/l/ldm/ldm_(.*)\.orig\.tar\.gz10http://ftp.debian.org/debian/pool/main/l/ldm/ldm_(.*)\.orig\.tar\.gz
1111
12# fedora12# fedora
13http://kojipkgs.fedoraproject.org/packages/ldm/ ([0-9].*)/13http://kojipkgs.fedoraproject.org/packages/ldm/ ([2-9].*)/

Subscribers

People subscribed via source and target branches