The following commit has been merged in the master branch:
commit 9fcc24a9ff438d07bc0523f3abd235b76654aec9
Author: Felix Natter
Date: Thu Oct 3 12:38:16 2013 +0200
remove dm-upload-allowed
diff --git a/debian/control b/debian/control
index bab3b43..4bfc742 100644
--- a/debian/control
+++ b
The following commit has been merged in the master branch:
commit 700b9ad3564fcd9e2aeaefc4bc65a8c50a95144b
Author: Felix Natter
Date: Thu Oct 3 11:54:03 2013 +0200
fix watch file / get-orig-source target
diff --git a/debian/rules b/debian/rules
index 04c075b..b774566 100755
--- a/debian/ru
The following commit has been merged in the master branch:
commit 1863e0d72d30dec5ec2a4728b2c950fc8e404bba
Author: Felix Natter
Date: Thu Oct 3 12:11:05 2013 +0200
fix patches for 1.0, fix javac encoding to fix build with LANG=C
diff --git a/debian/patches/01-build_less.patch
b/debian/pat
The following commit has been merged in the master branch:
commit 9fccaced8ceec04a39bf14cfdfe81337081b83a6
Author: Felix Natter
Date: Thu Oct 3 12:15:59 2013 +0200
adapt changelog for 1.0
diff --git a/debian/changelog b/debian/changelog
index 3a18f15..018cfe7 100644
--- a/debian/changelog
The following commit has been merged in the master branch:
commit c4a178ae84614283aad235e3c60e54c4d7b79645
Author: Felix Natter
Date: Thu Oct 3 12:44:39 2013 +0200
remove svn stuff from debian/rules
diff --git a/debian/rules b/debian/rules
index e6090f4..69fa67d 100755
--- a/debian/rules
+
The following commit has been merged in the master branch:
commit 1cb23f4d8b933b533cc731c2fb4919b063dae5dd
Merge: 700b9ad3564fcd9e2aeaefc4bc65a8c50a95144b
b7ff9e7493c0a51e6ba590beec934602845b3df4
Author: Felix Natter
Date: Thu Oct 3 11:59:21 2013 +0200
Merge tag 'upstream/1.0'
Ups
The following commit has been merged in the master branch:
commit 9a76cc594c2116dedfdc7ed61f213eb37c285ca2
Author: Felix Natter
Date: Thu Oct 3 12:11:56 2013 +0200
add .pc to .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..4ecbc3e
--- /dev/null
+++ b/.gi
The following commit has been merged in the master branch:
commit e7f0fbbbc19cb29684d25877d5d0455085895f85
Author: Felix Natter
Date: Thu Oct 3 12:39:49 2013 +0200
call "ant clean" in clean target
diff --git a/debian/rules b/debian/rules
index b774566..e6090f4 100755
--- a/debian/rules
+++